Update SA1009 to require a space after the closing parenthesis of if,…

… while, for and foreach statements, if it is followed by ++ or -- #3731
DotNetAnalyzers · Dec 15, 2023 · e641a23 · e641a23
1 parent be49652
commit e641a23
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 1 deletion.
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/SpacingRules/SA1009UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test/SpacingRules/SA1009UnitTests.cs
@@ -985,6 +985,49 @@ await Task.Delay(1000)
             await VerifyCSharpFixAsync(testCode, expected, fixedCode, CancellationToken.None).ConfigureAwait(false);
         }
 
+        [Theory]
+        [InlineData("if (true)")]
+        [InlineData("while (true)")]
+        [InlineData("for (var i = 0; i < 10; i++)")]
+        [InlineData("foreach (var i in a)")]
+        [WorkItem(3731, "https://github.com/DotNetAnalyzers/StyleCopAnalyzers/issues/3731")]
+        public async Task TestControlStatementWithBodyOnSameLineAsync(string stmt)
+        {
+            var testCode = $@"
+public class TestClass
+{{
+    public async void TestMethod(int x, int[] a)
+    {{
+        {stmt}++x;
+        {stmt}--x;
+        {stmt}x++;
+        {stmt}{{ x++; }}
+    }}
+}}";
+
+            var fixedCode = $@"
+public class TestClass
+{{
+    public async void TestMethod(int x, int[] a)
+    {{
+        {stmt} ++x;
+        {stmt} --x;
+        {stmt} x++;
+        {stmt} {{ x++; }}
+    }}
+}}";
+
+            var expected = new[]
+            {
+                Diagnostic(DescriptorFollowed).WithLocation(6, 8 + stmt.Length),
+                Diagnostic(DescriptorFollowed).WithLocation(7, 8 + stmt.Length),
+                Diagnostic(DescriptorFollowed).WithLocation(8, 8 + stmt.Length),
+                Diagnostic(DescriptorFollowed).WithLocation(9, 8 + stmt.Length),
+            };
+
+            await VerifyCSharpFixAsync(testCode, expected, fixedCode, CancellationToken.None).ConfigureAwait(false);
+        }
+
         private async Task TestWhitespaceInStatementOrDeclAsync(string originalStatement, string fixedStatement, params DiagnosticResult[] expected)
         {
             string template = @"namespace Foo

diff --git a/...nalyzers/StyleCop.Analyzers/SpacingRules/SA1009ClosingParenthesisMustBeSpacedCorrectly.cs b/...nalyzers/StyleCop.Analyzers/SpacingRules/SA1009ClosingParenthesisMustBeSpacedCorrectly.cs
@@ -181,7 +181,11 @@ private static void HandleCloseParenToken(SyntaxTreeAnalysisContext context, Syn
 
             case SyntaxKind.PlusPlusToken:
             case SyntaxKind.MinusMinusToken:
-                precedesStickyCharacter = true;
+                precedesStickyCharacter =
+                    !token.Parent.IsKind(SyntaxKind.IfStatement)
+                    && !token.Parent.IsKind(SyntaxKind.WhileStatement)
+                    && !token.Parent.IsKind(SyntaxKind.ForStatement)
+                    && !token.Parent.IsKind(SyntaxKind.ForEachStatement);
                 suppressFollowingSpaceError = false;
                 break;