Improve locations of some diagnostics

Sergio0694 · Sergio0694 · commit 5ad460b20f5d · 2025-01-03T02:28:42.000+01:00
diff --git a/components/DependencyPropertyGenerator/CommunityToolkit.DependencyPropertyGenerator.SourceGenerators/Diagnostics/Analyzers/ExplicitPropertyMetadataTypeAnalyzer.cs b/components/DependencyPropertyGenerator/CommunityToolkit.DependencyPropertyGenerator.SourceGenerators/Diagnostics/Analyzers/ExplicitPropertyMetadataTypeAnalyzer.cs
@@ -67,7 +67,7 @@ public override void Initialize(AnalysisContext context)
                 {
                     context.ReportDiagnostic(Diagnostic.Create(
                         UnnecessaryDependencyPropertyExplicitMetadataType,
-                        attributeData.GetLocation(),
+                        attributeData.GetNamedArgumentOrAttributeLocation("PropertyType"),
                         propertySymbol,
                         propertySymbol.Type));
 
@@ -79,7 +79,7 @@ public override void Initialize(AnalysisContext context)
                 {
                     context.ReportDiagnostic(Diagnostic.Create(
                         IncompatibleDependencyPropertyExplicitMetadataType,
-                        attributeData.GetLocation(),
+                        attributeData.GetNamedArgumentOrAttributeLocation("PropertyType"),
                         propertySymbol,
                         typeSymbol,
                         propertySymbol.Type));
diff --git a/components/DependencyPropertyGenerator/CommunityToolkit.DependencyPropertyGenerator.SourceGenerators/Diagnostics/Analyzers/InvalidPropertyDefaultValueCallbackTypeAnalyzer.cs b/components/DependencyPropertyGenerator/CommunityToolkit.DependencyPropertyGenerator.SourceGenerators/Diagnostics/Analyzers/InvalidPropertyDefaultValueCallbackTypeAnalyzer.cs
@@ -77,7 +77,7 @@ public override void Initialize(AnalysisContext context)
                 {
                     context.ReportDiagnostic(Diagnostic.Create(
                         InvalidPropertyDeclarationDefaultValueCallbackNoMethodFound,
-                        attributeData.GetLocation(),
+                        attributeData.GetNamedArgumentOrAttributeLocation("DefaultValueCallback"),
                         propertySymbol,
                         defaultValueCallback));
                 }
@@ -86,7 +86,7 @@ public override void Initialize(AnalysisContext context)
                     // Emit a diagnostic if the candidate method is not valid
                     context.ReportDiagnostic(Diagnostic.Create(
                         InvalidPropertyDeclarationDefaultValueCallbackInvalidMethod,
-                        attributeData.GetLocation(),
+                        attributeData.GetNamedArgumentOrAttributeLocation("DefaultValueCallback"),
                         propertySymbol,
                         defaultValueCallback));
                 }
diff --git a/components/DependencyPropertyGenerator/CommunityToolkit.DependencyPropertyGenerator.SourceGenerators/Diagnostics/Analyzers/InvalidPropertyDefaultValueTypeAnalyzer.cs b/components/DependencyPropertyGenerator/CommunityToolkit.DependencyPropertyGenerator.SourceGenerators/Diagnostics/Analyzers/InvalidPropertyDefaultValueTypeAnalyzer.cs
@@ -95,7 +95,7 @@ public override void Initialize(AnalysisContext context)
                     {
                         context.ReportDiagnostic(Diagnostic.Create(
                             InvalidPropertyDefaultValueNull,
-                            attributeData.GetLocation(),
+                            attributeData.GetNamedArgumentOrAttributeLocation("DefaultValue"),
                             propertySymbol,
                             propertySymbol.Type));
                     }
@@ -112,7 +112,7 @@ public override void Initialize(AnalysisContext context)
                     {
                         context.ReportDiagnostic(Diagnostic.Create(
                             InvalidPropertyDefaultValueType,
-                            attributeData.GetLocation(),
+                            attributeData.GetNamedArgumentOrAttributeLocation("DefaultValue"),
                             propertySymbol,
                             propertySymbol.Type,
                             defaultValue.Value,
diff --git a/components/DependencyPropertyGenerator/CommunityToolkit.DependencyPropertyGenerator.SourceGenerators/Diagnostics/Analyzers/InvalidPropertyNullableAnnotationAnalyzer.cs b/components/DependencyPropertyGenerator/CommunityToolkit.DependencyPropertyGenerator.SourceGenerators/Diagnostics/Analyzers/InvalidPropertyNullableAnnotationAnalyzer.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.GeneratedDependencyProperty.Constants;
 using CommunityToolkit.GeneratedDependencyProperty.Extensions;
 using Microsoft.CodeAnalysis;
@@ -78,7 +79,7 @@ public override void Initialize(AnalysisContext context)
                     {
                         context.ReportDiagnostic(Diagnostic.Create(
                             NotNullResilientAccessorsForNullablePropertyDeclaration,
-                            attributeData.GetLocation(),
+                            propertySymbol.Locations.FirstOrDefault(),
                             propertySymbol));
                     }
                 }
@@ -104,7 +105,7 @@ public override void Initialize(AnalysisContext context)
                     {
                         context.ReportDiagnostic(Diagnostic.Create(
                             NotNullResilientAccessorsForNotNullablePropertyDeclaration,
-                            attributeData.GetLocation(),
+                            propertySymbol.Locations.FirstOrDefault(),
                             propertySymbol));
                     }
 
@@ -114,7 +115,7 @@ public override void Initialize(AnalysisContext context)
                     {
                         context.ReportDiagnostic(Diagnostic.Create(
                             NonNullablePropertyDeclarationIsNotEnforced,
-                            attributeData.GetLocation(),
+                            propertySymbol.Locations.FirstOrDefault(),
                             propertySymbol));
                     }
                 }
diff --git a/components/DependencyPropertyGenerator/CommunityToolkit.DependencyPropertyGenerator.Tests/Test_Analyzers.cs b/components/DependencyPropertyGenerator/CommunityToolkit.DependencyPropertyGenerator.Tests/Test_Analyzers.cs
@@ -825,8 +825,8 @@ namespace MyApp;
 
             public partial class MyControl : Control
             {
-                [{|WCTDP0009:GeneratedDependencyProperty|}]
-                public partial string {|CS9248:Name|} { get; set; }
+                [GeneratedDependencyProperty]
+                public partial string {|WCTDP0009:{|CS9248:Name|}|} { get; set; }
             }
             """;
 
@@ -846,8 +846,8 @@ namespace MyApp;
 
             public partial class MyControl : Control
             {
-                [{|WCTDP0009:GeneratedDependencyProperty(DefaultValue = null)|}]
-                public partial string {|CS9248:Name|} { get; set; }
+                [GeneratedDependencyProperty(DefaultValue = null)]
+                public partial string {|WCTDP0009:{|CS9248:Name|}|} { get; set; }
             }
             """;
 
@@ -867,8 +867,8 @@ namespace MyApp;
 
             public partial class MyControl : Control
             {
-                [{|WCTDP0009:GeneratedDependencyProperty(DefaultValueCallback = nameof(GetDefaultName))|}]
-                public partial string {|CS9248:Name|} { get; set; }
+                [GeneratedDependencyProperty(DefaultValueCallback = nameof(GetDefaultName))]
+                public partial string {|WCTDP0009:{|CS9248:Name|}|} { get; set; }
 
                 private static string? GetDefaultName() => "Bob";
             }
@@ -891,8 +891,8 @@ namespace MyApp;
 
             public partial class MyControl : Control
             {
-                [{|WCTDP0009:GeneratedDependencyProperty(DefaultValueCallback = nameof(GetDefaultName))|}]
-                public partial string {|CS9248:Name|} { get; set; }
+                [GeneratedDependencyProperty(DefaultValueCallback = nameof(GetDefaultName))]
+                public partial string {|WCTDP0009:{|CS9248:Name|}|} { get; set; }
 
                 [return: MaybeNull]
                 private static string GetDefaultName() => "Bob";
@@ -916,9 +916,9 @@ namespace MyApp;
 
             public partial class MyControl : Control
             {
-                [{|WCTDP0009:GeneratedDependencyProperty|}]
+                [GeneratedDependencyProperty]
                 [AllowNull]
-                public partial string {|CS9248:Name|} { get; set; }
+                public partial string {|WCTDP0009:{|CS9248:Name|}|} { get; set; }
 
                 partial void {|CS0759:OnNameSet|}([NotNull] ref object? propertyValue)
                 {
@@ -972,9 +972,9 @@ namespace MyApp;
 
             public partial class MyControl : Control
             {
-                [{|WCTDP0009:GeneratedDependencyProperty|}]
+                [GeneratedDependencyProperty]
                 [AllowNull]
-                public partial string {|CS9248:Name|} { get; set; }
+                public partial string {|WCTDP0009:{|CS9248:Name|}|} { get; set; }
 
                 partial void {|CS0759:OnNameSet|}([NotNull] ref string? propertyValue)
                 {
@@ -1028,9 +1028,9 @@ namespace MyApp;
 
             public partial class MyControl : Control
             {
-                [{|WCTDP0009:{|WCTDP0024:GeneratedDependencyProperty|}|}]
+                [GeneratedDependencyProperty]
                 [AllowNull]
-                public partial string {|CS9248:Name|} { get; set; }
+                public partial string {|WCTDP0009:{|WCTDP0024:{|CS9248:Name|}|}|} { get; set; }
 
                 partial void {|CS0759:OnNameGet|}(ref string? propertyValue)
                 {
@@ -1055,9 +1055,9 @@ namespace MyApp;
 
             public partial class MyControl : Control
             {
-                [{|WCTDP0009:{|WCTDP0024:GeneratedDependencyProperty|}|}]
+                [GeneratedDependencyProperty]
                 [AllowNull]
-                public partial string {|CS9248:Name|} { get; set; }
+                public partial string {|WCTDP0009:{|WCTDP0024:{|CS9248:Name|}|}|} { get; set; }
             }
             """;
 
@@ -1303,9 +1303,9 @@ namespace MyApp;
 
             public partial class MyControl : Control
             {
-                [{|WCTDP0025:GeneratedDependencyProperty|}]
+                [GeneratedDependencyProperty]
                 [NotNull]
-                public partial string? {|CS9248:Name|} { get; set; }
+                public partial string? {|WCTDP0025:{|CS9248:Name|}|} { get; set; }
             }
             """;
 
@@ -1326,9 +1326,9 @@ namespace MyApp;
 
             public partial class MyControl : Control
             {
-                [{|WCTDP0025:GeneratedDependencyProperty|}]
+                [GeneratedDependencyProperty]
                 [NotNull]
-                public partial string? {|CS9248:Name|} { get; set; }
+                public partial string? {|WCTDP0025:{|CS9248:Name|}|} { get; set; }
 
                 partial void {|CS0759:OnNameSet|}(ref string? propertyValue)
                 {
@@ -1354,10 +1354,10 @@ namespace MyApp;
 
             public partial class MyControl : Control
             {
-                [{|WCTDP0025:GeneratedDependencyProperty|}]
+                [GeneratedDependencyProperty]
                 [NotNull]
                 [DisallowNull]
-                public partial string? {|CS9248:Name|} { get; set; }
+                public partial string? {|WCTDP0025:{|CS9248:Name|}|} { get; set; }
             }
             """;
 
@@ -1378,9 +1378,9 @@ namespace MyApp;
 
             public partial class MyControl : Control
             {
-                [{|WCTDP0025:GeneratedDependencyProperty|}]
+                [GeneratedDependencyProperty]
                 [NotNull]
-                public partial string? {|CS9248:Name|} { get; set; }
+                public partial string? {|WCTDP0025:{|CS9248:Name|}|} { get; set; }
 
                 partial void {|CS0759:OnNameSet|}([NotNull] ref string? propertyValue)
                 {
@@ -1407,9 +1407,9 @@ namespace MyApp;
             public abstract partial class Animation<TValue, TKeyFrame> : DependencyObject
                 where TKeyFrame : unmanaged
             {
-                [{|WCTDP0025:GeneratedDependencyProperty|}]
+                [GeneratedDependencyProperty]
                 [NotNull]
-                public partial KeyFrameCollection<TValue, TKeyFrame>? {|CS9248:KeyFrames|} { get; set; }
+                public partial KeyFrameCollection<TValue, TKeyFrame>? {|WCTDP0025:{|CS9248:KeyFrames|}|} { get; set; }
 
                 partial void {|CS0759:OnKeyFramesGet|}(ref KeyFrameCollection<TValue, TKeyFrame>? propertyValue)
                 {
@@ -1442,9 +1442,9 @@ namespace MyApp;
             public abstract partial class Animation<TValue, TKeyFrame> : DependencyObject
                 where TKeyFrame : unmanaged
             {
-                [{|WCTDP0009:{|WCTDP0024:GeneratedDependencyProperty|}|}]
+                [GeneratedDependencyProperty]
                 [AllowNull]
-                public partial KeyFrameCollection<TValue, TKeyFrame> {|CS9248:KeyFrames|} { get; set; }
+                public partial KeyFrameCollection<TValue, TKeyFrame> {|WCTDP0009:{|WCTDP0024:{|CS9248:KeyFrames|}|}|} { get; set; }
 
                 partial void {|CS0759:OnKeyFramesGet|}(ref KeyFrameCollection<TValue, TKeyFrame>? propertyValue)
                 {
@@ -1477,9 +1477,9 @@ namespace MyApp;
             public abstract partial class Animation<TValue, TKeyFrame> : DependencyObject
                 where TKeyFrame : unmanaged
             {
-                [{|WCTDP0024:GeneratedDependencyProperty|}]
+                [GeneratedDependencyProperty]
                 [AllowNull]
-                public required partial KeyFrameCollection<TValue, TKeyFrame> {|CS9248:KeyFrames|} { get; set; }
+                public required partial KeyFrameCollection<TValue, TKeyFrame> {|WCTDP0024:{|CS9248:KeyFrames|}|} { get; set; }
             }
 
             public sealed partial class KeyFrameCollection<TValue, TKeyFrame> : DependencyObjectCollection
@@ -1642,7 +1642,7 @@ namespace MyApp;
 
             public partial class MyControl : Control
             {
-                [{|WCTDP0010:GeneratedDependencyProperty(DefaultValue = null)|}]
+                [GeneratedDependencyProperty({|WCTDP0010:DefaultValue = null|})]
                 public partial int {|CS9248:Name|} { get; set; }
             }
             """;
@@ -1675,7 +1675,7 @@ public partial class MyObject<T1, T2, T3, T4, T5> : DependencyObject
                 where T4 : unmanaged
                 where T5 : IDisposable
             {
-                [{|WCTDP0010:GeneratedDependencyProperty(DefaultValue = null)|}]
+                [GeneratedDependencyProperty({|WCTDP0010:DefaultValue = null|})]
                 public partial {{propertyType}} {|CS9248:Name|} { get; set; }
             }
             """;
@@ -1700,7 +1700,7 @@ namespace MyApp;
 
             public partial class MyControl : Control
             {
-                [{|WCTDP0011:GeneratedDependencyProperty(DefaultValue = {{defaultValueType}})|}]
+                [GeneratedDependencyProperty({|WCTDP0011:DefaultValue = {{defaultValueType}}|})]
                 public partial {{propertyType}} {|CS9248:Name|} { get; set; }
             }
             """;
@@ -1862,7 +1862,7 @@ namespace MyApp;
 
             public partial class MyControl : Control
             {
-                [{|WCTDP0014:GeneratedDependencyProperty(DefaultValueCallback = "MissingMethod")|}]
+                [GeneratedDependencyProperty({|WCTDP0014:DefaultValueCallback = "MissingMethod"|})]
                 public partial string? {|CS9248:Name|} { get; set; }
             }
             """;
@@ -1883,7 +1883,7 @@ namespace MyApp;
 
             public partial class MyControl : Control, IGetDefaultValue
             {
-                [{|WCTDP0014:GeneratedDependencyProperty(DefaultValueCallback = "GetDefaultValue")|}]
+                [GeneratedDependencyProperty({|WCTDP0014:DefaultValueCallback = "GetDefaultValue"|})]
                 public partial string? {|CS9248:Name|} { get; set; }
 
                 static string? IGetDefaultValue.GetDefaultValue() => "Bob";
@@ -1915,7 +1915,7 @@ namespace MyApp;
 
             public partial class MyControl : Control
             {
-                [{|WCTDP0015:GeneratedDependencyProperty(DefaultValueCallback = "GetDefaultName")|}]
+                [GeneratedDependencyProperty({|WCTDP0015:DefaultValueCallback = "GetDefaultName"|})]
                 public partial string? {|CS9248:Name|} { get; set; }
 
                 {{methodSignature}} => default!;
@@ -2853,7 +2853,7 @@ public async Task ExplicitPropertyMetadataTypeAnalyzer_SameType_Warns(string typ
 
             public class MyObject : DependencyObject, IMyInterface
             {
-                [{|WCTDP0022:GeneratedDependencyProperty(PropertyType = typeof({{type}}))|}]
+                [GeneratedDependencyProperty({|WCTDP0022:PropertyType = typeof({{type}})|})]
                 public {{type}} Name { get; set; }
             }
 
@@ -2879,7 +2879,7 @@ public async Task ExplicitPropertyMetadataTypeAnalyzer_IncompatibleType_Warns(st
 
             public class MyObject : DependencyObject
             {
-                [{|WCTDP0023:GeneratedDependencyProperty(PropertyType = typeof({{propertyType}}))|}]
+                [GeneratedDependencyProperty({|WCTDP0023:PropertyType = typeof({{propertyType}})|})]
                 public {{declaredType}} Name { get; set; }
             }
 

Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ public override void Initialize(AnalysisContext context)`
`77`	`77`	`{`
`78`	`78`	`context.ReportDiagnostic(Diagnostic.Create(`
`79`	`79`	`InvalidPropertyDeclarationDefaultValueCallbackNoMethodFound,`
`80`		`- attributeData.GetLocation(),`
	`80`	`+ attributeData.GetNamedArgumentOrAttributeLocation("DefaultValueCallback"),`
`81`	`81`	`propertySymbol,`
`82`	`82`	`defaultValueCallback));`
`83`	`83`	`}`
`@@ -86,7 +86,7 @@ public override void Initialize(AnalysisContext context)`
`86`	`86`	`// Emit a diagnostic if the candidate method is not valid`
`87`	`87`	`context.ReportDiagnostic(Diagnostic.Create(`
`88`	`88`	`InvalidPropertyDeclarationDefaultValueCallbackInvalidMethod,`
`89`		`- attributeData.GetLocation(),`
	`89`	`+ attributeData.GetNamedArgumentOrAttributeLocation("DefaultValueCallback"),`
`90`	`90`	`propertySymbol,`
`91`	`91`	`defaultValueCallback));`
`92`	`92`	`}`
Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ public override void Initialize(AnalysisContext context)`
`95`	`95`	`{`
`96`	`96`	`context.ReportDiagnostic(Diagnostic.Create(`
`97`	`97`	`InvalidPropertyDefaultValueNull,`
`98`		`- attributeData.GetLocation(),`
	`98`	`+ attributeData.GetNamedArgumentOrAttributeLocation("DefaultValue"),`
`99`	`99`	`propertySymbol,`
`100`	`100`	`propertySymbol.Type));`
`101`	`101`	`}`
`@@ -112,7 +112,7 @@ public override void Initialize(AnalysisContext context)`
`112`	`112`	`{`
`113`	`113`	`context.ReportDiagnostic(Diagnostic.Create(`
`114`	`114`	`InvalidPropertyDefaultValueType,`
`115`		`- attributeData.GetLocation(),`
	`115`	`+ attributeData.GetNamedArgumentOrAttributeLocation("DefaultValue"),`
`116`	`116`	`propertySymbol,`
`117`	`117`	`propertySymbol.Type,`
`118`	`118`	`defaultValue.Value,`
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.GeneratedDependencyProperty.Constants;`
`7`	`8`	`using CommunityToolkit.GeneratedDependencyProperty.Extensions;`
`8`	`9`	`using Microsoft.CodeAnalysis;`
`@@ -78,7 +79,7 @@ public override void Initialize(AnalysisContext context)`
`78`	`79`	`{`
`79`	`80`	`context.ReportDiagnostic(Diagnostic.Create(`
`80`	`81`	`NotNullResilientAccessorsForNullablePropertyDeclaration,`
`81`		`- attributeData.GetLocation(),`
	`82`	`+ propertySymbol.Locations.FirstOrDefault(),`
`82`	`83`	`propertySymbol));`
`83`	`84`	`}`
`84`	`85`	`}`
`@@ -104,7 +105,7 @@ public override void Initialize(AnalysisContext context)`
`104`	`105`	`{`
`105`	`106`	`context.ReportDiagnostic(Diagnostic.Create(`
`106`	`107`	`NotNullResilientAccessorsForNotNullablePropertyDeclaration,`
`107`		`- attributeData.GetLocation(),`
	`108`	`+ propertySymbol.Locations.FirstOrDefault(),`
`108`	`109`	`propertySymbol));`
`109`	`110`	`}`
`110`	`111`
`@@ -114,7 +115,7 @@ public override void Initialize(AnalysisContext context)`
`114`	`115`	`{`
`115`	`116`	`context.ReportDiagnostic(Diagnostic.Create(`
`116`	`117`	`NonNullablePropertyDeclarationIsNotEnforced,`
`117`		`- attributeData.GetLocation(),`
	`118`	`+ propertySymbol.Locations.FirstOrDefault(),`
`118`	`119`	`propertySymbol));`
`119`	`120`	`}`
`120`	`121`	`}`
Original file line number	Diff line number	Diff line change
`@@ -825,8 +825,8 @@ namespace MyApp;`
`825`	`825`
`826`	`826`	`public partial class MyControl : Control`
`827`	`827`	`{`
`828`		`- [{\|WCTDP0009:GeneratedDependencyProperty\|}]`
`829`		`- public partial string {\|CS9248:Name\|} { get; set; }`
	`828`	`+ [GeneratedDependencyProperty]`
	`829`	`+ public partial string {\|WCTDP0009:{\|CS9248:Name\|}\|} { get; set; }`
`830`	`830`	`}`
`831`	`831`	`""";`
`832`	`832`
`@@ -846,8 +846,8 @@ namespace MyApp;`
`846`	`846`
`847`	`847`	`public partial class MyControl : Control`
`848`	`848`	`{`
`849`		`- [{\|WCTDP0009:GeneratedDependencyProperty(DefaultValue = null)\|}]`
`850`		`- public partial string {\|CS9248:Name\|} { get; set; }`
	`849`	`+ [GeneratedDependencyProperty(DefaultValue = null)]`
	`850`	`+ public partial string {\|WCTDP0009:{\|CS9248:Name\|}\|} { get; set; }`
`851`	`851`	`}`
`852`	`852`	`""";`
`853`	`853`
`@@ -867,8 +867,8 @@ namespace MyApp;`
`867`	`867`
`868`	`868`	`public partial class MyControl : Control`
`869`	`869`	`{`
`870`		`- [{\|WCTDP0009:GeneratedDependencyProperty(DefaultValueCallback = nameof(GetDefaultName))\|}]`
`871`		`- public partial string {\|CS9248:Name\|} { get; set; }`
	`870`	`+ [GeneratedDependencyProperty(DefaultValueCallback = nameof(GetDefaultName))]`
	`871`	`+ public partial string {\|WCTDP0009:{\|CS9248:Name\|}\|} { get; set; }`
`872`	`872`
`873`	`873`	`private static string? GetDefaultName() => "Bob";`
`874`	`874`	`}`
`@@ -891,8 +891,8 @@ namespace MyApp;`
`891`	`891`
`892`	`892`	`public partial class MyControl : Control`
`893`	`893`	`{`
`894`		`- [{\|WCTDP0009:GeneratedDependencyProperty(DefaultValueCallback = nameof(GetDefaultName))\|}]`
`895`		`- public partial string {\|CS9248:Name\|} { get; set; }`
	`894`	`+ [GeneratedDependencyProperty(DefaultValueCallback = nameof(GetDefaultName))]`
	`895`	`+ public partial string {\|WCTDP0009:{\|CS9248:Name\|}\|} { get; set; }`
`896`	`896`
`897`	`897`	`[return: MaybeNull]`
`898`	`898`	`private static string GetDefaultName() => "Bob";`
`@@ -916,9 +916,9 @@ namespace MyApp;`
`916`	`916`
`917`	`917`	`public partial class MyControl : Control`
`918`	`918`	`{`
`919`		`- [{\|WCTDP0009:GeneratedDependencyProperty\|}]`
	`919`	`+ [GeneratedDependencyProperty]`
`920`	`920`	`[AllowNull]`
`921`		`- public partial string {\|CS9248:Name\|} { get; set; }`
	`921`	`+ public partial string {\|WCTDP0009:{\|CS9248:Name\|}\|} { get; set; }`
`922`	`922`
`923`	`923`	`partial void {\|CS0759:OnNameSet\|}([NotNull] ref object? propertyValue)`
`924`	`924`	`{`
`@@ -972,9 +972,9 @@ namespace MyApp;`
`972`	`972`
`973`	`973`	`public partial class MyControl : Control`
`974`	`974`	`{`
`975`		`- [{\|WCTDP0009:GeneratedDependencyProperty\|}]`
	`975`	`+ [GeneratedDependencyProperty]`
`976`	`976`	`[AllowNull]`
`977`		`- public partial string {\|CS9248:Name\|} { get; set; }`
	`977`	`+ public partial string {\|WCTDP0009:{\|CS9248:Name\|}\|} { get; set; }`
`978`	`978`
`979`	`979`	`partial void {\|CS0759:OnNameSet\|}([NotNull] ref string? propertyValue)`
`980`	`980`	`{`
`@@ -1028,9 +1028,9 @@ namespace MyApp;`
`1028`	`1028`
`1029`	`1029`	`public partial class MyControl : Control`
`1030`	`1030`	`{`
`1031`		`- [{\|WCTDP0009:{\|WCTDP0024:GeneratedDependencyProperty\|}\|}]`
	`1031`	`+ [GeneratedDependencyProperty]`
`1032`	`1032`	`[AllowNull]`
`1033`		`- public partial string {\|CS9248:Name\|} { get; set; }`
	`1033`	`+ public partial string {\|WCTDP0009:{\|WCTDP0024:{\|CS9248:Name\|}\|}\|} { get; set; }`
`1034`	`1034`
`1035`	`1035`	`partial void {\|CS0759:OnNameGet\|}(ref string? propertyValue)`
`1036`	`1036`	`{`
`@@ -1055,9 +1055,9 @@ namespace MyApp;`
`1055`	`1055`
`1056`	`1056`	`public partial class MyControl : Control`
`1057`	`1057`	`{`
`1058`		`- [{\|WCTDP0009:{\|WCTDP0024:GeneratedDependencyProperty\|}\|}]`
	`1058`	`+ [GeneratedDependencyProperty]`
`1059`	`1059`	`[AllowNull]`
`1060`		`- public partial string {\|CS9248:Name\|} { get; set; }`
	`1060`	`+ public partial string {\|WCTDP0009:{\|WCTDP0024:{\|CS9248:Name\|}\|}\|} { get; set; }`
`1061`	`1061`	`}`
`1062`	`1062`	`""";`
`1063`	`1063`
`@@ -1303,9 +1303,9 @@ namespace MyApp;`
`1303`	`1303`
`1304`	`1304`	`public partial class MyControl : Control`
`1305`	`1305`	`{`
`1306`		`- [{\|WCTDP0025:GeneratedDependencyProperty\|}]`
	`1306`	`+ [GeneratedDependencyProperty]`
`1307`	`1307`	`[NotNull]`
`1308`		`- public partial string? {\|CS9248:Name\|} { get; set; }`
	`1308`	`+ public partial string? {\|WCTDP0025:{\|CS9248:Name\|}\|} { get; set; }`
`1309`	`1309`	`}`
`1310`	`1310`	`""";`
`1311`	`1311`
`@@ -1326,9 +1326,9 @@ namespace MyApp;`
`1326`	`1326`
`1327`	`1327`	`public partial class MyControl : Control`
`1328`	`1328`	`{`
`1329`		`- [{\|WCTDP0025:GeneratedDependencyProperty\|}]`
	`1329`	`+ [GeneratedDependencyProperty]`
`1330`	`1330`	`[NotNull]`
`1331`		`- public partial string? {\|CS9248:Name\|} { get; set; }`
	`1331`	`+ public partial string? {\|WCTDP0025:{\|CS9248:Name\|}\|} { get; set; }`
`1332`	`1332`
`1333`	`1333`	`partial void {\|CS0759:OnNameSet\|}(ref string? propertyValue)`
`1334`	`1334`	`{`
`@@ -1354,10 +1354,10 @@ namespace MyApp;`
`1354`	`1354`
`1355`	`1355`	`public partial class MyControl : Control`
`1356`	`1356`	`{`
`1357`		`- [{\|WCTDP0025:GeneratedDependencyProperty\|}]`
	`1357`	`+ [GeneratedDependencyProperty]`
`1358`	`1358`	`[NotNull]`
`1359`	`1359`	`[DisallowNull]`
`1360`		`- public partial string? {\|CS9248:Name\|} { get; set; }`
	`1360`	`+ public partial string? {\|WCTDP0025:{\|CS9248:Name\|}\|} { get; set; }`
`1361`	`1361`	`}`
`1362`	`1362`	`""";`
`1363`	`1363`
`@@ -1378,9 +1378,9 @@ namespace MyApp;`
`1378`	`1378`
`1379`	`1379`	`public partial class MyControl : Control`
`1380`	`1380`	`{`
`1381`		`- [{\|WCTDP0025:GeneratedDependencyProperty\|}]`
	`1381`	`+ [GeneratedDependencyProperty]`
`1382`	`1382`	`[NotNull]`
`1383`		`- public partial string? {\|CS9248:Name\|} { get; set; }`
	`1383`	`+ public partial string? {\|WCTDP0025:{\|CS9248:Name\|}\|} { get; set; }`
`1384`	`1384`
`1385`	`1385`	`partial void {\|CS0759:OnNameSet\|}([NotNull] ref string? propertyValue)`
`1386`	`1386`	`{`
`@@ -1407,9 +1407,9 @@ namespace MyApp;`
`1407`	`1407`	`public abstract partial class Animation<TValue, TKeyFrame> : DependencyObject`
`1408`	`1408`	`where TKeyFrame : unmanaged`
`1409`	`1409`	`{`
`1410`		`- [{\|WCTDP0025:GeneratedDependencyProperty\|}]`
	`1410`	`+ [GeneratedDependencyProperty]`
`1411`	`1411`	`[NotNull]`
`1412`		`- public partial KeyFrameCollection<TValue, TKeyFrame>? {\|CS9248:KeyFrames\|} { get; set; }`
	`1412`	`+ public partial KeyFrameCollection<TValue, TKeyFrame>? {\|WCTDP0025:{\|CS9248:KeyFrames\|}\|} { get; set; }`
`1413`	`1413`
`1414`	`1414`	`partial void {\|CS0759:OnKeyFramesGet\|}(ref KeyFrameCollection<TValue, TKeyFrame>? propertyValue)`
`1415`	`1415`	`{`
`@@ -1442,9 +1442,9 @@ namespace MyApp;`
`1442`	`1442`	`public abstract partial class Animation<TValue, TKeyFrame> : DependencyObject`
`1443`	`1443`	`where TKeyFrame : unmanaged`
`1444`	`1444`	`{`
`1445`		`- [{\|WCTDP0009:{\|WCTDP0024:GeneratedDependencyProperty\|}\|}]`
	`1445`	`+ [GeneratedDependencyProperty]`
`1446`	`1446`	`[AllowNull]`
`1447`		`- public partial KeyFrameCollection<TValue, TKeyFrame> {\|CS9248:KeyFrames\|} { get; set; }`
	`1447`	`+ public partial KeyFrameCollection<TValue, TKeyFrame> {\|WCTDP0009:{\|WCTDP0024:{\|CS9248:KeyFrames\|}\|}\|} { get; set; }`
`1448`	`1448`
`1449`	`1449`	`partial void {\|CS0759:OnKeyFramesGet\|}(ref KeyFrameCollection<TValue, TKeyFrame>? propertyValue)`
`1450`	`1450`	`{`
`@@ -1477,9 +1477,9 @@ namespace MyApp;`
`1477`	`1477`	`public abstract partial class Animation<TValue, TKeyFrame> : DependencyObject`
`1478`	`1478`	`where TKeyFrame : unmanaged`
`1479`	`1479`	`{`
`1480`		`- [{\|WCTDP0024:GeneratedDependencyProperty\|}]`
	`1480`	`+ [GeneratedDependencyProperty]`
`1481`	`1481`	`[AllowNull]`
`1482`		`- public required partial KeyFrameCollection<TValue, TKeyFrame> {\|CS9248:KeyFrames\|} { get; set; }`
	`1482`	`+ public required partial KeyFrameCollection<TValue, TKeyFrame> {\|WCTDP0024:{\|CS9248:KeyFrames\|}\|} { get; set; }`
`1483`	`1483`	`}`
`1484`	`1484`
`1485`	`1485`	`public sealed partial class KeyFrameCollection<TValue, TKeyFrame> : DependencyObjectCollection`
`@@ -1642,7 +1642,7 @@ namespace MyApp;`
`1642`	`1642`
`1643`	`1643`	`public partial class MyControl : Control`
`1644`	`1644`	`{`
`1645`		`- [{\|WCTDP0010:GeneratedDependencyProperty(DefaultValue = null)\|}]`
	`1645`	`+ [GeneratedDependencyProperty({\|WCTDP0010:DefaultValue = null\|})]`
`1646`	`1646`	`public partial int {\|CS9248:Name\|} { get; set; }`
`1647`	`1647`	`}`
`1648`	`1648`	`""";`
`@@ -1675,7 +1675,7 @@ public partial class MyObject<T1, T2, T3, T4, T5> : DependencyObject`
`1675`	`1675`	`where T4 : unmanaged`
`1676`	`1676`	`where T5 : IDisposable`
`1677`	`1677`	`{`
`1678`		`- [{\|WCTDP0010:GeneratedDependencyProperty(DefaultValue = null)\|}]`
	`1678`	`+ [GeneratedDependencyProperty({\|WCTDP0010:DefaultValue = null\|})]`
`1679`	`1679`	`public partial {{propertyType}} {\|CS9248:Name\|} { get; set; }`
`1680`	`1680`	`}`
`1681`	`1681`	`""";`
`@@ -1700,7 +1700,7 @@ namespace MyApp;`
`1700`	`1700`
`1701`	`1701`	`public partial class MyControl : Control`
`1702`	`1702`	`{`
`1703`		`- [{\|WCTDP0011:GeneratedDependencyProperty(DefaultValue = {{defaultValueType}})\|}]`
	`1703`	`+ [GeneratedDependencyProperty({\|WCTDP0011:DefaultValue = {{defaultValueType}}\|})]`
`1704`	`1704`	`public partial {{propertyType}} {\|CS9248:Name\|} { get; set; }`
`1705`	`1705`	`}`
`1706`	`1706`	`""";`
`@@ -1862,7 +1862,7 @@ namespace MyApp;`
`1862`	`1862`
`1863`	`1863`	`public partial class MyControl : Control`
`1864`	`1864`	`{`
`1865`		`- [{\|WCTDP0014:GeneratedDependencyProperty(DefaultValueCallback = "MissingMethod")\|}]`
	`1865`	`+ [GeneratedDependencyProperty({\|WCTDP0014:DefaultValueCallback = "MissingMethod"\|})]`
`1866`	`1866`	`public partial string? {\|CS9248:Name\|} { get; set; }`
`1867`	`1867`	`}`
`1868`	`1868`	`""";`
`@@ -1883,7 +1883,7 @@ namespace MyApp;`
`1883`	`1883`
`1884`	`1884`	`public partial class MyControl : Control, IGetDefaultValue`
`1885`	`1885`	`{`
`1886`		`- [{\|WCTDP0014:GeneratedDependencyProperty(DefaultValueCallback = "GetDefaultValue")\|}]`
	`1886`	`+ [GeneratedDependencyProperty({\|WCTDP0014:DefaultValueCallback = "GetDefaultValue"\|})]`
`1887`	`1887`	`public partial string? {\|CS9248:Name\|} { get; set; }`
`1888`	`1888`
`1889`	`1889`	`static string? IGetDefaultValue.GetDefaultValue() => "Bob";`
`@@ -1915,7 +1915,7 @@ namespace MyApp;`
`1915`	`1915`
`1916`	`1916`	`public partial class MyControl : Control`
`1917`	`1917`	`{`
`1918`		`- [{\|WCTDP0015:GeneratedDependencyProperty(DefaultValueCallback = "GetDefaultName")\|}]`
	`1918`	`+ [GeneratedDependencyProperty({\|WCTDP0015:DefaultValueCallback = "GetDefaultName"\|})]`
`1919`	`1919`	`public partial string? {\|CS9248:Name\|} { get; set; }`
`1920`	`1920`
`1921`	`1921`	`{{methodSignature}} => default!;`
`@@ -2853,7 +2853,7 @@ public async Task ExplicitPropertyMetadataTypeAnalyzer_SameType_Warns(string typ`
`2853`	`2853`
`2854`	`2854`	`public class MyObject : DependencyObject, IMyInterface`
`2855`	`2855`	`{`
`2856`		`- [{\|WCTDP0022:GeneratedDependencyProperty(PropertyType = typeof({{type}}))\|}]`
	`2856`	`+ [GeneratedDependencyProperty({\|WCTDP0022:PropertyType = typeof({{type}})\|})]`
`2857`	`2857`	`public {{type}} Name { get; set; }`
`2858`	`2858`	`}`
`2859`	`2859`
`@@ -2879,7 +2879,7 @@ public async Task ExplicitPropertyMetadataTypeAnalyzer_IncompatibleType_Warns(st`
`2879`	`2879`
`2880`	`2880`	`public class MyObject : DependencyObject`
`2881`	`2881`	`{`
`2882`		`- [{\|WCTDP0023:GeneratedDependencyProperty(PropertyType = typeof({{propertyType}}))\|}]`
	`2882`	`+ [GeneratedDependencyProperty({\|WCTDP0023:PropertyType = typeof({{propertyType}})\|})]`
`2883`	`2883`	`public {{declaredType}} Name { get; set; }`
`2884`	`2884`	`}`
`2885`	`2885`