cerxes/babel
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #3305 from jviereck/T7052

Browse Source 
Fix: Arrow functions with trailing comma + return type are throwing an error when parsing
This commit is contained in:
Amjad Masad
2016-02-05 13:50:57 -08:00
parent acc946c09e a121d1b7b5
commit 024cba6433
5 changed files with 210 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/parser/expression.js
View File

@@ -528,7 +528,7 @@ pp.parseParenExpression = function () {
return val;
};
pp.parseParenAndDistinguishExpression = function (startPos, startLoc, canBeArrow, isAsync) {
pp.parseParenAndDistinguishExpression = function (startPos, startLoc, canBeArrow, isAsync, allowOptionalCommaStart) {
startPos = startPos || this.state.start;
startLoc = startLoc || this.state.startLoc;
@@ -578,7 +578,7 @@ pp.parseParenAndDistinguishExpression = function (startPos, startLoc, canBeArrow
this.unexpected(this.state.lastTokStart);
}
}
if (optionalCommaStart) this.unexpected(optionalCommaStart);
if (optionalCommaStart && !allowOptionalCommaStart) this.unexpected(optionalCommaStart);
if (spreadStart) this.unexpected(spreadStart);
if (refShorthandDefaultPos.start) this.unexpected(refShorthandDefaultPos.start);

2
src/plugins/flow.js
View File

@@ -1038,7 +1038,7 @@ export default function (instance) {
return this.parseArrowExpression(node, [], isAsync);
} else {
// let foo = (foo): number => {};
let node = inner.call(this, startPos, startLoc, canBeArrow, isAsync);
let node = inner.call(this, startPos, startLoc, canBeArrow, isAsync, this.hasPlugin("trailingFunctionCommas"));
if (this.match(tt.colon)) {
let state = this.state.clone();