Skip to content

Commit 0d7d70c

Browse files
authored
fix: insert cause outside wrapping parens in preserve-caught-error (#21062)
* fix: insert cause outside wrapping parens in preserve-caught-error * Move parenthesized-argument cases after the main tests * Add test for trailing comma after parenthesized argument
1 parent 5139800 commit 0d7d70c

2 files changed

Lines changed: 93 additions & 3 deletions

File tree

‎lib/rules/preserve-caught-error.js‎

Lines changed: 36 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -256,6 +256,30 @@ module.exports = {
256256
);
257257
}
258258

259+
/**
260+
* Gets the token after which new arguments should be inserted for the
261+
* given argument, accounting for parentheses wrapping the argument so
262+
* that insertions land outside them (e.g. `new Error(("msg"))`).
263+
* @param {ASTNode} argNode The argument node.
264+
* @param {ASTNode} callNode The enclosing call or new expression.
265+
* @returns {Token} The token to insert after.
266+
*/
267+
function getLastArgumentToken(argNode, callNode) {
268+
const callLastToken = sourceCode.getLastToken(callNode);
269+
let token = sourceCode.getLastToken(argNode);
270+
let nextToken = sourceCode.getTokenAfter(token);
271+
272+
while (
273+
nextToken &&
274+
nextToken !== callLastToken &&
275+
astUtils.isClosingParenToken(nextToken)
276+
) {
277+
token = nextToken;
278+
nextToken = sourceCode.getTokenAfter(token);
279+
}
280+
return token;
281+
}
282+
259283
//----------------------------------------------------------------------
260284
// Public
261285
//----------------------------------------------------------------------
@@ -360,15 +384,21 @@ module.exports = {
360384
if (!messageArg) {
361385
// Case: `throw new AggregateError([])` → insert message and options
362386
return fixer.insertTextAfter(
363-
errorsArg,
387+
getLastArgumentToken(
388+
errorsArg,
389+
throwExpression,
390+
),
364391
`, "", { cause: ${caughtError.name} }`,
365392
);
366393
}
367394

368395
if (!optionsArg) {
369396
// Case: `throw new AggregateError([], "")` → insert error options only
370397
return fixer.insertTextAfter(
371-
messageArg,
398+
getLastArgumentToken(
399+
messageArg,
400+
throwExpression,
401+
),
372402
`, { cause: ${caughtError.name} }`,
373403
);
374404
}
@@ -423,7 +453,10 @@ module.exports = {
423453
if (!optionsArg) {
424454
// Case: `throw new Error("Some message")` → insert only options
425455
return fixer.insertTextAfter(
426-
messageArg,
456+
getLastArgumentToken(
457+
messageArg,
458+
throwExpression,
459+
),
427460
`, { cause: ${caughtError.name} }`,
428461
);
429462
}

‎tests/lib/rules/preserve-caught-error.js‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -846,5 +846,62 @@ ruleTester.run("preserve-caught-error", rule, {
846846
}`,
847847
errors: [{ messageId: "incorrectCause" }],
848848
},
849+
/* Parenthesized arguments: insertions must land outside the wrapping parentheses */
850+
{
851+
code: `try { doSomething(); } catch (err) { throw new Error(("Something failed")); }`,
852+
errors: [
853+
{
854+
messageId: "missingCause",
855+
suggestions: [
856+
{
857+
messageId: "includeCause",
858+
output: `try { doSomething(); } catch (err) { throw new Error(("Something failed"), { cause: err }); }`,
859+
},
860+
],
861+
},
862+
],
863+
},
864+
{
865+
code: `try { doSomething(); } catch (err) { throw new Error(("Something failed"),); }`,
866+
errors: [
867+
{
868+
messageId: "missingCause",
869+
suggestions: [
870+
{
871+
messageId: "includeCause",
872+
output: `try { doSomething(); } catch (err) { throw new Error(("Something failed"), { cause: err },); }`,
873+
},
874+
],
875+
},
876+
],
877+
},
878+
{
879+
code: `try { doSomething(); } catch (err) { throw new AggregateError((errors)); }`,
880+
errors: [
881+
{
882+
messageId: "missingCause",
883+
suggestions: [
884+
{
885+
messageId: "includeCause",
886+
output: `try { doSomething(); } catch (err) { throw new AggregateError((errors), "", { cause: err }); }`,
887+
},
888+
],
889+
},
890+
],
891+
},
892+
{
893+
code: `try { doSomething(); } catch (err) { throw new AggregateError(errors, ("message")); }`,
894+
errors: [
895+
{
896+
messageId: "missingCause",
897+
suggestions: [
898+
{
899+
messageId: "includeCause",
900+
output: `try { doSomething(); } catch (err) { throw new AggregateError(errors, ("message"), { cause: err }); }`,
901+
},
902+
],
903+
},
904+
],
905+
},
849906
],
850907
});

0 commit comments

Comments
 (0)