parse only method parameter decorators

babel · Mar 22, 2016 · 87edfd1 · 87edfd1
1 parent 37849e3
commit 87edfd1
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 7 deletions.
diff --git a/src/parser/expression.js b/src/parser/expression.js
@@ -824,7 +824,7 @@ pp.parseMethod = function (node, isGenerator, isAsync) {
   this.state.inMethod = node.kind || true;
   this.initFunction(node, isAsync);
   this.expect(tt.parenL);
-  node.params = this.parseBindingList(tt.parenR, false, this.hasPlugin("trailingFunctionCommas"));
+  node.params = this.parseBindingList(tt.parenR, false, this.hasPlugin("trailingFunctionCommas"), true);
   node.generator = isGenerator;
   this.parseFunctionBody(node);
   this.state.inMethod = oldInMethod;

diff --git a/src/parser/lval.js b/src/parser/lval.js
@@ -133,7 +133,7 @@ pp.parseBindingAtom = function () {
     case tt.bracketL:
       let node = this.startNode();
       this.next();
-      node.elements = this.parseBindingList(tt.bracketR, true, true);
+      node.elements = this.parseBindingList(tt.bracketR, true, true, false);
       return this.finishNode(node, "ArrayPattern");
 
     case tt.braceL:
@@ -144,7 +144,7 @@ pp.parseBindingAtom = function () {
   }
 };
 
-pp.parseBindingList = function (close, allowEmpty, allowTrailingComma) {
+pp.parseBindingList = function (close, allowEmpty, allowTrailingComma, allowDecorator) {
   let elts = [];
   let first = true;
   while (!this.eat(close)) {
@@ -163,11 +163,13 @@ pp.parseBindingList = function (close, allowEmpty, allowTrailingComma) {
       break;
     } else {
       let decorators = [];
-      while (this.match(tt.at)) {
-        decorators.push(this.parseDecorator("ParameterDecorator"));
+      if (allowDecorator) {
+        while (this.match(tt.at)) {
+          decorators.push(this.parseDecorator("ParameterDecorator"));
+        }
       }
       let left = this.parseMaybeDefault();
-      if (decorators.length) {
+      if (allowDecorator && decorators.length) {
         left.decorators = decorators;
       }
       this.parseAssignableListItemTypes(left);

diff --git a/src/parser/statement.js b/src/parser/statement.js
@@ -583,7 +583,7 @@ pp.parseFunction = function (node, isStatement, allowExpressionBody, isAsync, op
 
 pp.parseFunctionParams = function (node) {
   this.expect(tt.parenL);
-  node.params = this.parseBindingList(tt.parenR, false, this.hasPlugin("trailingFunctionCommas"));
+  node.params = this.parseBindingList(tt.parenR, false, this.hasPlugin("trailingFunctionCommas"), false);
 };
 
 // Parse a class declaration or literal (depending on the

diff --git a/test/fixtures/experimental/decorators/function-declaration-parameter-decorator/actual.js b/test/fixtures/experimental/decorators/function-declaration-parameter-decorator/actual.js
@@ -0,0 +1 @@
+function func(@foo() x, @bar({ a: 123 }) @baz() y) {}
diff --git a/test/fixtures/experimental/decorators/function-declaration-parameter-decorator/options.json b/test/fixtures/experimental/decorators/function-declaration-parameter-decorator/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Unexpected token (1:14)"
+}
diff --git a/test/fixtures/experimental/decorators/function-expression-parameter-decorator/actual.js b/test/fixtures/experimental/decorators/function-expression-parameter-decorator/actual.js
@@ -0,0 +1 @@
+const func = function (@foo() x, @bar({ a: 123 }) @baz() y) {};
diff --git a/test/fixtures/experimental/decorators/function-expression-parameter-decorator/options.json b/test/fixtures/experimental/decorators/function-expression-parameter-decorator/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Unexpected token (1:23)"
+}
diff --git a/.../decorators/parameter-decorator/actual.js → ...tors/method-parameter-decorator/actual.js b/.../decorators/parameter-decorator/actual.js → ...tors/method-parameter-decorator/actual.js
diff --git a/...orators/parameter-decorator/expected.json → .../method-parameter-decorator/expected.json b/...orators/parameter-decorator/expected.json → .../method-parameter-decorator/expected.json