Merge pull request #255 from eslint/issue254

Fix: exponentiation operator token (fixes #254)
eslint · Feb 26, 2016 · 2b93452 · 2b93452
2 parents 922562a + 3614e81
commit 2b93452
Show file tree

Hide file tree

Showing 16 changed files with 20 additions and 58 deletions.
diff --git a/lib/token-translator.js b/lib/token-translator.js
@@ -142,6 +142,7 @@ TokenTranslator.prototype = {
                  type === tt.colon || type === tt.question ||
                  type === tt.bracketR || type === tt.ellipsis ||
                  type === tt.arrow || type === tt.jsxTagStart ||
+                 type === tt.incDec || type === tt.starstar ||
                  type === tt.jsxTagEnd || (type.binop && !type.keyword) ||
                  type.isAssign) {
 

diff --git a/tests/fixtures/ecma-version/7/exponential-plusplus.result.js b/tests/fixtures/ecma-version/7/exponential-plusplus.result.js
@@ -128,16 +128,7 @@ module.exports = {
             ]
         },
         {
-            "type": {
-                "label": "++/--",
-                "beforeExpr": false,
-                "startsExpr": true,
-                "isLoop": false,
-                "isAssign": false,
-                "prefix": true,
-                "postfix": true,
-                "binop": null
-            },
+            "type": "Punctuator",
             "value": "++",
             "loc": {
                 "start": {
@@ -155,17 +146,7 @@ module.exports = {
             ]
         },
         {
-            "type": {
-                "label": "**",
-                "beforeExpr": true,
-                "startsExpr": false,
-                "isLoop": false,
-                "isAssign": false,
-                "prefix": false,
-                "postfix": false,
-                "binop": null,
-                "updateContext": null
-            },
+            "type": "Punctuator",
             "value": "**",
             "loc": {
                 "start": {
@@ -219,4 +200,4 @@ module.exports = {
             ]
         }
     ]
-};
+};
diff --git a/tests/fixtures/ecma-version/7/exponential-precedence.result.js b/tests/fixtures/ecma-version/7/exponential-precedence.result.js
@@ -183,17 +183,7 @@ module.exports = {
             ]
         },
         {
-            "type": {
-                "label": "**",
-                "beforeExpr": true,
-                "startsExpr": false,
-                "isLoop": false,
-                "isAssign": false,
-                "prefix": false,
-                "postfix": false,
-                "binop": null,
-                "updateContext": null
-            },
+            "type": "Punctuator",
             "value": "**",
             "loc": {
                 "start": {
@@ -247,4 +237,4 @@ module.exports = {
             ]
         }
     ]
-};
+};
diff --git a/tests/fixtures/ecma-version/7/exponential-simple.result.js b/tests/fixtures/ecma-version/7/exponential-simple.result.js
@@ -110,17 +110,7 @@ module.exports = {
             ]
         },
         {
-            "type": {
-                "label": "**",
-                "beforeExpr": true,
-                "startsExpr": false,
-                "isLoop": false,
-                "isAssign": false,
-                "prefix": false,
-                "postfix": false,
-                "binop": null,
-                "updateContext": null
-            },
+            "type": "Punctuator",
             "value": "**",
             "loc": {
                 "start": {
@@ -174,4 +164,4 @@ module.exports = {
             ]
         }
     ]
-};
+};
diff --git a/tests/fixtures/libraries/XMLHttpRequest.js.result.json b/tests/fixtures/libraries/XMLHttpRequest.js.result.json
diff --git a/tests/fixtures/libraries/angular-1.2.5.js.result.json b/tests/fixtures/libraries/angular-1.2.5.js.result.json
diff --git a/tests/fixtures/libraries/backbone-1.1.0.js.result.json b/tests/fixtures/libraries/backbone-1.1.0.js.result.json
diff --git a/tests/fixtures/libraries/benchmark.js.result.json b/tests/fixtures/libraries/benchmark.js.result.json
diff --git a/tests/fixtures/libraries/escodegen.browser.js.result.json b/tests/fixtures/libraries/escodegen.browser.js.result.json
diff --git a/tests/fixtures/libraries/escope.js.result.json b/tests/fixtures/libraries/escope.js.result.json
diff --git a/tests/fixtures/libraries/esmangle.browser.js.result.json b/tests/fixtures/libraries/esmangle.browser.js.result.json
diff --git a/tests/fixtures/libraries/esrefactor.js.result.json b/tests/fixtures/libraries/esrefactor.js.result.json
diff --git a/tests/fixtures/libraries/jquery-1.9.1.js.result.json b/tests/fixtures/libraries/jquery-1.9.1.js.result.json
diff --git a/tests/fixtures/libraries/mootools-1.4.5.js.result.json b/tests/fixtures/libraries/mootools-1.4.5.js.result.json
diff --git a/tests/fixtures/libraries/underscore-1.5.2.js.result.json b/tests/fixtures/libraries/underscore-1.5.2.js.result.json
diff --git a/tests/fixtures/libraries/yui-3.12.0.js.result.json b/tests/fixtures/libraries/yui-3.12.0.js.result.json