Merge pull request #21425 from CyrusNajmabadi/caseKeywordRecommend

Recommend 'case' keyword after a pattern-case-clause.

src/EditorFeatures/CSharpTest2/Recommendations/CaseKeywordRecommenderTests.cs

@@ -94,6 +94,15 @@ public async Task TestAfterDefault()
     $$"));
         }
 
+        [Fact, Trait(Traits.Feature, Traits.Features.KeywordRecommending)]
+        public async Task TestAfterPatternCase()
+        {
+            await VerifyKeywordAsync(AddInsideMethod(
+@"switch (expr) {
+    case String s:
+    $$"));
+        }
+
         [Fact, Trait(Traits.Feature, Traits.Features.KeywordRecommending)]
         public async Task TestAfterOneStatement()
         {
@@ -104,6 +113,17 @@ public async Task TestAfterOneStatement()
     $$"));
         }
 
+        [Fact, Trait(Traits.Feature, Traits.Features.KeywordRecommending)]
+        public async Task TestAfterOneStatementPatternCase()
+        {
+            await VerifyKeywordAsync(AddInsideMethod(
+@"switch (expr) {
+    case String s:
+      Console.WriteLine();
+    $$"));
+        }
+
+
         [Fact, Trait(Traits.Feature, Traits.Features.KeywordRecommending)]
         public async Task TestAfterTwoStatements()
         {
@@ -125,6 +145,16 @@ public async Task TestAfterBlock()
     $$"));
         }
 
+        [Fact, Trait(Traits.Feature, Traits.Features.KeywordRecommending)]
+        public async Task TestAfterBlockPatternCase()
+        {
+            await VerifyKeywordAsync(AddInsideMethod(
+@"switch (expr) {
+    case String s: {
+    }
+    $$"));
+        }
+
         [Fact, Trait(Traits.Feature, Traits.Features.KeywordRecommending)]
         public async Task TestAfterIfElse()
         {

src/Workspaces/CSharp/Portable/Extensions/ContextQuery/SyntaxTokenExtensions.cs

@@ -387,7 +387,8 @@ public static bool IsSwitchLabelContext(this SyntaxToken targetToken)
 
             if (targetToken.Kind() == SyntaxKind.ColonToken)
             {
-                if (targetToken.Parent.IsKind(SyntaxKind.CaseSwitchLabel, SyntaxKind.DefaultSwitchLabel))
+                if (targetToken.Parent.IsKind(
+                        SyntaxKind.CaseSwitchLabel, SyntaxKind.DefaultSwitchLabel, SyntaxKind.CasePatternSwitchLabel))
                 {
                     return true;
                 }