Merge pull request #1927 from jshint/1926

Only treat props named "[" as computed prop when punctuator. Fixes gh-1926
jshint · Oct 29, 2014 · 36f7ddc · 36f7ddc
2 parents 0c4962d + 6a93570
commit 36f7ddc
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/jshint.js b/src/jshint.js
@@ -3227,7 +3227,7 @@ var JSHINT = (function () {
 
             expression(10);
           } else {
-            if (state.tokens.next.value === "[") {
+            if (state.tokens.next.id === "[") {
               // ComputedPropertyName
               advance();
               if (!state.option.esnext) {

diff --git a/tests/unit/parser.js b/tests/unit/parser.js
@@ -3790,7 +3790,11 @@ exports["object ComputedPropertyName"] = function (test) {
       "[vals[0]]: true,",
       "[(1)]: true,",
     "};",
-    "fn({ [a / 7]: true });"
+    "fn({ [a / 7]: true });",
+    "var b = { '[': 1 };",
+    "var c = { [b]: 1 };",
+    "var d = { 0: 1 };",
+    "var e = { ['s']: 1 };",
   ];
 
   TestRun(test).test(code, { esnext: true });
@@ -3804,6 +3808,8 @@ exports["object ComputedPropertyName"] = function (test) {
     .addError(10, "'computed property names' is only available in ES6 (use esnext option).")
     .addError(11, "'computed property names' is only available in ES6 (use esnext option).")
     .addError(13, "'computed property names' is only available in ES6 (use esnext option).")
+    .addError(15, "'computed property names' is only available in ES6 (use esnext option).")
+    .addError(17, "'computed property names' is only available in ES6 (use esnext option).")
   .test(code);
 
   test.done();