Skip to content

Async catch bug #1195

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Perryvw merged 4 commits into from
Dec 22, 2021
Merged

Async catch bug #1195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f08c480
Correctly handle resolving promises with other promises
Perryvw Dec 12, 2021
368e59b
Additional test
Perryvw Dec 12, 2021
6540ca5
Fix async functions not ending after returning from catch
Perryvw Dec 21, 2021
03e29d6
Merge branch 'master' into async-catch-bug
Perryvw Dec 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions src/lualib/Await.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
21 changes: 21 additions & 0 deletions test/unit/builtins/async-await.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 => {
Expand Down