Merge pull request #33051 from JoeRobich/classify-foreachvarstmt

Classify keywords in ForEachVariableStatements as ControlKeywords

src/EditorFeatures/CSharpTest/Classification/SyntacticClassifierTests.cs

@@ -4679,5 +4679,35 @@ public async Task TestUsingStaticDirective()
                 Identifier("Console"),
                 Punctuation.Semicolon);
         }
+
+        [WorkItem(33039, "https://github.com/dotnet/roslyn/issues/33039")]
+        [Fact, Trait(Traits.Feature, Traits.Features.Classification)]
+        public async Task ForEachVariableStatement()
+        {
+            await TestInMethodAsync(@"
+foreach (var (x, y) in new[] { (1, 2) });
+",
+                ControlKeyword("foreach"),
+                Punctuation.OpenParen,
+                Identifier("var"),
+                Punctuation.OpenParen,
+                Local("x"),
+                Punctuation.Comma,
+                Local("y"),
+                Punctuation.CloseParen,
+                ControlKeyword("in"),
+                Keyword("new"),
+                Punctuation.OpenBracket,
+                Punctuation.CloseBracket,
+                Punctuation.OpenCurly,
+                Punctuation.OpenParen,
+                Number("1"),
+                Punctuation.Comma,
+                Number("2"),
+                Punctuation.CloseParen,
+                Punctuation.CloseCurly,
+                Punctuation.CloseParen,
+                Punctuation.Semicolon);
+        }
     }
 }

src/Workspaces/CSharp/Portable/Classification/ClassificationHelpers.cs

@@ -114,6 +114,7 @@ private static bool IsControlStatementKind(SyntaxKind kind)
                 case SyntaxKind.DoStatement:
                 case SyntaxKind.ForStatement:
                 case SyntaxKind.ForEachStatement:
+                case SyntaxKind.ForEachVariableStatement:
                 // Checked Statements
                 case SyntaxKind.IfStatement:
                 case SyntaxKind.ElseClause: