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

Ensure consistent start args for parseParenItem (#386)

Browse Source
This commit is contained in:
Brian Ng 2017-02-28 05:56:56 -06:00 committed by Daniel Tschinder
parent 9a5d93fa61
commit cd133ff8e1
4 changed files with 283 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

@ -595,7 +595,7 @@ pp.parseParenAndDistinguishExpression = function (startPos, startLoc, canBeArrow
const spreadNodeStartPos = this.state.start;
const spreadNodeStartLoc = this.state.startLoc;
spreadStart = this.state.start;
exprList.push(this.parseParenItem(this.parseRest(), spreadNodeStartLoc, spreadNodeStartPos));
exprList.push(this.parseParenItem(this.parseRest(), spreadNodeStartPos, spreadNodeStartLoc));
break;
} else {
exprList.push(this.parseMaybeAssign(false, refShorthandDefaultPos, this.parseParenItem, refNeedsArrowPos));

6
src/plugins/flow.js
View File

@ -940,14 +940,14 @@ export default function (instance) {
});
instance.extend("parseParenItem", function (inner) {
return function (node, startLoc, startPos) {
node = inner.call(this, node, startLoc, startPos);
return function (node, startPos, startLoc) {
node = inner.call(this, node, startPos, startLoc);
if (this.eat(tt.question)) {
node.optional = true;
}
if (this.match(tt.colon)) {
const typeCastNode = this.startNodeAt(startLoc, startPos);
const typeCastNode = this.startNodeAt(startPos, startLoc);
typeCastNode.expression = node;
typeCastNode.typeAnnotation = this.flowParseTypeAnnotation();

4
test/fixtures/flow/comment/spread/actual.js vendored Normal file
View File

@ -0,0 +1,4 @@
/* hi */
function commentsAttachedToIdentifier() {
var x = (...args: any) => {};
}

275
test/fixtures/flow/comment/spread/expected.json vendored Normal file
View File

@ -0,0 +1,275 @@
{
"type": "File",
"start": 0,
"end": 84,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 4,
"column": 1
}
},
"program": {
"type": "Program",
"start": 0,
"end": 84,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 4,
"column": 1
}
},
"sourceType": "module",
"body": [
{
"type": "FunctionDeclaration",
"start": 9,
"end": 84,
"loc": {
"start": {
"line": 2,
"column": 0
},
"end": {
"line": 4,
"column": 1
}
},
"id": {
"type": "Identifier",
"start": 18,
"end": 46,
"loc": {
"start": {
"line": 2,
"column": 9
},
"end": {
"line": 2,
"column": 37
},
"identifierName": "commentsAttachedToIdentifier"
},
"name": "commentsAttachedToIdentifier",
"leadingComments": null
},
"generator": false,
"expression": false,
"async": false,
"params": [],
"body": {
"type": "BlockStatement",
"start": 49,
"end": 84,
"loc": {
"start": {
"line": 2,
"column": 40
},
"end": {
"line": 4,
"column": 1
}
},
"body": [
{
"type": "VariableDeclaration",
"start": 53,
"end": 82,
"loc": {
"start": {
"line": 3,
"column": 2
},
"end": {
"line": 3,
"column": 31
}
},
"declarations": [
{
"type": "VariableDeclarator",
"start": 57,
"end": 81,
"loc": {
"start": {
"line": 3,
"column": 6
},
"end": {
"line": 3,
"column": 30
}
},
"id": {
"type": "Identifier",
"start": 57,
"end": 58,
"loc": {
"start": {
"line": 3,
"column": 6
},
"end": {
"line": 3,
"column": 7
},
"identifierName": "x"
},
"name": "x"
},
"init": {
"type": "ArrowFunctionExpression",
"start": 61,
"end": 81,
"loc": {
"start": {
"line": 3,
"column": 10
},
"end": {
"line": 3,
"column": 30
}
},
"id": null,
"generator": false,
"expression": false,
"async": false,
"params": [
{
"type": "RestElement",
"start": 62,
"end": 74,
"loc": {
"start": {
"line": 3,
"column": 11
},
"end": {
"line": 3,
"column": 23
}
},
"argument": {
"type": "Identifier",
"start": 65,
"end": 69,
"loc": {
"start": {
"line": 3,
"column": 14
},
"end": {
"line": 3,
"column": 18
},
"identifierName": "args"
},
"name": "args"
},
"typeAnnotation": {
"type": "TypeAnnotation",
"start": 69,
"end": 74,
"loc": {
"start": {
"line": 3,
"column": 18
},
"end": {
"line": 3,
"column": 23
}
},
"typeAnnotation": {
"type": "AnyTypeAnnotation",
"start": 71,
"end": 74,
"loc": {
"start": {
"line": 3,
"column": 20
},
"end": {
"line": 3,
"column": 23
}
}
}
}
}
],
"body": {
"type": "BlockStatement",
"start": 79,
"end": 81,
"loc": {
"start": {
"line": 3,
"column": 28
},
"end": {
"line": 3,
"column": 30
}
},
"body": [],
"directives": []
}
}
}
],
"kind": "var"
}
],
"directives": []
},
"leadingComments": [
{
"type": "CommentBlock",
"value": " hi ",
"start": 0,
"end": 8,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 1,
"column": 8
}
}
}
]
}
],
"directives": []
},
"comments": [
{
"type": "CommentBlock",
"value": " hi ",
"start": 0,
"end": 8,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 1,
"column": 8
}
}
}
]
}