Fix: object-shorthand computed props (fixes #2937)

eslint · Jul 7, 2015 · 74dbc88 · 74dbc88
1 parent b9fc9c5
commit 74dbc88
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/lib/rules/object-shorthand.js b/lib/rules/object-shorthand.js
@@ -44,7 +44,8 @@ module.exports = function(context) {
                 return;
             }
 
-            if (node.kind === "get" || node.kind === "set") {
+            // getters, setters and computed properties are ignored
+            if (node.kind === "get" || node.kind === "set" || node.computed) {
                 return;
             }
 

diff --git a/tests/lib/rules/object-shorthand.js b/tests/lib/rules/object-shorthand.js
@@ -19,6 +19,7 @@ var eslint = require("../../../lib/eslint"),
 
 var features = {
     objectLiteralShorthandMethods: true,
+    objectLiteralComputedProperties: true,
     objectLiteralShorthandProperties: true,
     arrowFunctions: true,
     destructuring: true,
@@ -68,6 +69,11 @@ eslintTester.addRuleTest("lib/rules/object-shorthand", {
         { code: "doSomething({set y(z) {}})", ecmaFeatures: features },
         { code: "doSomething({get y() {}, set y(z) {}})", ecmaFeatures: features },
 
+        // object literal computed properties
+        { code: "var x = {[y]: y}", ecmaFeatures: features, args: [2, "properties"] },
+        { code: "var x = {['y']: 'y'}", ecmaFeatures: features, args: [2, "properties"] },
+        { code: "var x = {['y']: y}", ecmaFeatures: features, args: [2, "properties"] },
+
         // options
         { code: "var x = {y() {}}", ecmaFeatures: features, args: [2, "methods"] },
         { code: "var x = {x, y() {}, a:b}", ecmaFeatures: features, args: [2, "methods"] },