Merge pull request #1026 from CommunityToolkit/dev/fix-body-expressions

Handle semi-auto properties with expression bodies
CommunityToolkit · Dec 12, 2024 · 657c697 · 657c697
2 parents ef36a6d + 3c720dd
commit 657c697
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 2 deletions.
diff --git a/...SourceGenerators/Diagnostics/Analyzers/UseObservablePropertyOnSemiAutoPropertyAnalyzer.cs b/...SourceGenerators/Diagnostics/Analyzers/UseObservablePropertyOnSemiAutoPropertyAnalyzer.cs
@@ -249,8 +249,12 @@ public override void Initialize(AnalysisContext context)
                     }
 
                     // Check that either of them is a semicolon token 'get;' accessor (it can be in either position)
-                    if (firstAccessor.IsKind(SyntaxKind.GetAccessorDeclaration) && firstAccessor.SemicolonToken.IsKind(SyntaxKind.SemicolonToken) ||
-                        secondAccessor.IsKind(SyntaxKind.GetAccessorDeclaration) && secondAccessor.SemicolonToken.IsKind(SyntaxKind.SemicolonToken))
+                    if (firstAccessor.IsKind(SyntaxKind.GetAccessorDeclaration) &&
+                        firstAccessor.SemicolonToken.IsKind(SyntaxKind.SemicolonToken) &&
+                        firstAccessor.ExpressionBody is null ||
+                        secondAccessor.IsKind(SyntaxKind.GetAccessorDeclaration) &&
+                        secondAccessor.SemicolonToken.IsKind(SyntaxKind.SemicolonToken) &&
+                        secondAccessor.ExpressionBody is null)
                     {
                         validFlags[0] = true;
                     }

diff --git a/...ityToolkit.Mvvm.SourceGenerators.Roslyn4120.UnitTests/Test_SourceGeneratorsDiagnostics.cs b/...ityToolkit.Mvvm.SourceGenerators.Roslyn4120.UnitTests/Test_SourceGeneratorsDiagnostics.cs
@@ -1403,6 +1403,27 @@ public string Name
         await CSharpAnalyzerWithLanguageVersionTest<UseObservablePropertyOnSemiAutoPropertyAnalyzer>.VerifyAnalyzerAsync(source, LanguageVersion.Preview);
     }
 
+    [TestMethod]
+    public async Task UseObservablePropertyOnSemiAutoPropertyAnalyzer_GetAccessorWithExpressionBody_DoesNotWarn()
+    {
+        const string source = """
+            using CommunityToolkit.Mvvm.ComponentModel;
+
+            namespace MyApp;
+
+            public partial class SampleViewModel : ObservableObject
+            {
+                public string Name
+                {
+                    get => "Hello world";
+                    set => SetProperty(ref field, value);
+                }
+            }
+            """;
+
+        await CSharpAnalyzerWithLanguageVersionTest<UseObservablePropertyOnSemiAutoPropertyAnalyzer>.VerifyAnalyzerAsync(source, LanguageVersion.Preview);
+    }
+
     [TestMethod]
     public async Task UseObservablePropertyOnSemiAutoPropertyAnalyzer_ValidProperty_Warns()
     {