fix try/finally not re-throwing errors when there is no catch clause (#1692)

RealColdFry · web-flow · commit cfb6e2b388c8 · 2026-03-24T22:29:17.000+01:00
* fix try/finally not re-throwing errors when there is no catch clause (#1667) When a try block had a finally but no catch, pcall's error result was discarded, silently swallowing the exception. Now the error is captured and re-thrown after the finally block executes. * Nicer test return values
diff --git a/src/transformation/visitors/errors.ts b/src/transformation/visitors/errors.ts
@@ -146,6 +146,10 @@ export const transformTryStatement: FunctionVisitor<ts.TryStatement> = (statemen
             returnedIdentifier,
             lua.SyntaxKind.AndOperator
         );
+    } else if (statement.finallyBlock) {
+        // try without catch, but with finally — need to capture error for re-throw
+        const errorIdentifier = lua.createIdentifier("____error");
+        result.push(lua.createVariableDeclarationStatement([tryResultIdentifier, errorIdentifier], tryCall));
     } else {
         // try without return or catch
         result.push(lua.createExpressionStatement(tryCall));
@@ -155,6 +159,22 @@ export const transformTryStatement: FunctionVisitor<ts.TryStatement> = (statemen
         result.push(...context.transformStatements(statement.finallyBlock));
     }
 
+    // Re-throw error if try had no catch but had a finally
+    if (!statement.catchClause && statement.finallyBlock) {
+        const notTryCondition = lua.createUnaryExpression(
+            lua.cloneIdentifier(tryResultIdentifier),
+            lua.SyntaxKind.NotOperator
+        );
+        const errorIdentifier = lua.createIdentifier("____error");
+        const rethrow = lua.createExpressionStatement(
+            lua.createCallExpression(lua.createIdentifier("error"), [
+                lua.cloneIdentifier(errorIdentifier),
+                lua.createNumericLiteral(0),
+            ])
+        );
+        result.push(lua.createIfStatement(notTryCondition, lua.createBlock([rethrow])));
+    }
+
     if (returnCondition && returnedIdentifier) {
         const returnValues: lua.Expression[] = [];
 
diff --git a/test/unit/error.spec.ts b/test/unit/error.spec.ts
@@ -256,6 +256,28 @@ test("multi return from catch->finally", () => {
         .expectToMatchJsResult();
 });
 
+test("throw propagates through finally to outer catch", () => {
+    util.testFunction`
+        function thrower() {
+            try {
+                throw "Error";
+            } finally {
+            }
+        }
+
+        function caller() {
+            try {
+                thrower();
+                return "NoCatch";
+            } catch (e) {
+                return e;
+            }
+        }
+
+        return caller();
+    `.expectToMatchJsResult();
+});
+
 test("return from nested finally", () => {
     util.testFunction`
         let x = "";
