Fix: object-shorthand should only lint computed methods (fixes #6015) (…

…#6024)
eslint · May 3, 2016 · ef8cbff · ef8cbff
1 parent cd1b057
commit ef8cbff
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/lib/rules/object-shorthand.js b/lib/rules/object-shorthand.js
@@ -109,7 +109,7 @@ module.exports = {
                 }
 
                 // only computed methods can fail the following checks
-                if (!APPLY_TO_METHODS && node.computed) {
+                if (node.computed && node.value.type !== "FunctionExpression") {
                     return;
                 }
 
@@ -136,6 +136,5 @@ module.exports = {
                 }
             }
         };
-
     }
 };
diff --git a/tests/lib/rules/object-shorthand.js b/tests/lib/rules/object-shorthand.js
@@ -37,6 +37,7 @@ ruleTester.run("object-shorthand", rule, {
         { code: "var x = {x: y, y: z, a: b}", parserOptions: { ecmaVersion: 6 }},
         { code: "var x = {x: y, y: z, 'a': b}", parserOptions: { ecmaVersion: 6 }},
         { code: "var x = {x: y, y() {}, z: a}", parserOptions: { ecmaVersion: 6 }},
+        { code: "var x = {[y]: y}", parserOptions: { ecmaVersion: 6 }},
         { code: "doSomething({x: y})", parserOptions: { ecmaVersion: 6 }},
         { code: "doSomething({'x': y})", parserOptions: { ecmaVersion: 6 }},
         { code: "doSomething({x: 'x'})", parserOptions: { ecmaVersion: 6 }},
@@ -68,6 +69,7 @@ ruleTester.run("object-shorthand", rule, {
         // object literal computed methods
         { code: "var x = {[y]() {}}", parserOptions: { ecmaVersion: 6 }, options: ["methods"] },
         { code: "var x = {[y]: function x() {}}", parserOptions: { ecmaVersion: 6 }, options: ["methods"] },
+        { code: "var x = {[y]: y}", parserOptions: { ecmaVersion: 6 }, options: ["methods"] },
 
         // options
         { code: "var x = {y() {}}", parserOptions: { ecmaVersion: 6 }, options: ["methods"] },