allow functions as first argument to Object.assign (palantir#3098)

berickson1 · Aug 6, 2017 · d7fab55 · d7fab55
1 parent d62cb31
commit d7fab55
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 0 deletions.
diff --git a/src/rules/preferObjectSpreadRule.ts b/src/rules/preferObjectSpreadRule.ts
@@ -50,6 +50,7 @@ function walk(ctx: Lint.WalkContext<void>) {
         if (isCallExpression(node) && node.arguments.length !== 0 &&
             isPropertyAccessExpression(node.expression) && node.expression.name.text === "assign" &&
             isIdentifier(node.expression.expression) && node.expression.expression.text === "Object" &&
+            !ts.isFunctionLike(node.arguments[0]) &&
             // Object.assign(...someArray) cannot be written as object spread
             !node.arguments.some(isSpreadElement)) {
             if (node.arguments[0].kind === ts.SyntaxKind.ObjectLiteralExpression) {

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