Merge pull request #3061 from sharwell/pattern-cases

Fix spacing after closing brace in patterns

Author: vweijsters

StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp8/SpacingRules/SA1013CSharp8UnitTests.cs

@@ -3,9 +3,64 @@
 
 namespace StyleCop.Analyzers.Test.CSharp8.SpacingRules
 {
+    using System.Threading;
+    using System.Threading.Tasks;
     using StyleCop.Analyzers.Test.CSharp7.SpacingRules;
+    using Xunit;
+    using static StyleCop.Analyzers.Test.Verifiers.StyleCopCodeFixVerifier<
+        StyleCop.Analyzers.SpacingRules.SA1013ClosingBracesMustBeSpacedCorrectly,
+        StyleCop.Analyzers.SpacingRules.TokenSpacingCodeFixProvider>;
 
     public class SA1013CSharp8UnitTests : SA1013CSharp7UnitTests
     {
+        /// <summary>
+        /// Verifies the behavior of closing braces in case patterns.
+        /// </summary>
+        /// <returns>A <see cref="Task"/> representing the asynchronous unit test.</returns>
+        /// <seealso cref="SA1024CSharp8UnitTests.TestColonAfterClosingBraceInPatternAsync"/>
+        [Fact]
+        [WorkItem(3053, "https://github.com/DotNetAnalyzers/StyleCopAnalyzers/issues/3053")]
+        public async Task TestSpacingAroundClosingBraceInPatternAsync()
+        {
+            const string testCode = @"using System;
+
+public class Foo
+{
+    public void TestMethod(object value)
+    {
+        switch (value)
+        {
+        // The space before ':' is not checked
+        case ArgumentException { Message: { } message } :
+            break;
+
+        // The space before 'message' is checked
+        case Exception { Message: { }message }:
+            break;
+        }
+    }
+}";
+            const string fixedCode = @"using System;
+
+public class Foo
+{
+    public void TestMethod(object value)
+    {
+        switch (value)
+        {
+        // The space before ':' is not checked
+        case ArgumentException { Message: { } message } :
+            break;
+
+        // The space before 'message' is checked
+        case Exception { Message: { } message }:
+            break;
+        }
+    }
+}";
+
+            var expected = Diagnostic().WithSpan(14, 37, 14, 38).WithArguments(string.Empty, "followed");
+            await VerifyCSharpFixAsync(testCode, expected, fixedCode, CancellationToken.None).ConfigureAwait(false);
+        }
     }
 }

StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp8/SpacingRules/SA1024CSharp8UnitTests.cs

@@ -3,9 +3,54 @@
 
 namespace StyleCop.Analyzers.Test.CSharp8.SpacingRules
 {
+    using System.Threading;
+    using System.Threading.Tasks;
     using StyleCop.Analyzers.Test.CSharp7.SpacingRules;
+    using Xunit;
+    using static StyleCop.Analyzers.Test.Verifiers.StyleCopCodeFixVerifier<
+        StyleCop.Analyzers.SpacingRules.SA1024ColonsMustBeSpacedCorrectly,
+        StyleCop.Analyzers.SpacingRules.TokenSpacingCodeFixProvider>;
 
     public class SA1024CSharp8UnitTests : SA1024CSharp7UnitTests
     {
+        /// <summary>
+        /// Verifies the behavior of colons in case patterns.
+        /// </summary>
+        /// <returns>A <see cref="Task"/> representing the asynchronous unit test.</returns>
+        /// <seealso cref="SA1013CSharp8UnitTests.TestSpacingAroundClosingBraceInPatternAsync"/>
+        [Fact]
+        [WorkItem(3053, "https://github.com/DotNetAnalyzers/StyleCopAnalyzers/issues/3053")]
+        public async Task TestColonAfterClosingBraceInPatternAsync()
+        {
+            const string testCode = @"using System;
+
+public class Foo
+{
+    public void TestMethod(object value)
+    {
+        switch (value)
+        {
+        case Exception { Message: { } message } :
+            break;
+        }
+    }
+}";
+            const string fixedCode = @"using System;
+
+public class Foo
+{
+    public void TestMethod(object value)
+    {
+        switch (value)
+        {
+        case Exception { Message: { } message }:
+            break;
+        }
+    }
+}";
+
+            var expected = Diagnostic().WithSpan(9, 49, 9, 50).WithArguments(" not", "preceded", string.Empty);
+            await VerifyCSharpFixAsync(testCode, expected, fixedCode, CancellationToken.None).ConfigureAwait(false);
+        }
     }
 }

StyleCop.Analyzers/StyleCop.Analyzers/SpacingRules/SA1013ClosingBracesMustBeSpacedCorrectly.cs

@@ -10,6 +10,7 @@ namespace StyleCop.Analyzers.SpacingRules
     using Microsoft.CodeAnalysis.CSharp.Syntax;
     using Microsoft.CodeAnalysis.Diagnostics;
     using StyleCop.Analyzers.Helpers;
+    using StyleCop.Analyzers.Lightup;
 
     /// <summary>
     /// A closing brace within a C# element is not spaced correctly.
@@ -100,7 +101,8 @@ private static void HandleCloseBraceToken(SyntaxTreeAnalysisContext context, Syn
                     || nextToken.IsKind(SyntaxKind.SemicolonToken)
                     || nextToken.IsKind(SyntaxKind.DotToken)
                     || (nextToken.IsKind(SyntaxKind.QuestionToken) && nextToken.GetNextToken(includeZeroWidth: true).IsKind(SyntaxKind.DotToken))
-                    || nextToken.IsKind(SyntaxKind.CloseBracketToken);
+                    || nextToken.IsKind(SyntaxKind.CloseBracketToken)
+                    || (nextToken.IsKind(SyntaxKind.ColonToken) && nextToken.Parent.IsKind(SyntaxKindEx.CasePatternSwitchLabel));
             }
             else
             {