Merge pull request #2742 from vweijsters/fix-2735

Allow generic type to be followed by colon token for switch pattern m…

Author: sharwell

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

@@ -50,5 +50,33 @@ public void TestMethod()
             await this.VerifyCSharpDiagnosticAsync(fixedCode, EmptyDiagnosticResults, CancellationToken.None).ConfigureAwait(false);
             await this.VerifyCSharpFixAsync(testCode, fixedCode, cancellationToken: CancellationToken.None).ConfigureAwait(false);
         }
+
+        /// <summary>
+        /// Verifies that a pattern in a switch statement that ends with a generic type does not produce a diagnostic.
+        /// </summary>
+        /// <returns>A <see cref="Task"/> representing the asynchronous unit test.</returns>
+        [Fact]
+        [WorkItem(2735, "https://github.com/DotNetAnalyzers/StyleCopAnalyzers/issues/2735")]
+        public async Task TestPatternMatchingInSwitchStatementWithGenericTypesAsync()
+        {
+            var testCode = @"using System.Collections.Generic;
+
+public class TestClass
+{
+    public void TestMethod(int i, object value)
+    {
+        switch (i)
+        {
+            case 1 when value is List<TestClass>:
+                break;
+        }
+
+        var x = i == 3 ? value as List<TestClass> : null;
+    }
+}
+";
+
+            await this.VerifyCSharpDiagnosticAsync(testCode, EmptyDiagnosticResults, CancellationToken.None).ConfigureAwait(false);
+        }
     }
 }

StyleCop.Analyzers/StyleCop.Analyzers/SpacingRules/SA1015ClosingGenericBracketsMustBeSpacedCorrectly.cs

@@ -9,6 +9,7 @@ namespace StyleCop.Analyzers.SpacingRules
     using Microsoft.CodeAnalysis.CSharp;
     using Microsoft.CodeAnalysis.Diagnostics;
     using StyleCop.Analyzers.Helpers;
+    using StyleCop.Analyzers.Lightup;
 
     /// <summary>
     /// A closing generic bracket within a C# element is not spaced correctly.
@@ -103,6 +104,7 @@ private static void HandleGreaterThanToken(SyntaxTreeAnalysisContext context, Sy
                 case SyntaxKind.OpenBracketToken:
                 // SemicolonToken isn't listed above, but it's required for reasonable using alias declaration formatting
                 case SyntaxKind.SemicolonToken:
+                case SyntaxKind.ColonToken when nextToken.Parent.IsKind(SyntaxKindEx.CasePatternSwitchLabel):
                     allowTrailingNoSpace = true;
                     allowTrailingSpace = false;
                     break;