Fix babel#321 by allowing question marks in type params (babel#338)

* Fix babel#321 by allowing question marks in type params * Require commas between params
wcjohnson · Feb 10, 2017 · 407c97c · 407c97c
1 parent bc771bd
commit 407c97c
Show file tree

Hide file tree

Showing 5 changed files with 625 additions and 1 deletion.
diff --git a/src/plugins/flow.js b/src/plugins/flow.js
@@ -569,7 +569,7 @@ pp.reinterpretTypeAsFunctionTypeParam = function (type) {
 
 pp.flowParseFunctionTypeParams = function (params = []) {
   const ret = { params, rest: null };
-  while (this.match(tt.name)) {
+  while (!this.match(tt.parenR) && !this.match(tt.ellipsis)) {
     ret.params.push(this.flowParseFunctionTypeParam());
     if (!this.match(tt.parenR)) {
       this.expect(tt.comma);

diff --git a/test/fixtures/flow/regression/issue-321-failing/actual.js b/test/fixtures/flow/regression/issue-321-failing/actual.js
@@ -0,0 +1 @@
+const fn: ( Object, Object Object ) => void = ( o1, o2, ) => o1;
diff --git a/test/fixtures/flow/regression/issue-321-failing/options.json b/test/fixtures/flow/regression/issue-321-failing/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Unexpected token, expected , (1:27)"
+}
diff --git a/test/fixtures/flow/regression/issue-321/actual.js b/test/fixtures/flow/regression/issue-321/actual.js
@@ -0,0 +1,2 @@
+const fn: ( Object, ?Object ) => void = ( o1, o2 ) => o1;
+const fn: ( Object, ?Object, ) => void = ( o1, o2, ) => o1;