Merge pull request #2510 from sharwell/test-missing-tokens

Fix and test handling of missing tokens in SA1500 (BracesForMultiLineStatementsMustNotShareLine)

Author: vweijsters

StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1500/SA1500UnitTests.Properties.cs

@@ -6,6 +6,7 @@ namespace StyleCop.Analyzers.Test.LayoutRules
     using System.Threading;
     using System.Threading.Tasks;
     using StyleCop.Analyzers.LayoutRules;
+    using StyleCop.Analyzers.Lightup;
     using TestHelper;
     using Xunit;
 
@@ -461,5 +462,66 @@ public int[] TestProperty
             await this.VerifyCSharpDiagnosticAsync(fixedTestCode, EmptyDiagnosticResults, CancellationToken.None).ConfigureAwait(false);
             await this.VerifyCSharpFixAsync(testCode, fixedTestCode).ConfigureAwait(false);
         }
+
+        /// <summary>
+        /// Verifies that a property declaration missing the opening brace will be handled correctly.
+        /// </summary>
+        /// <returns>A <see cref="Task"/> representing the asynchronous unit test.</returns>
+        [Fact]
+        public async Task TestAccessorMissingOpeningBraceAsync()
+        {
+            var testCode = @"
+class ClassName
+{
+    int Property
+    {
+        get
+        }
+    }
+}";
+
+            DiagnosticResult accessorError;
+            if (LightupHelpers.SupportsCSharp7)
+            {
+                accessorError = this.CSharpCompilerError("CS8180").WithMessage("{ or ; or => expected");
+            }
+            else
+            {
+                accessorError = this.CSharpCompilerError("CS1043").WithMessage("{ or ; expected");
+            }
+
+            DiagnosticResult[] expected =
+            {
+                accessorError.WithLocation(6, 12),
+                this.CSharpCompilerError("CS1022").WithMessage("Type or namespace definition, or end-of-file expected").WithLocation(9, 1),
+            };
+            await this.VerifyCSharpDiagnosticAsync(testCode, expected, CancellationToken.None).ConfigureAwait(false);
+        }
+
+        /// <summary>
+        /// Verifies that a property declaration missing the closing brace at the end of the source file will be handled
+        /// correctly.
+        /// </summary>
+        /// <returns>A <see cref="Task"/> representing the asynchronous unit test.</returns>
+        [Fact]
+        public async Task TestAccessorMissingClosingBraceAtEndOfFileAsync()
+        {
+            var testCode = @"
+class ClassName
+{
+    int Property
+    {
+        get
+        {";
+
+            DiagnosticResult[] expected =
+            {
+                this.CSharpCompilerError("CS0161").WithMessage("'ClassName.Property.get': not all code paths return a value").WithLocation(6, 9),
+                this.CSharpCompilerError("CS1513").WithMessage("} expected").WithLocation(7, 10),
+                this.CSharpCompilerError("CS1513").WithMessage("} expected").WithLocation(7, 10),
+                this.CSharpCompilerError("CS1513").WithMessage("} expected").WithLocation(7, 10),
+            };
+            await this.VerifyCSharpDiagnosticAsync(testCode, expected, CancellationToken.None).ConfigureAwait(false);
+        }
     }
 }

StyleCop.Analyzers/StyleCop.Analyzers/LayoutRules/SA1500BracesForMultiLineStatementsMustNotShareLine.cs

@@ -186,7 +186,7 @@ private static void CheckBraceToken(SyntaxNodeAnalysisContext context, SyntaxTok
 
             int line = token.GetLineSpan().StartLinePosition.Line;
 
-            SyntaxToken previousToken = token.GetPreviousToken();
+            SyntaxToken previousToken = token.GetPreviousToken(includeZeroWidth: true);
             if (!previousToken.IsMissing)
             {
                 if (previousToken.GetLineSpan().StartLinePosition.Line == line)
@@ -198,7 +198,7 @@ private static void CheckBraceToken(SyntaxNodeAnalysisContext context, SyntaxTok
                 }
             }
 
-            SyntaxToken nextToken = token.GetNextToken();
+            SyntaxToken nextToken = token.GetNextToken(includeZeroWidth: true);
             if (!nextToken.IsMissing)
             {
                 switch (nextToken.Kind())
@@ -210,7 +210,7 @@ private static void CheckBraceToken(SyntaxNodeAnalysisContext context, SyntaxTok
                     // these are allowed to appear on the same line
                     return;
 
-                case SyntaxKind.None:
+                case SyntaxKind.EndOfFileToken:
                     // last token of this file
                     return;