Merge pull request #964 from CommunityToolkit/dev/fix-attribute-target-suppression

Sergio0694 · web-flow · commit ba45963ed875 · 2024-10-22T22:21:38.000-07:00
Fix suppressions for custom attribute targets
diff --git a/src/CommunityToolkit.Mvvm.SourceGenerators/Diagnostics/Suppressors/ObservablePropertyAttributeWithSupportedTargetDiagnosticSuppressor.cs b/src/CommunityToolkit.Mvvm.SourceGenerators/Diagnostics/Suppressors/ObservablePropertyAttributeWithSupportedTargetDiagnosticSuppressor.cs
@@ -55,7 +55,16 @@ public override void ReportSuppressions(SuppressionAnalysisContext context)
                     semanticModel.Compilation.GetTypeByMetadataName("CommunityToolkit.Mvvm.ComponentModel.ObservablePropertyAttribute") is INamedTypeSymbol observablePropertySymbol &&
                     fieldSymbol.HasAttributeWithType(observablePropertySymbol))
                 {
-                    context.ReportSuppression(Suppression.Create(PropertyAttributeListForObservablePropertyField, diagnostic));
+                    // Emit the right suppression based on the attribute modifier. For 'property:', Roslyn
+                    // will emit the 'CS0657' warning, whereas for 'get:' or 'set:', it will emit 'CS0658'.
+                    if (attributeTarget.Identifier.IsKind(SyntaxKind.PropertyKeyword))
+                    {
+                        context.ReportSuppression(Suppression.Create(PropertyAttributeListForObservablePropertyField, diagnostic));
+                    }
+                    else
+                    {
+                        context.ReportSuppression(Suppression.Create(PropertyAttributeListForObservablePropertyFieldAccessors, diagnostic));
+                    }
                 }
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,16 @@ public override void ReportSuppressions(SuppressionAnalysisContext context)`
`55`	`55`	`semanticModel.Compilation.GetTypeByMetadataName("CommunityToolkit.Mvvm.ComponentModel.ObservablePropertyAttribute") is INamedTypeSymbol observablePropertySymbol &&`
`56`	`56`	`fieldSymbol.HasAttributeWithType(observablePropertySymbol))`
`57`	`57`	`{`
`58`		`- context.ReportSuppression(Suppression.Create(PropertyAttributeListForObservablePropertyField, diagnostic));`
	`58`	`+ // Emit the right suppression based on the attribute modifier. For 'property:', Roslyn`
	`59`	`+ // will emit the 'CS0657' warning, whereas for 'get:' or 'set:', it will emit 'CS0658'.`
	`60`	`+ if (attributeTarget.Identifier.IsKind(SyntaxKind.PropertyKeyword))`
	`61`	`+ {`
	`62`	`+ context.ReportSuppression(Suppression.Create(PropertyAttributeListForObservablePropertyField, diagnostic));`
	`63`	`+ }`
	`64`	`+ else`
	`65`	`+ {`
	`66`	`+ context.ReportSuppression(Suppression.Create(PropertyAttributeListForObservablePropertyFieldAccessors, diagnostic));`
	`67`	`+ }`
`59`	`68`	`}`
`60`	`69`	`}`
`61`	`70`	`}`