Skip to content

Commit e23fafe

Browse files
authored
fix: prefer-object-spread add semicolon when adding parenthesis (#21081)
1 parent 92bb13f commit e23fafe

2 files changed

Lines changed: 81 additions & 1 deletion

File tree

‎lib/rules/prefer-object-spread.js‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ const {
1111
isOpeningParenToken,
1212
isClosingParenToken,
1313
isParenthesised,
14+
isStartOfExpressionStatement,
15+
needsPrecedingSemicolon,
1416
} = require("./utils/ast-utils");
1517

1618
const ANY_SPACE = /\s/u;
@@ -194,7 +196,13 @@ function defineFixer(node, sourceCode) {
194196

195197
// Replace the parens of argument list to braces.
196198
if (needsParens(node, sourceCode)) {
197-
yield fixer.replaceText(leftParen, "({");
199+
const prefix =
200+
isStartOfExpressionStatement(node) &&
201+
needsPrecedingSemicolon(sourceCode, node)
202+
? ";({"
203+
: "({";
204+
205+
yield fixer.replaceText(leftParen, prefix);
198206
yield fixer.replaceText(rightParen, "})");
199207
} else {
200208
yield fixer.replaceText(leftParen, "{");

‎tests/lib/rules/prefer-object-spread.js‎

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -377,6 +377,78 @@ ruleTester.run("prefer-object-spread", rule, {
377377
],
378378
},
379379

380+
{
381+
code: "const result = doSomething()\nObject.assign({}, myData)",
382+
output: "const result = doSomething()\n;({ ...myData})",
383+
errors: [
384+
{
385+
messageId: "useSpreadMessage",
386+
},
387+
],
388+
},
389+
{
390+
code: "let a = foo + Object.assign({}, bar)",
391+
output: "let a = foo + ({ ...bar})",
392+
errors: [
393+
{
394+
messageId: "useSpreadMessage",
395+
},
396+
],
397+
},
398+
{
399+
code: "let foo = function() {};\nfoo\nObject.assign({}, bar)",
400+
output: "let foo = function() {};\nfoo\n;({ ...bar})",
401+
errors: [
402+
{
403+
messageId: "useSpreadMessage",
404+
},
405+
],
406+
},
407+
{
408+
code: "foo\nObject.assign({ foo: bar })",
409+
output: "foo\n;({foo: bar})",
410+
errors: [
411+
{
412+
messageId: "useLiteralMessage",
413+
},
414+
],
415+
},
416+
{
417+
code: "foo();\nObject.assign({}, bar)",
418+
output: "foo();\n({ ...bar})",
419+
errors: [
420+
{
421+
messageId: "useSpreadMessage",
422+
},
423+
],
424+
},
425+
{
426+
code: "const x = [1]\nObject.assign({}, bar)",
427+
output: "const x = [1]\n;({ ...bar})",
428+
errors: [
429+
{
430+
messageId: "useSpreadMessage",
431+
},
432+
],
433+
},
434+
{
435+
code: "foo\nObject.assign({}, bar).doSomething()",
436+
output: "foo\n;({ ...bar}).doSomething()",
437+
errors: [
438+
{
439+
messageId: "useSpreadMessage",
440+
},
441+
],
442+
},
443+
{
444+
code: "foo\nObject.assign({}, bar), 2",
445+
output: "foo\n;({ ...bar}), 2",
446+
errors: [
447+
{
448+
messageId: "useSpreadMessage",
449+
},
450+
],
451+
},
380452
/*
381453
* This is a special case where Object.assign is called with a single argument
382454
* and that argument is an object expression. In this case we warn and display

0 commit comments

Comments
 (0)