Merge pull request #16 from delegateas/copilot/fix-ct0004-issue

Fix CT0004 to only apply to standalone if statements

Author: magesoe

src/DataverseAnalyzer/NoBracesForControlFlowAnalyzer.cs

@@ -32,22 +32,22 @@ public override void Initialize(AnalysisContext context)
         context.ConfigureGeneratedCodeAnalysis(GeneratedCodeAnalysisFlags.None);
         context.EnableConcurrentExecution();
         context.RegisterSyntaxNodeAction(AnalyzeIfStatement, SyntaxKind.IfStatement);
-        context.RegisterSyntaxNodeAction(AnalyzeElseClause, SyntaxKind.ElseClause);
     }
 
     private static void AnalyzeIfStatement(SyntaxNodeAnalysisContext context)
     {
         var ifStatement = (IfStatementSyntax)context.Node;
-        AnalyzeEmbeddedStatement(context, ifStatement.Statement);
-    }
+        if (ifStatement.Else is not null)
+        {
+            return;
+        }
 
-    private static void AnalyzeElseClause(SyntaxNodeAnalysisContext context)
-    {
-        var elseClause = (ElseClauseSyntax)context.Node;
-        if (elseClause.Statement is not IfStatementSyntax)
+        if (ifStatement.Parent is ElseClauseSyntax)
         {
-            AnalyzeEmbeddedStatement(context, elseClause.Statement);
+            return;
         }
+
+        AnalyzeEmbeddedStatement(context, ifStatement.Statement);
     }
 
     private static void AnalyzeEmbeddedStatement(SyntaxNodeAnalysisContext context, StatementSyntax statement)

tests/DataverseAnalyzer.Tests/NoBracesForControlFlowAnalyzerTests.cs

@@ -205,7 +205,7 @@ public void TestMethod()
     }
 
     [Fact]
-    public async Task ElseClauseWithOnlyReturnShouldTrigger()
+    public async Task ElseClauseWithOnlyReturnShouldNotTrigger()
     {
         var source = """
             class TestClass
@@ -223,12 +223,11 @@ public void TestMethod(bool condition)
             """;
 
         var diagnostics = await GetDiagnosticsAsync(source);
-        Assert.Single(diagnostics);
-        Assert.Equal("CT0004", diagnostics[0].Id);
+        Assert.Empty(diagnostics);
     }
 
     [Fact]
-    public async Task ElseIfShouldNotTrigger()
+    public async Task IfWithElseIfShouldNotTrigger()
     {
         var source = """
             class TestClass
@@ -248,7 +247,7 @@ public void TestMethod(bool condition1, bool condition2)
             """;
 
         var diagnostics = await GetDiagnosticsAsync(source);
-        Assert.Equal(2, diagnostics.Length);
+        Assert.Empty(diagnostics);
     }
 
     [Fact]
@@ -291,6 +290,34 @@ public void TestMethod(bool condition)
         Assert.Empty(diagnostics);
     }
 
+    [Fact]
+    public async Task IfElseWithMultipleStatementsInIfAndSingleControlFlowInElseShouldNotTrigger()
+    {
+        var source = """
+            class TestClass
+            {
+                public void TestMethod(bool condition)
+                {
+                    if (condition)
+                    {
+                        DoSomething();
+                        DoSomethingElse();
+                    }
+                    else
+                    {
+                        throw new System.Exception();
+                    }
+                }
+                
+                private void DoSomething() { }
+                private void DoSomethingElse() { }
+            }
+            """;
+
+        var diagnostics = await GetDiagnosticsAsync(source);
+        Assert.Empty(diagnostics);
+    }
+
     private static async Task<Diagnostic[]> GetDiagnosticsAsync(string source)
     {
         var syntaxTree = CSharpSyntaxTree.ParseText(source);