Don't propagate symbols in ObservablePropertyGenerator

Author: Sergio0694

CommunityToolkit.Mvvm.SourceGenerators/ComponentModel/ObservablePropertyGenerator.cs

@@ -24,38 +24,33 @@ public sealed partial class ObservablePropertyGenerator : IIncrementalGenerator
     /// <inheritdoc/>
     public void Initialize(IncrementalGeneratorInitializationContext context)
     {
-        // Get all field declarations with at least one attribute
-        IncrementalValuesProvider<IFieldSymbol> fieldSymbols =
+        // Gather info for all annotated fields
+        IncrementalValuesProvider<(HierarchyInfo Hierarchy, Result<PropertyInfo?> Info)> propertyInfoWithErrors =
             context.SyntaxProvider
             .CreateSyntaxProvider(
-                static (node, _) => node is FieldDeclarationSyntax { Parent: ClassDeclarationSyntax or RecordDeclarationSyntax, AttributeLists.Count: > 0 },
-                static (context, _) =>
+                static (node, _) => node is VariableDeclaratorSyntax { Parent: VariableDeclarationSyntax { Parent: FieldDeclarationSyntax { Parent: ClassDeclarationSyntax or RecordDeclarationSyntax, AttributeLists.Count: > 0 } } },
+                static (context, token) =>
                 {
                     if (!context.SemanticModel.Compilation.HasLanguageVersionAtLeastEqualTo(LanguageVersion.CSharp8))
                     {
                         return default;
                     }
 
-                    return ((FieldDeclarationSyntax)context.Node).Declaration.Variables.Select(v => (IFieldSymbol)context.SemanticModel.GetDeclaredSymbol(v)!);
-                })
-            .Where(static items => items is not null)
-            .SelectMany(static (item, _) => item!)!;
+                    IFieldSymbol fieldSymbol = (IFieldSymbol)context.SemanticModel.GetDeclaredSymbol(context.Node, token)!;
 
-        // Filter the fields using [ObservableProperty]
-        IncrementalValuesProvider<IFieldSymbol> fieldSymbolsWithAttribute =
-            fieldSymbols
-            .Where(static item => item.HasAttributeWithFullyQualifiedName("global::CommunityToolkit.Mvvm.ComponentModel.ObservablePropertyAttribute"));
+                    // Filter the fields using [ObservableProperty]
+                    if (!fieldSymbol.HasAttributeWithFullyQualifiedName("global::CommunityToolkit.Mvvm.ComponentModel.ObservablePropertyAttribute"))
+                    {
+                        return default;
+                    }
 
-        // Gather info for all annotated fields
-        IncrementalValuesProvider<(HierarchyInfo Hierarchy, Result<PropertyInfo?> Info)> propertyInfoWithErrors =
-            fieldSymbolsWithAttribute
-            .Select(static (item, _) =>
-            {
-                HierarchyInfo hierarchy = HierarchyInfo.From(item.ContainingType);
-                PropertyInfo? propertyInfo = Execute.TryGetInfo(item, out ImmutableArray<Diagnostic> diagnostics);
+                    // Produce the incremental models
+                    HierarchyInfo hierarchy = HierarchyInfo.From(fieldSymbol.ContainingType);
+                    PropertyInfo? propertyInfo = Execute.TryGetInfo(fieldSymbol, out ImmutableArray<Diagnostic> diagnostics);
 
-                return (hierarchy, new Result<PropertyInfo?>(propertyInfo, diagnostics));
-            });
+                    return (Hierarchy: hierarchy, new Result<PropertyInfo?>(propertyInfo, diagnostics));
+                })
+            .Where(static item => item.Hierarchy is not null);
 
         // Output the diagnostics
         context.ReportDiagnostics(propertyInfoWithErrors.Select(static (item, _) => item.Info.Errors));