fix(60887): prevent indenting finally blocks as children of try state…

…ments
microsoft · Jan 1, 2025 · 53a897a · 53a897a
1 parent 56a0825
commit 53a897a
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 0 deletions.
diff --git a/src/services/formatting/smartIndenter.ts b/src/services/formatting/smartIndenter.ts
@@ -52,6 +52,7 @@ import {
     SourceFileLike,
     SyntaxKind,
     TextRange,
+    TryStatement,
     TypeAliasDeclaration,
     TypeLiteralNode,
     TypeReferenceNode,
@@ -729,6 +730,12 @@ export namespace SmartIndenter {
                     return false;
                 }
                 break;
+            case SyntaxKind.TryStatement:
+                const tryStatement = parent as TryStatement;
+                if (tryStatement.finallyBlock && tryStatement.finallyBlock === child) {
+                    return false;
+                }
+                break;
         }
         // No explicit rule for given nodes so the result will follow the default value argument
         return indentByDefault;

diff --git a/tests/cases/fourslash/formatTryFinally.ts b/tests/cases/fourslash/formatTryFinally.ts
@@ -0,0 +1,15 @@
+/// <reference path="fourslash.ts"/>
+
+////if (true) try  {
+////    // ...
+////}   finally    {
+////    // ...
+////}
+
+format.document();
+verify.currentFileContentIs(
+`if (true) try {
+    // ...
+} finally {
+    // ...
+}`);