Merge pull request #2400 from sharwell/case-pattern-switch

Fix handling of colon after case in new pattern-matching switch statement

Author: sharwell

StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp7/SpacingRules/SA1024CSharp7UnitTests.cs

@@ -49,5 +49,52 @@ public void TestMethod()
             await this.VerifyCSharpDiagnosticAsync(fixedCode, EmptyDiagnosticResults, CancellationToken.None).ConfigureAwait(false);
             await this.VerifyCSharpFixAsync(testCode, fixedCode, cancellationToken: CancellationToken.None).ConfigureAwait(false);
         }
+
+        [Fact]
+        public async Task TestSpacingAroundColonInCasePatternSwitchLabelAsync()
+        {
+            const string testCode = @"
+public class Foo
+{
+    public void TestMethod()
+    {
+        switch (new object())
+        {
+        case int a when (a > 0):
+        case short b when (b > 0) :
+        case int x:
+        case short y :
+        default:
+            break;
+        }
+    }
+}";
+            const string fixedCode = @"
+public class Foo
+{
+    public void TestMethod()
+    {
+        switch (new object())
+        {
+        case int a when (a > 0):
+        case short b when (b > 0):
+        case int x:
+        case short y:
+        default:
+            break;
+        }
+    }
+}";
+
+            DiagnosticResult[] expected =
+            {
+                this.CSharpDiagnostic().WithLocation(9, 35).WithArguments(" not", "preceded", string.Empty),
+                this.CSharpDiagnostic().WithLocation(11, 22).WithArguments(" not", "preceded", string.Empty),
+            };
+
+            await this.VerifyCSharpDiagnosticAsync(testCode, expected, CancellationToken.None).ConfigureAwait(false);
+            await this.VerifyCSharpDiagnosticAsync(fixedCode, EmptyDiagnosticResults, CancellationToken.None).ConfigureAwait(false);
+            await this.VerifyCSharpFixAsync(testCode, fixedCode, cancellationToken: CancellationToken.None).ConfigureAwait(false);
+        }
     }
 }

StyleCop.Analyzers/StyleCop.Analyzers/SpacingRules/SA1024ColonsMustBeSpacedCorrectly.cs

@@ -5,11 +5,11 @@ namespace StyleCop.Analyzers.SpacingRules
 {
     using System;
     using System.Collections.Immutable;
-    using System.Linq;
     using Microsoft.CodeAnalysis;
     using Microsoft.CodeAnalysis.CSharp;
     using Microsoft.CodeAnalysis.Diagnostics;
     using StyleCop.Analyzers.Helpers;
+    using StyleCop.Analyzers.Lightup;
 
     /// <summary>
     /// A colon within a C# element is not spaced correctly.
@@ -112,6 +112,7 @@ private static void HandleColonToken(SyntaxTreeAnalysisContext context, SyntaxTo
             case SyntaxKind.LabeledStatement:
             case SyntaxKind.CaseSwitchLabel:
             case SyntaxKind.DefaultSwitchLabel:
+            case SyntaxKindEx.CasePatternSwitchLabel:
             // NameColon is not explicitly listed in the description of this warning, but the behavior is inferred
             case SyntaxKind.NameColon:
                 requireBefore = false;