Async catch bug (#1195)

Perryvw · web-flow · commit 120d91a578cb · 2021-12-22T19:02:25.000+01:00
* Correctly handle resolving promises with other promises

* Additional test

* Fix async functions not ending after returning from catch
diff --git a/src/lualib/Await.ts b/src/lualib/Await.ts
@@ -36,11 +36,15 @@ function __TS__AsyncAwaiter(this: void, generator: (this: void) => void) {
         function rejected(handler: ErrorHandler | undefined) {
             if (handler) {
                 return (value: unknown) => {
-                    const [success, valueOrError] = pcall(handler, value);
+                    const [success, hasReturnedOrError, returnedValue] = pcall(handler, value);
                     if (success) {
-                        step(valueOrError, handler);
+                        if (hasReturnedOrError) {
+                            resolve(returnedValue);
+                        } else {
+                            step(hasReturnedOrError, handler);
+                        }
                     } else {
-                        reject(valueOrError);
+                        reject(hasReturnedOrError);
                     }
                 };
             } else {
diff --git a/test/unit/builtins/async-await.spec.ts b/test/unit/builtins/async-await.spec.ts
@@ -441,6 +441,27 @@ test("async function adopts rejected promise", () => {
         .expectToEqual(["rejected"]);
 });
 
+test("return in catch aborts async method", () => {
+    util.testFunction`
+        async function asyncFunc() {
+            try {
+                await Promise.reject("rejection");
+                log("Should not be seen");
+            } catch {
+                log("C");
+                return "result";
+            }
+            log("Should also not be seen");
+        }
+
+        asyncFunc().then(v => log("resolved", v));
+
+        return allLogs;
+    `
+        .setTsHeader(promiseTestLib)
+        .expectToEqual(["C", "resolved", "result"]);
+});
+
 test.each(["async function abc() {", "const abc = async () => {"])(
     "can throw error after await in async function (%p)",
     functionHeader => {
