Fix missed case in automatic line ending (#76041)

dotnet · Nov 23, 2024 · f0bc04b · f0bc04b
2 parents 36754e8 + 3248330
commit f0bc04b
Show file tree

Hide file tree

Showing 3 changed files with 2,827 additions and 2,430 deletions.
diff --git a/src/EditorFeatures/CSharp/AutomaticCompletion/AutomaticLineEnderCommandHandler.cs b/src/EditorFeatures/CSharp/AutomaticCompletion/AutomaticLineEnderCommandHandler.cs
@@ -32,9 +32,6 @@
 
 namespace Microsoft.CodeAnalysis.Editor.CSharp.AutomaticCompletion;
 
-/// <summary>
-/// csharp automatic line ender command handler
-/// </summary>
 [Export(typeof(ICommandHandler))]
 [ContentType(ContentTypeNames.CSharpContentType)]
 [Name(PredefinedCommandHandlerNames.AutomaticLineEnder)]
@@ -324,18 +321,18 @@ protected override void ModifySelectedNode(
         {
             // For these syntax node, braces pair could be easily added by modify the syntax tree
             if (selectedNode is BaseTypeDeclarationSyntax
-                or BaseMethodDeclarationSyntax
-                or LocalFunctionStatementSyntax
-                or AccessorDeclarationSyntax
-                or ObjectCreationExpressionSyntax
-                or WhileStatementSyntax
-                or ForEachStatementSyntax
-                or ForStatementSyntax
-                or LockStatementSyntax
-                or UsingStatementSyntax
-                or DoStatementSyntax
-                or IfStatementSyntax
-                or ElseClauseSyntax)
+                    or BaseMethodDeclarationSyntax
+                    or LocalFunctionStatementSyntax
+                    or AccessorDeclarationSyntax
+                    or ObjectCreationExpressionSyntax
+                    or WhileStatementSyntax
+                    or CommonForEachStatementSyntax
+                    or ForStatementSyntax
+                    or LockStatementSyntax
+                    or UsingStatementSyntax
+                    or DoStatementSyntax
+                    or IfStatementSyntax
+                    or ElseClauseSyntax)
             {
                 // Add the braces and get the next caretPosition
                 var (newRoot, nextCaretPosition) = AddBraceToSelectedNode(document.SolutionServices, document.Root, selectedNode, formattingOptions, cancellationToken);

diff --git a/src/EditorFeatures/CSharp/AutomaticCompletion/AutomaticLineEnderCommandHandler_Helpers.cs b/src/EditorFeatures/CSharp/AutomaticCompletion/AutomaticLineEnderCommandHandler_Helpers.cs
@@ -942,7 +942,7 @@ private static SyntaxNode AddBlockToEmbeddedStatementOwner(
         return embeddedStatementOwner switch
         {
             DoStatementSyntax doStatementNode => doStatementNode.WithStatement(block),
-            ForEachStatementSyntax forEachStatementNode => forEachStatementNode.WithStatement(block),
+            CommonForEachStatementSyntax forEachStatementNode => forEachStatementNode.WithStatement(block),
             ForStatementSyntax forStatementNode => forStatementNode.WithStatement(block),
             IfStatementSyntax ifStatementNode => ifStatementNode.WithStatement(block),
             ElseClauseSyntax elseClauseNode => elseClauseNode.WithStatement(block),