Port latest changes over

src/libraries/Common/src/Roslyn/SyntaxValueProvider_ForAttributeWithMetadataName.cs

@@ -95,7 +95,7 @@ public static IncrementalValuesProvider<T> ForAttributeWithMetadataName<T>(
             ? MetadataTypeName.FromFullName(fullyQualifiedMetadataName.Split(s_nestedTypeNameSeparators).Last())
             : MetadataTypeName.FromFullName(fullyQualifiedMetadataName);
 
-        var nodesWithAttributesMatchingSimpleName = @this.ForAttributeWithSimpleName(metadataName.UnmangledTypeName, predicate);
+        var nodesWithAttributesMatchingSimpleName = @this.ForAttributeWithSimpleName(context, metadataName.UnmangledTypeName, predicate);
 
         var collectedNodes = nodesWithAttributesMatchingSimpleName
             .Collect()

src/libraries/Common/src/Roslyn/SyntaxValueProvider_ForAttributeWithSimpleName.cs

@@ -37,15 +37,23 @@ internal static partial class SyntaxValueProviderExtensions
     /// </summary>
     public static IncrementalValuesProvider<SyntaxNode> ForAttributeWithSimpleName(
         this SyntaxValueProvider @this,
+        IncrementalGeneratorInitializationContext context,
         string simpleName,
         Func<SyntaxNode, CancellationToken, bool> predicate)
     {
         var syntaxHelper = CSharpSyntaxHelper.Instance;
 
+        // Create a provider over all the syntax trees in the compilation.  This is better than CreateSyntaxProvider as
+        // using SyntaxTrees is purely syntax and will not update the incremental node for a tree when another tree is
+        // changed. CreateSyntaxProvider will have to rerun all incremental nodes since it passes along the
+        // SemanticModel, and that model is updated whenever any tree changes (since it is tied to the compilation).
+        var syntaxTreesProvider = context.CompilationProvider
+            .SelectMany(static (c, _) => c.SyntaxTrees)
+            /*.WithTrackingName("compilationUnit_ForAttribute")*/;
+
         // Create a provider that provides (and updates) the global aliases for any particular file when it is edited.
-        var individualFileGlobalAliasesProvider = @this.CreateSyntaxProvider(
-            static (n, _) => n is ICompilationUnitSyntax,
-            static (context, _) => getGlobalAliasesInCompilationUnit(context.Node))/*.WithTrackingName("individualFileGlobalAliases_ForAttribute")*/;
+        var individualFileGlobalAliasesProvider = syntaxTreesProvider.Select(
+            (s, c) => getGlobalAliasesInCompilationUnit(s.GetRoot(c)))/*.WithTrackingName("individualFileGlobalAliases_ForAttribute")*/;
 
         // Create an aggregated view of all global aliases across all files.  This should only update when an individual
         // file changes its global aliases or a file is added / removed from the compilation
@@ -79,19 +87,14 @@ public static IncrementalValuesProvider<SyntaxNode> ForAttributeWithSimpleName(
 
 #endif
 
-        // Create a syntax provider for every compilation unit.
-        var compilationUnitProvider = @this.CreateSyntaxProvider(
-            static (n, _) => n is ICompilationUnitSyntax,
-            static (context, _) => context.Node)/*.WithTrackingName("compilationUnit_ForAttribute")*/;
-
         // Combine the two providers so that we reanalyze every file if the global aliases change, or we reanalyze a
         // particular file when it's compilation unit changes.
-        var compilationUnitAndGlobalAliasesProvider = compilationUnitProvider
+        var syntaxTreeAndGlobalAliasesProvider = syntaxTreesProvider
             .Combine(allUpGlobalAliasesProvider)
             /*.WithTrackingName("compilationUnitAndGlobalAliases_ForAttribute")*/;
 
         // For each pair of compilation unit + global aliases, walk the compilation unit
-        var result = compilationUnitAndGlobalAliasesProvider
+        var result = syntaxTreeAndGlobalAliasesProvider
             .SelectMany((globalAliasesAndCompilationUnit, cancellationToken) => GetMatchingNodes(
                 syntaxHelper, globalAliasesAndCompilationUnit.Right, globalAliasesAndCompilationUnit.Left, simpleName, predicate, cancellationToken))
             /*.WithTrackingName("result_ForAttribute")*/;
@@ -113,11 +116,12 @@ static GlobalAliases getGlobalAliasesInCompilationUnit(
     private static ImmutableArray<SyntaxNode> GetMatchingNodes(
         ISyntaxHelper syntaxHelper,
         GlobalAliases globalAliases,
-        SyntaxNode compilationUnit,
+        SyntaxTree syntaxTree,
         string name,
         Func<SyntaxNode, CancellationToken, bool> predicate,
         CancellationToken cancellationToken)
     {
+        var compilationUnit = syntaxTree.GetRoot(cancellationToken);
         Debug.Assert(compilationUnit is ICompilationUnitSyntax);
 
         var isCaseSensitive = syntaxHelper.IsCaseSensitive;