Fix: raise error for trailing commas after rest properties (fixes #310)…

… (#323)
eslint · Mar 24, 2017 · 652990a · 652990a
1 parent 9d86ba5
commit 652990a
Show file tree

Hide file tree

Showing 5 changed files with 462 additions and 0 deletions.
diff --git a/espree.js b/espree.js
@@ -353,6 +353,7 @@ acorn.plugins.espree = function(instance) {
     instance.parseObj = function(isPattern, refShorthandDefaultPos) {
         var node = this.startNode(),
             first = true,
+            hasRestProperty = false,
             propHash = {};
         node.properties = [];
         this.next();
@@ -362,6 +363,9 @@ acorn.plugins.espree = function(instance) {
                 this.expect(tt.comma);
 
                 if (this.afterTrailingComma(tt.braceR)) {
+                    if (hasRestProperty) {
+                        this.raise(node.properties[node.properties.length - 1].end, "Unexpected trailing comma after rest property");
+                    }
                     break;
                 }
 
@@ -378,6 +382,7 @@ acorn.plugins.espree = function(instance) {
             if (extra.ecmaFeatures.experimentalObjectRestSpread && this.type === tt.ellipsis) {
                 if (isPattern) {
                     prop = this.parseObjectRest();
+                    hasRestProperty = true;
                 } else {
                     prop = this.parseSpread();
                     prop.type = "ExperimentalSpreadProperty";

diff --git a/...fixtures/ecma-features/experimentalObjectRestSpread/invalid-rest-trailing-comma.result.js b/...fixtures/ecma-features/experimentalObjectRestSpread/invalid-rest-trailing-comma.result.js
@@ -0,0 +1,6 @@
+module.exports = {
+  index: 16,
+  lineNumber: 1,
+  column: 17,
+  message: "Unexpected trailing comma after rest property"
+};
diff --git a/tests/fixtures/ecma-features/experimentalObjectRestSpread/invalid-rest-trailing-comma.src.js b/tests/fixtures/ecma-features/experimentalObjectRestSpread/invalid-rest-trailing-comma.src.js
@@ -0,0 +1 @@
+var { x, y, ...z, } = foo;