From 53a897af28255d3c2ccb8d626cc54f8f9646565f Mon Sep 17 00:00:00 2001
From: Oleksandr T <oleksandr.tarasiuk@outlook.com>
Date: Thu, 2 Jan 2025 00:18:12 +0200
Subject: [PATCH 1/3] fix(60887): prevent indenting finally blocks as children
 of try statements

---
 src/services/formatting/smartIndenter.ts  |  7 +++++++
 tests/cases/fourslash/formatTryFinally.ts | 15 +++++++++++++++
 2 files changed, 22 insertions(+)
 create mode 100644 tests/cases/fourslash/formatTryFinally.ts

diff --git a/src/services/formatting/smartIndenter.ts b/src/services/formatting/smartIndenter.ts
index c6ed975a1a516..5a6e9634e47a6 100644
--- 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
new file mode 100644
index 0000000000000..d81cd45e79366
--- /dev/null
+++ 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 {
+    // ...
+}`);

From 382459f5644bcc1bd7a73e27ebc5aac63587d2eb Mon Sep 17 00:00:00 2001
From: Oleksandr T <oleksandr.tarasiuk@outlook.com>
Date: Sat, 22 Feb 2025 03:00:02 +0200
Subject: [PATCH 2/3] adjust try statement indentation for child blocks

---
 src/services/formatting/smartIndenter.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/services/formatting/smartIndenter.ts b/src/services/formatting/smartIndenter.ts
index 5a6e9634e47a6..63962242f655f 100644
--- a/src/services/formatting/smartIndenter.ts
+++ b/src/services/formatting/smartIndenter.ts
@@ -731,8 +731,7 @@ export namespace SmartIndenter {
                 }
                 break;
             case SyntaxKind.TryStatement:
-                const tryStatement = parent as TryStatement;
-                if (tryStatement.finallyBlock && tryStatement.finallyBlock === child) {
+                if (childKind === SyntaxKind.Block) {
                     return false;
                 }
                 break;

From b416547ddcb108ccb10c4b8c74c70973e1da42bb Mon Sep 17 00:00:00 2001
From: Oleksandr T <oleksandr.tarasiuk@outlook.com>
Date: Sat, 22 Feb 2025 03:02:59 +0200
Subject: [PATCH 3/3] cleanup

---
 src/services/formatting/smartIndenter.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/services/formatting/smartIndenter.ts b/src/services/formatting/smartIndenter.ts
index 63962242f655f..7f41a2701b8c3 100644
--- a/src/services/formatting/smartIndenter.ts
+++ b/src/services/formatting/smartIndenter.ts
@@ -52,7 +52,6 @@ import {
     SourceFileLike,
     SyntaxKind,
     TextRange,
-    TryStatement,
     TypeAliasDeclaration,
     TypeLiteralNode,
     TypeReferenceNode,