prefer-object-spread: add parens in shorthand arrow function (palanti…

…r#3026)
HyphnKnight · Apr 9, 2018 · 3237e69 · 3237e69
1 parent 94b1d16
commit 3237e69
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/src/rules/preferObjectSpreadRule.ts b/src/rules/preferObjectSpreadRule.ts
@@ -65,9 +65,10 @@ function walk(ctx: Lint.WalkContext<void>) {
 
 function createFix(node: ts.CallExpression, sourceFile: ts.SourceFile): Lint.Fix {
     const args = node.arguments;
+    const objectNeedsParens = node.parent!.kind === ts.SyntaxKind.ArrowFunction;
     const fix = [
-        Lint.Replacement.replaceFromTo(node.getStart(sourceFile), args[0].getStart(sourceFile), "{"),
-        new Lint.Replacement(node.end - 1, 1, "}"),
+        Lint.Replacement.replaceFromTo(node.getStart(sourceFile), args[0].getStart(sourceFile), `${objectNeedsParens ? "(" : ""}{`),
+        new Lint.Replacement(node.end - 1, 1, `}${objectNeedsParens ? ")" : ""}`),
     ];
     for (let i = 0; i < args.length; ++i) {
         const arg = args[i];

diff --git a/test/rules/prefer-object-spread/test.ts.fix b/test/rules/prefer-object-spread/test.ts.fix
@@ -23,3 +23,5 @@ result = Object.assign(new Foo(), {});
 result = Object.assign(createFoo(), {});
 result = Object.assign(function() {}, {});
 result = Object.assign(() => {}, {});
+
+let fn = () => ({...original});
diff --git a/test/rules/prefer-object-spread/test.ts.lint b/test/rules/prefer-object-spread/test.ts.lint
@@ -37,5 +37,7 @@ result = Object.assign(createFoo(), {});
 result = Object.assign(function() {}, {});
 result = Object.assign(() => {}, {});
 
+let fn = () => Object.assign({}, original);
+               ~~~~~~~~~~~~~~~~~~~~~~~~~~~ [0]
 [0]: Use the object spread operator instead.
-[1]: 'Object.assign' returns the first argument. Prefer object spread if you want a new object.
+[1]: 'Object.assign' returns the first argument. Prefer object spread if you want a new object.