Generate new diagnostics on target symbols

Sergio0694 · Sergio0694 · commit 50d8ff5b8e36 · 2024-11-13T00:07:52.000-08:00
diff --git a/src/CommunityToolkit.Mvvm.SourceGenerators/Diagnostics/Analyzers/UnsupportedRoslynVersionForPartialPropertyAnalyzer.cs b/src/CommunityToolkit.Mvvm.SourceGenerators/Diagnostics/Analyzers/UnsupportedRoslynVersionForPartialPropertyAnalyzer.cs
@@ -5,6 +5,7 @@
 #if !ROSLYN_4_11_0_OR_GREATER
 
 using System.Collections.Immutable;
+using System.Linq;
 using CommunityToolkit.Mvvm.SourceGenerators.Extensions;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Diagnostics;
@@ -44,11 +45,11 @@ public override void Initialize(AnalysisContext context)
                 }
 
                 // If the property has [ObservableProperty], emit an error in all cases
-                if (propertySymbol.TryGetAttributeWithType(observablePropertySymbol, out AttributeData? observablePropertyAttribute))
+                if (propertySymbol.HasAttributeWithType(observablePropertySymbol))
                 {
                     context.ReportDiagnostic(Diagnostic.Create(
                         UnsupportedRoslynVersionForObservablePartialPropertySupport,
-                        observablePropertyAttribute.GetLocation(),
+                        propertySymbol.Locations.FirstOrDefault(),
                         propertySymbol.ContainingType,
                         propertySymbol));
                 }
diff --git a/src/CommunityToolkit.Mvvm.SourceGenerators/Diagnostics/Analyzers/UseObservablePropertyOnPartialPropertyAnalyzer.cs b/src/CommunityToolkit.Mvvm.SourceGenerators/Diagnostics/Analyzers/UseObservablePropertyOnPartialPropertyAnalyzer.cs
@@ -5,6 +5,7 @@
 #if ROSLYN_4_11_0_OR_GREATER
 
 using System.Collections.Immutable;
+using System.Linq;
 using CommunityToolkit.Mvvm.SourceGenerators.Extensions;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Diagnostics;
@@ -57,7 +58,7 @@ public override void Initialize(AnalysisContext context)
                 }
 
                 // Check that we are in fact using [ObservableProperty]
-                if (!fieldSymbol.TryGetAttributeWithType(observablePropertySymbol, out AttributeData? observablePropertyAttribute))
+                if (!fieldSymbol.HasAttributeWithType(observablePropertySymbol))
                 {
                     return;
                 }
@@ -74,7 +75,7 @@ public override void Initialize(AnalysisContext context)
                 // Emit the diagnostic for this field to suggest changing to a partial property instead
                 context.ReportDiagnostic(Diagnostic.Create(
                     UseObservablePropertyOnPartialProperty,
-                    observablePropertyAttribute.GetLocation(),
+                    fieldSymbol.Locations.FirstOrDefault(),
                     ImmutableDictionary.Create<string, string?>()
                         .Add(FieldReferenceForObservablePropertyFieldAnalyzer.FieldNameKey, fieldSymbol.Name)
                         .Add(FieldReferenceForObservablePropertyFieldAnalyzer.PropertyNameKey, ObservablePropertyGenerator.Execute.GetGeneratedPropertyName(fieldSymbol)),
diff --git a/src/CommunityToolkit.Mvvm.SourceGenerators/Diagnostics/Analyzers/WinRTGeneratedBindableCustomPropertyWithBasesMemberAnalyzer.cs b/src/CommunityToolkit.Mvvm.SourceGenerators/Diagnostics/Analyzers/WinRTGeneratedBindableCustomPropertyWithBasesMemberAnalyzer.cs
@@ -6,6 +6,7 @@
 
 using System.Collections.Generic;
 using System.Collections.Immutable;
+using System.Linq;
 using CommunityToolkit.Mvvm.SourceGenerators.Extensions;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Diagnostics;
@@ -55,7 +56,7 @@ public override void Initialize(AnalysisContext context)
                 }
 
                 // We only care about it if it's using [GeneratedBindableCustomProperty]
-                if (!typeSymbol.TryGetAttributeWithType(generatedBindableCustomPropertySymbol, out AttributeData? generatedBindableCustomPropertyAttribute))
+                if (!typeSymbol.HasAttributeWithType(generatedBindableCustomPropertySymbol))
                 {
                     return;
                 }
@@ -65,7 +66,7 @@ public override void Initialize(AnalysisContext context)
                 {
                     context.ReportDiagnostic(Diagnostic.Create(
                         WinRTGeneratedBindableCustomPropertyWithBaseObservablePropertyOnField,
-                        generatedBindableCustomPropertyAttribute.GetLocation(),
+                        typeSymbol.Locations.FirstOrDefault(),
                         typeSymbol,
                         fieldSymbol.ContainingType,
                         fieldSymbol.Name));
@@ -76,7 +77,7 @@ public override void Initialize(AnalysisContext context)
                 {
                     context.ReportDiagnostic(Diagnostic.Create(
                         WinRTGeneratedBindableCustomPropertyWithBaseRelayCommand,
-                        generatedBindableCustomPropertyAttribute.GetLocation(),
+                        typeSymbol.Locations.FirstOrDefault(),
                         typeSymbol,
                         methodSymbol));
                 }
diff --git a/src/CommunityToolkit.Mvvm.SourceGenerators/Diagnostics/Analyzers/WinRTObservablePropertyOnFieldsIsNotAotCompatibleAnalyzer.cs b/src/CommunityToolkit.Mvvm.SourceGenerators/Diagnostics/Analyzers/WinRTObservablePropertyOnFieldsIsNotAotCompatibleAnalyzer.cs
@@ -5,6 +5,7 @@
 #if ROSLYN_4_11_0_OR_GREATER
 
 using System.Collections.Immutable;
+using System.Linq;
 using CommunityToolkit.Mvvm.SourceGenerators.Extensions;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Diagnostics;
@@ -50,11 +51,11 @@ public override void Initialize(AnalysisContext context)
                 }
 
                 // Emit a diagnostic if the field is using the [ObservableProperty] attribute
-                if (fieldSymbol.TryGetAttributeWithType(observablePropertySymbol, out AttributeData? observablePropertyAttribute))
+                if (fieldSymbol.HasAttributeWithType(observablePropertySymbol))
                 {
                     context.ReportDiagnostic(Diagnostic.Create(
                         WinRTObservablePropertyOnFieldsIsNotAotCompatible,
-                        observablePropertyAttribute.GetLocation(),
+                        fieldSymbol.Locations.FirstOrDefault(),
                         ImmutableDictionary.Create<string, string?>()
                             .Add(FieldReferenceForObservablePropertyFieldAnalyzer.FieldNameKey, fieldSymbol.Name)
                             .Add(FieldReferenceForObservablePropertyFieldAnalyzer.PropertyNameKey, ObservablePropertyGenerator.Execute.GetGeneratedPropertyName(fieldSymbol)),
diff --git a/src/CommunityToolkit.Mvvm.SourceGenerators/Diagnostics/Analyzers/WinRTRelayCommandIsNotGeneratedBindableCustomPropertyCompatibleAnalyzer.cs b/src/CommunityToolkit.Mvvm.SourceGenerators/Diagnostics/Analyzers/WinRTRelayCommandIsNotGeneratedBindableCustomPropertyCompatibleAnalyzer.cs
@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Collections.Immutable;
+using System.Linq;
 using CommunityToolkit.Mvvm.SourceGenerators.Extensions;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Diagnostics;
@@ -49,7 +50,7 @@ public override void Initialize(AnalysisContext context)
                 }
 
                 // If the method is not using [RelayCommand], we can skip it
-                if (!methodSymbol.TryGetAttributeWithType(relayCommandSymbol, out AttributeData? relayCommandAttribute))
+                if (!methodSymbol.HasAttributeWithType(relayCommandSymbol))
                 {
                     return;
                 }
@@ -59,7 +60,7 @@ public override void Initialize(AnalysisContext context)
                 {
                     context.ReportDiagnostic(Diagnostic.Create(
                         WinRTRelayCommandIsNotGeneratedBindableCustomPropertyCompatible,
-                        relayCommandAttribute.GetLocation(),
+                        methodSymbol.Locations.FirstOrDefault(),
                         methodSymbol));
                 }
             }, SymbolKind.Method);
diff --git a/tests/CommunityToolkit.Mvvm.SourceGenerators.Roslyn4001.UnitTests/Test_UnsupportedRoslynVersionForPartialPropertyAnalyzer.cs b/tests/CommunityToolkit.Mvvm.SourceGenerators.Roslyn4001.UnitTests/Test_UnsupportedRoslynVersionForPartialPropertyAnalyzer.cs
@@ -21,8 +21,8 @@ namespace MyApp
             {
                 public partial class SampleViewModel : ObservableObject
                 {            
-                    [{|MVVMTK0044:ObservableProperty|}]            
-                    public string Bar { get; set; }
+                    [ObservableProperty]            
+                    public string {|MVVMTK0044:Bar|} { get; set; }
                 }
             }
             """;
diff --git a/tests/CommunityToolkit.Mvvm.SourceGenerators.Roslyn4110.UnitTests/Test_SourceGeneratorsDiagnostics.cs b/tests/CommunityToolkit.Mvvm.SourceGenerators.Roslyn4110.UnitTests/Test_SourceGeneratorsDiagnostics.cs
@@ -78,8 +78,8 @@ namespace MyApp
             {
                 public partial class SampleViewModel : ObservableObject
                 {            
-                    [{|MVVMTK0042:ObservableProperty|}]            
-                    private string name;
+                    [ObservableProperty]            
+                    private string {|MVVMTK0042:name|};
                 }
             }
             """;
@@ -371,8 +371,8 @@ namespace MyApp
             {
                 public partial class SampleViewModel : ObservableObject
                 {            
-                    [{|MVVMTK0045:ObservableProperty|}]            
-                    private string name;
+                    [ObservableProperty]            
+                    private string {|MVVMTK0045:name|};
                 }
             }
             """;
@@ -415,8 +415,8 @@ namespace MyApp
             {
                 public partial class SampleViewModel : ObservableObject
                 {            
-                    [{|MVVMTK0045:ObservableProperty|}]            
-                    private string name;
+                    [ObservableProperty]            
+                    private string {|MVVMTK0045:name|};
                 }
             }
             """;
@@ -437,8 +437,8 @@ namespace MyApp
             {
                 public partial class SampleViewModel : ObservableObject
                 {            
-                    [{|MVVMTK0045:ObservableProperty|}]            
-                    private string name;
+                    [ObservableProperty]            
+                    private string {|MVVMTK0045:name|};
                 }
             }
             """;
@@ -459,8 +459,8 @@ namespace MyApp
             {
                 public partial class SampleViewModel : ObservableObject
                 {            
-                    [{|MVVMTK0045:ObservableProperty|}]            
-                    private string name;
+                    [ObservableProperty]            
+                    private string {|MVVMTK0045:name|};
                 }
             }
 
@@ -486,8 +486,8 @@ namespace MyApp
             {
                 public partial class SampleViewModel : ObservableObject
                 {            
-                    [{|MVVMTK0045:ObservableProperty|}]            
-                    private string name;
+                    [ObservableProperty]            
+                    private string {|MVVMTK0045:name|};
                 }
             }
 
@@ -585,8 +585,8 @@ public async Task WinRTGeneratedBindableCustomPropertyWithBasesMemberAnalyzer_Ta
             
             namespace MyApp
             {
-                [{|MVVMTK0047:GeneratedBindableCustomProperty|}]
-                public partial class SampleViewModel : BaseViewModel
+                [GeneratedBindableCustomProperty]
+                public partial class {|MVVMTK0047:SampleViewModel|} : BaseViewModel
                 {                    
                 }
 
@@ -620,8 +620,8 @@ public async Task WinRTGeneratedBindableCustomPropertyWithBasesMemberAnalyzer_Ta
             
             namespace MyApp
             {
-                [{|MVVMTK0048:GeneratedBindableCustomProperty|}]
-                public partial class SampleViewModel : BaseViewModel
+                [GeneratedBindableCustomProperty]
+                public partial class {|MVVMTK0048:SampleViewModel|} : BaseViewModel
                 {                    
                 }
 
diff --git a/tests/CommunityToolkit.Mvvm.SourceGenerators.Roslyn4110.UnitTests/Test_UsePartialPropertyForObservablePropertyCodeFixer.cs b/tests/CommunityToolkit.Mvvm.SourceGenerators.Roslyn4110.UnitTests/Test_UsePartialPropertyForObservablePropertyCodeFixer.cs
diff --git a/tests/CommunityToolkit.Mvvm.SourceGenerators.UnitTests/Test_SourceGeneratorsDiagnostics.cs b/tests/CommunityToolkit.Mvvm.SourceGenerators.UnitTests/Test_SourceGeneratorsDiagnostics.cs

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`	`#if !ROSLYN_4_11_0_OR_GREATER`
`6`	`6`
`7`	`7`	`using System.Collections.Immutable;`
	`8`	`+using System.Linq;`
`8`	`9`	`using CommunityToolkit.Mvvm.SourceGenerators.Extensions;`
`9`	`10`	`using Microsoft.CodeAnalysis;`
`10`	`11`	`using Microsoft.CodeAnalysis.Diagnostics;`
`@@ -44,11 +45,11 @@ public override void Initialize(AnalysisContext context)`
`44`	`45`	`}`
`45`	`46`
`46`	`47`	`// If the property has [ObservableProperty], emit an error in all cases`
`47`		`- if (propertySymbol.TryGetAttributeWithType(observablePropertySymbol, out AttributeData? observablePropertyAttribute))`
	`48`	`+ if (propertySymbol.HasAttributeWithType(observablePropertySymbol))`
`48`	`49`	`{`
`49`	`50`	`context.ReportDiagnostic(Diagnostic.Create(`
`50`	`51`	`UnsupportedRoslynVersionForObservablePartialPropertySupport,`
`51`		`- observablePropertyAttribute.GetLocation(),`
	`52`	`+ propertySymbol.Locations.FirstOrDefault(),`
`52`	`53`	`propertySymbol.ContainingType,`
`53`	`54`	`propertySymbol));`
`54`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@`
`6`	`6`
`7`	`7`	`using System.Collections.Generic;`
`8`	`8`	`using System.Collections.Immutable;`
	`9`	`+using System.Linq;`
`9`	`10`	`using CommunityToolkit.Mvvm.SourceGenerators.Extensions;`
`10`	`11`	`using Microsoft.CodeAnalysis;`
`11`	`12`	`using Microsoft.CodeAnalysis.Diagnostics;`
`@@ -55,7 +56,7 @@ public override void Initialize(AnalysisContext context)`
`55`	`56`	`}`
`56`	`57`
`57`	`58`	`// We only care about it if it's using [GeneratedBindableCustomProperty]`
`58`		`- if (!typeSymbol.TryGetAttributeWithType(generatedBindableCustomPropertySymbol, out AttributeData? generatedBindableCustomPropertyAttribute))`
	`59`	`+ if (!typeSymbol.HasAttributeWithType(generatedBindableCustomPropertySymbol))`
`59`	`60`	`{`
`60`	`61`	`return;`
`61`	`62`	`}`
`@@ -65,7 +66,7 @@ public override void Initialize(AnalysisContext context)`
`65`	`66`	`{`
`66`	`67`	`context.ReportDiagnostic(Diagnostic.Create(`
`67`	`68`	`WinRTGeneratedBindableCustomPropertyWithBaseObservablePropertyOnField,`
`68`		`- generatedBindableCustomPropertyAttribute.GetLocation(),`
	`69`	`+ typeSymbol.Locations.FirstOrDefault(),`
`69`	`70`	`typeSymbol,`
`70`	`71`	`fieldSymbol.ContainingType,`
`71`	`72`	`fieldSymbol.Name));`
`@@ -76,7 +77,7 @@ public override void Initialize(AnalysisContext context)`
`76`	`77`	`{`
`77`	`78`	`context.ReportDiagnostic(Diagnostic.Create(`
`78`	`79`	`WinRTGeneratedBindableCustomPropertyWithBaseRelayCommand,`
`79`		`- generatedBindableCustomPropertyAttribute.GetLocation(),`
	`80`	`+ typeSymbol.Locations.FirstOrDefault(),`
`80`	`81`	`typeSymbol,`
`81`	`82`	`methodSymbol));`
`82`	`83`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`// See the LICENSE file in the project root for more information.`
`4`	`4`
`5`	`5`	`using System.Collections.Immutable;`
	`6`	`+using System.Linq;`
`6`	`7`	`using CommunityToolkit.Mvvm.SourceGenerators.Extensions;`
`7`	`8`	`using Microsoft.CodeAnalysis;`
`8`	`9`	`using Microsoft.CodeAnalysis.Diagnostics;`
`@@ -49,7 +50,7 @@ public override void Initialize(AnalysisContext context)`
`49`	`50`	`}`
`50`	`51`
`51`	`52`	`// If the method is not using [RelayCommand], we can skip it`
`52`		`- if (!methodSymbol.TryGetAttributeWithType(relayCommandSymbol, out AttributeData? relayCommandAttribute))`
	`53`	`+ if (!methodSymbol.HasAttributeWithType(relayCommandSymbol))`
`53`	`54`	`{`
`54`	`55`	`return;`
`55`	`56`	`}`
`@@ -59,7 +60,7 @@ public override void Initialize(AnalysisContext context)`
`59`	`60`	`{`
`60`	`61`	`context.ReportDiagnostic(Diagnostic.Create(`
`61`	`62`	`WinRTRelayCommandIsNotGeneratedBindableCustomPropertyCompatible,`
`62`		`- relayCommandAttribute.GetLocation(),`
	`63`	`+ methodSymbol.Locations.FirstOrDefault(),`
`63`	`64`	`methodSymbol));`
`64`	`65`	`}`
`65`	`66`	`}, SymbolKind.Method);`
Original file line number	Diff line number	Diff line change
`@@ -21,8 +21,8 @@ namespace MyApp`
`21`	`21`	`{`
`22`	`22`	`public partial class SampleViewModel : ObservableObject`
`23`	`23`	`{`
`24`		`- [{\|MVVMTK0044:ObservableProperty\|}]`
`25`		`- public string Bar { get; set; }`
	`24`	`+ [ObservableProperty]`
	`25`	`+ public string {\|MVVMTK0044:Bar\|} { get; set; }`
`26`	`26`	`}`
`27`	`27`	`}`
`28`	`28`	`""";`
Original file line number	Diff line number	Diff line change
`@@ -78,8 +78,8 @@ namespace MyApp`
`78`	`78`	`{`
`79`	`79`	`public partial class SampleViewModel : ObservableObject`
`80`	`80`	`{`
`81`		`- [{\|MVVMTK0042:ObservableProperty\|}]`
`82`		`- private string name;`
	`81`	`+ [ObservableProperty]`
	`82`	`+ private string {\|MVVMTK0042:name\|};`
`83`	`83`	`}`
`84`	`84`	`}`
`85`	`85`	`""";`
`@@ -371,8 +371,8 @@ namespace MyApp`
`371`	`371`	`{`
`372`	`372`	`public partial class SampleViewModel : ObservableObject`
`373`	`373`	`{`
`374`		`- [{\|MVVMTK0045:ObservableProperty\|}]`
`375`		`- private string name;`
	`374`	`+ [ObservableProperty]`
	`375`	`+ private string {\|MVVMTK0045:name\|};`
`376`	`376`	`}`
`377`	`377`	`}`
`378`	`378`	`""";`
`@@ -415,8 +415,8 @@ namespace MyApp`
`415`	`415`	`{`
`416`	`416`	`public partial class SampleViewModel : ObservableObject`
`417`	`417`	`{`
`418`		`- [{\|MVVMTK0045:ObservableProperty\|}]`
`419`		`- private string name;`
	`418`	`+ [ObservableProperty]`
	`419`	`+ private string {\|MVVMTK0045:name\|};`
`420`	`420`	`}`
`421`	`421`	`}`
`422`	`422`	`""";`
`@@ -437,8 +437,8 @@ namespace MyApp`
`437`	`437`	`{`
`438`	`438`	`public partial class SampleViewModel : ObservableObject`
`439`	`439`	`{`
`440`		`- [{\|MVVMTK0045:ObservableProperty\|}]`
`441`		`- private string name;`
	`440`	`+ [ObservableProperty]`
	`441`	`+ private string {\|MVVMTK0045:name\|};`
`442`	`442`	`}`
`443`	`443`	`}`
`444`	`444`	`""";`
`@@ -459,8 +459,8 @@ namespace MyApp`
`459`	`459`	`{`
`460`	`460`	`public partial class SampleViewModel : ObservableObject`
`461`	`461`	`{`
`462`		`- [{\|MVVMTK0045:ObservableProperty\|}]`
`463`		`- private string name;`
	`462`	`+ [ObservableProperty]`
	`463`	`+ private string {\|MVVMTK0045:name\|};`
`464`	`464`	`}`
`465`	`465`	`}`
`466`	`466`
`@@ -486,8 +486,8 @@ namespace MyApp`
`486`	`486`	`{`
`487`	`487`	`public partial class SampleViewModel : ObservableObject`
`488`	`488`	`{`
`489`		`- [{\|MVVMTK0045:ObservableProperty\|}]`
`490`		`- private string name;`
	`489`	`+ [ObservableProperty]`
	`490`	`+ private string {\|MVVMTK0045:name\|};`
`491`	`491`	`}`
`492`	`492`	`}`
`493`	`493`
`@@ -585,8 +585,8 @@ public async Task WinRTGeneratedBindableCustomPropertyWithBasesMemberAnalyzer_Ta`
`585`	`585`
`586`	`586`	`namespace MyApp`
`587`	`587`	`{`
`588`		`- [{\|MVVMTK0047:GeneratedBindableCustomProperty\|}]`
`589`		`- public partial class SampleViewModel : BaseViewModel`
	`588`	`+ [GeneratedBindableCustomProperty]`
	`589`	`+ public partial class {\|MVVMTK0047:SampleViewModel\|} : BaseViewModel`
`590`	`590`	`{`
`591`	`591`	`}`
`592`	`592`
`@@ -620,8 +620,8 @@ public async Task WinRTGeneratedBindableCustomPropertyWithBasesMemberAnalyzer_Ta`
`620`	`620`
`621`	`621`	`namespace MyApp`
`622`	`622`	`{`
`623`		`- [{\|MVVMTK0048:GeneratedBindableCustomProperty\|}]`
`624`		`- public partial class SampleViewModel : BaseViewModel`
	`623`	`+ [GeneratedBindableCustomProperty]`
	`624`	`+ public partial class {\|MVVMTK0048:SampleViewModel\|} : BaseViewModel`
`625`	`625`	`{`
`626`	`626`	`}`
`627`	`627`