Refine logic to emit nullable diagnostics

Author: Sergio0694

components/DependencyPropertyGenerator/CommunityToolkit.DependencyPropertyGenerator.SourceGenerators/Diagnostics/Analyzers/InvalidPropertyNullableAnnotationAnalyzer.cs

@@ -91,30 +91,31 @@ public override void Initialize(AnalysisContext context)
                         return;
                     }
 
+                    // If the getter is null-resilient, then we never need to emit a warning here
+                    if (IsAccessorMethodMarkedAsNotNull(propertySymbol, SyntaxKind.GetAccessorDeclaration, notNullAttributeSymbols))
+                    {
+                        return;
+                    }
+
                     // If setting 'null' values is allowed, then the initial state (and the default value) don't matter anymore.
                     // In order to be correct, we must have '[NotNull]' on any implemented getter or setter methods (same as above).
-                    if (propertySymbol.HasAttributeWithAnyType(allowNullAttributeSymbols))
+                    if (propertySymbol.HasAttributeWithAnyType(allowNullAttributeSymbols) &&
+                        !IsAccessorMethodMarkedAsNotNull(propertySymbol, SyntaxKind.SetAccessorDeclaration, notNullAttributeSymbols))
                     {
-                        if (!IsAccessorMethodMarkedAsNotNull(propertySymbol, SyntaxKind.GetAccessorDeclaration, notNullAttributeSymbols) &&
-                            !IsAccessorMethodMarkedAsNotNull(propertySymbol, SyntaxKind.SetAccessorDeclaration, notNullAttributeSymbols))
-                        {
-                            context.ReportDiagnostic(Diagnostic.Create(
-                                NotNullResilientAccessorsForNotNullablePropertyDeclaration,
-                                attributeData.GetLocation(),
-                                propertySymbol));
-                        }
+                        context.ReportDiagnostic(Diagnostic.Create(
+                            NotNullResilientAccessorsForNotNullablePropertyDeclaration,
+                            attributeData.GetLocation(),
+                            propertySymbol));
                     }
-                    else
+
+                    // In either case, we need to check that either the property is required, or that the default value is not 'null'.
+                    // This is because when the nullability of the setter is correct, then the default value takes precedence.
+                    if (!propertySymbol.IsRequired && !IsDefaultValueNotNull(propertySymbol, attributeData, maybeNullAttributeSymbols, notNullAttributeSymbols))
                     {
-                        // Otherwise, we need to check that either the property is required, or that the default value is not 'null'.
-                        // This is because when the nullability of the setter is correct, then the default value takes precedence.
-                        if (!propertySymbol.IsRequired && !IsDefaultValueNotNull(propertySymbol, attributeData, maybeNullAttributeSymbols, notNullAttributeSymbols))
-                        {
-                            context.ReportDiagnostic(Diagnostic.Create(
-                                NonNullablePropertyDeclarationIsNotEnforced,
-                                attributeData.GetLocation(),
-                                propertySymbol));
-                        }
+                        context.ReportDiagnostic(Diagnostic.Create(
+                            NonNullablePropertyDeclarationIsNotEnforced,
+                            attributeData.GetLocation(),
+                            propertySymbol));
                     }
                 }
             }, SymbolKind.Property);

components/DependencyPropertyGenerator/CommunityToolkit.DependencyPropertyGenerator.Tests/Test_Analyzers.cs

@@ -903,7 +903,7 @@ public partial class MyControl : Control
     }
 
     [TestMethod]
-    public async Task InvalidPropertyNullableAnnotationAnalyzer_NotNullableType_AllowNull_WithNullResilientSetter_Object_DoesNotWarn()
+    public async Task InvalidPropertyNullableAnnotationAnalyzer_NotNullableType_AllowNull_WithNullResilientSetter_Object_Warns()
     {
         const string source = """
             using System.Diagnostics.CodeAnalysis;
@@ -916,7 +916,7 @@ namespace MyApp;
 
             public partial class MyControl : Control
             {
-                [GeneratedDependencyProperty]
+                [{|WCTDP0009:GeneratedDependencyProperty|}]
                 [AllowNull]
                 public partial string {|CS9248:Name|} { get; set; }
 
@@ -959,7 +959,7 @@ public partial class MyControl : Control
     }
 
     [TestMethod]
-    public async Task InvalidPropertyNullableAnnotationAnalyzer_NotNullableType_AllowNull_WithNullResilientSetter_DoesNotWarn()
+    public async Task InvalidPropertyNullableAnnotationAnalyzer_NotNullableType_AllowNull_WithNullResilientSetter_Warns()
     {
         const string source = """
             using System.Diagnostics.CodeAnalysis;
@@ -972,7 +972,7 @@ namespace MyApp;
 
             public partial class MyControl : Control
             {
-                [GeneratedDependencyProperty]
+                [{|WCTDP0009:GeneratedDependencyProperty|}]
                 [AllowNull]
                 public partial string {|CS9248:Name|} { get; set; }
 
@@ -1028,7 +1028,7 @@ namespace MyApp;
 
             public partial class MyControl : Control
             {
-                [{|WCTDP0024:GeneratedDependencyProperty|}]
+                [{|WCTDP0009:{|WCTDP0024:GeneratedDependencyProperty|}|}]
                 [AllowNull]
                 public partial string {|CS9248:Name|} { get; set; }
 
@@ -1055,7 +1055,7 @@ namespace MyApp;
 
             public partial class MyControl : Control
             {
-                [{|WCTDP0024:GeneratedDependencyProperty|}]
+                [{|WCTDP0009:{|WCTDP0024:GeneratedDependencyProperty|}|}]
                 [AllowNull]
                 public partial string {|CS9248:Name|} { get; set; }
             }