Skip to content
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.

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

Fix suppressed error order #16440

Merged
merged 6 commits into from
Apr 22, 2024
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/babel-helpers/src/helpers/usingCtx.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ export default function _usingCtx() {
: (function (error: Error, suppressed: Error) {
var err = new Error() as SuppressedError;
err.name = "SuppressedError";
err.suppressed = suppressed;
err.error = error;
err.suppressed = suppressed;
return err;
} as SuppressedErrorConstructor),
empty = {},
Expand Down Expand Up @@ -73,7 +73,7 @@ export default function _usingCtx() {
}

function err(e: Error) {
error = error !== empty ? new _disposeSuppressedError(error, e) : e;
error = error !== empty ? new _disposeSuppressedError(e, error) : e;

return next();
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
return async function () {
return (async function () {
let disposed = false;
let beforeEnd;

Expand All @@ -10,13 +10,13 @@ return async function () {
await using x = {
[Symbol.asyncDispose || Symbol.for("Symbol.asyncDispose")]() {
throw err1;
}
},
};
throw err2;
} catch (e) {
thrown = e;
}

expect(thrown.suppressed).toBe(err1);
expect(thrown.error).toBe(err2);
}();
expect(thrown.suppressed).toBe(err2);
expect(thrown.error).toBe(err1);
})();
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ return (async function () {
} catch (e) {
inCatch = disposed;
expect(e.name).toBe("SuppressedError");
expect(e.suppressed).toBe(1);
expect(e.error).toBe(0);
expect(e.suppressed).toBe(0);
expect(e.error).toBe(1);
}

expect(beforeReturn).toBe(false);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ try {
} catch (e) {
inCatch = disposed;
expect(e.name).toBe("SuppressedError");
expect(e.suppressed).toBe(1);
expect(e.error).toBe(0);
expect(e.suppressed).toBe(0);
expect(e.error).toBe(1);
}

expect(beforeReturn).toBe(false);
Expand Down
4 changes: 2 additions & 2 deletions packages/babel-runtime-corejs3/helpers/esm/usingCtx.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import _Promise from "core-js-pure/features/promise/index.js";
export default function _usingCtx() {
var r = "function" == typeof _SuppressedError ? _SuppressedError : function (r, n) {
var e = Error();
return e.name = "SuppressedError", e.suppressed = n, e.error = r, e;
return e.name = "SuppressedError", e.error = r, e.suppressed = n, e;
},
n = {},
e = [];
Expand Down Expand Up @@ -45,7 +45,7 @@ export default function _usingCtx() {
if (o !== n) throw o;
}
function err(e) {
return o = o !== n ? new r(o, e) : e, next();
return o = o !== n ? new r(e, o) : e, next();
}
return next();
}
Expand Down