Merge pull request #1842 from sharwell/fix-1777

Fix handling of semicolon followed by empty statement

Author: sharwell

StyleCop.Analyzers/StyleCop.Analyzers.Test/SpacingRules/SA1002UnitTests.cs

@@ -221,6 +221,26 @@ void MethodName()
             await this.VerifyCSharpDiagnosticAsync(testCode, EmptyDiagnosticResults, CancellationToken.None).ConfigureAwait(false);
         }
 
+        /// <summary>
+        /// This is a regression test for DotNetAnalyzers/StyleCopAnalyzers#1777.
+        /// </summary>
+        /// <returns>A <see cref="Task"/> representing the asynchronous unit test.</returns>
+        [Fact]
+        public async Task TestEmptyStatementAfterCallAsync()
+        {
+            string testCode = @"using System;
+class ClassName
+{
+    void MethodName()
+    {
+        Console.WriteLine();;
+    }
+}
+";
+
+            await this.VerifyCSharpDiagnosticAsync(testCode, EmptyDiagnosticResults, CancellationToken.None).ConfigureAwait(false);
+        }
+
         [Fact]
         public async Task TestSingleLineAccessorsAsync()
         {

StyleCop.Analyzers/StyleCop.Analyzers/SpacingRules/SA1002SemicolonsMustBeSpacedCorrectly.cs

@@ -92,11 +92,26 @@ private static void HandleSemicolonToken(SyntaxTreeAnalysisContext context, Synt
             else
             {
                 SyntaxToken nextToken = token.GetNextToken();
-                if (nextToken.IsKind(SyntaxKind.CloseParenToken))
+                switch (nextToken.Kind())
                 {
+                case SyntaxKind.CloseParenToken:
                     // Special handling for the following case:
                     // for (; ;)
                     missingFollowingSpace = false;
+                    break;
+
+                case SyntaxKind.SemicolonToken:
+                    // Special handling for the following case:
+                    // Statement();;
+                    if (nextToken.Parent.IsKind(SyntaxKind.EmptyStatement))
+                    {
+                        missingFollowingSpace = false;
+                    }
+
+                    break;
+
+                default:
+                    break;
                 }
             }