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

Fixes Syntax error position with flow optional type

Browse Source
This commit is contained in:
Daniel Tschinder 2016-07-03 12:13:36 +02:00
parent f576865ce9
commit 64ca55cfe0
6 changed files with 162 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/parser/expression.js
View File

@ -558,7 +558,7 @@ pp.parseParenAndDistinguishExpression = function (startPos, startLoc, canBeArrow
if (first) {
first = false;
} else {
this.expect(tt.comma);
this.expect(tt.comma, refNeedsArrowPos.start || null);
if (this.match(tt.parenR) && this.hasPlugin("trailingFunctionCommas")) {
optionalCommaStart = this.state.start;
break;

6
src/parser/util.js
View File

@ -71,10 +71,10 @@ pp.semicolon = function () {
};
// Expect a token of a given type. If found, consume it, otherwise,
// raise an unexpected token error.
// raise an unexpected token error at given pos.
pp.expect = function (type) {
return this.eat(type) || this.unexpected();
pp.expect = function (type, pos) {
return this.eat(type) || this.unexpected(pos);
};
// Raise an unexpected token error.

1
test/fixtures/flow/optional-type/4/actual.js vendored Normal file
View File

@ -0,0 +1 @@
const f = (...x?) => {}

153
test/fixtures/flow/optional-type/4/expected.json vendored Normal file
View File

@ -0,0 +1,153 @@
{
"type": "File",
"start": 0,
"end": 23,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 1,
"column": 23
}
},
"program": {
"type": "Program",
"start": 0,
"end": 23,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 1,
"column": 23
}
},
"sourceType": "module",
"body": [
{
"type": "VariableDeclaration",
"start": 0,
"end": 23,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 1,
"column": 23
}
},
"declarations": [
{
"type": "VariableDeclarator",
"start": 6,
"end": 23,
"loc": {
"start": {
"line": 1,
"column": 6
},
"end": {
"line": 1,
"column": 23
}
},
"id": {
"type": "Identifier",
"start": 6,
"end": 7,
"loc": {
"start": {
"line": 1,
"column": 6
},
"end": {
"line": 1,
"column": 7
}
},
"name": "f"
},
"init": {
"type": "ArrowFunctionExpression",
"start": 10,
"end": 23,
"loc": {
"start": {
"line": 1,
"column": 10
},
"end": {
"line": 1,
"column": 23
}
},
"id": null,
"generator": false,
"expression": false,
"async": false,
"params": [
{
"type": "RestElement",
"start": 11,
"end": 15,
"loc": {
"start": {
"line": 1,
"column": 11
},
"end": {
"line": 1,
"column": 15
}
},
"argument": {
"type": "Identifier",
"start": 14,
"end": 15,
"loc": {
"start": {
"line": 1,
"column": 14
},
"end": {
"line": 1,
"column": 15
}
},
"name": "x"
},
"optional": true
}
],
"body": {
"type": "BlockStatement",
"start": 21,
"end": 23,
"loc": {
"start": {
"line": 1,
"column": 21
},
"end": {
"line": 1,
"column": 23
}
},
"body": [],
"directives": []
}
}
}
],
"kind": "const"
}
],
"directives": []
}
}

1
test/fixtures/flow/optional-type/5/actual.js vendored Normal file
View File

@ -0,0 +1 @@
a ? b : c ? d : e ? f : g ? h : i ? j : k ? l : m ? n : (o ? p : =);

3
test/fixtures/flow/optional-type/5/options.json vendored Normal file
View File

@ -0,0 +1,3 @@
{
"throws": "Unexpected token (1:65)"
}