Skip to content

Commit

Permalink
Merge pull request babel#10 from danez/fix-flow-arrow-spread
Browse files Browse the repository at this point in the history 
Fix flow plugin when flow+arrow+spread used together
  • Loading branch information
@sebmck @JacopKane
sebmck authored and JacopKane committed Jan 11, 2018
1 parent ea997dd commit 50792aa
Show file tree
Hide file tree
Showing 13 changed files with 793 additions and 74 deletions.
17 changes: 12 additions & 5 deletions packages/babylon/src/parser/expression.js
View file
Expand Up @@ -531,12 +531,12 @@ pp.parseParenExpression = function () {
return val;
};

pp.parseParenAndDistinguishExpression = function (startPos, startLoc, canBeArrow, isAsync, allowOptionalCommaStart) {
pp.parseParenAndDistinguishExpression = function (startPos, startLoc, canBeArrow, isAsync) {
startPos = startPos || this.state.start;
startLoc = startLoc || this.state.startLoc;

let val;
this.next();
this.expect(tt.parenL);

let innerStartPos = this.state.start, innerStartLoc = this.state.startLoc;
let exprList = [], first = true;
Expand Down Expand Up @@ -566,12 +566,13 @@ pp.parseParenAndDistinguishExpression = function (startPos, startLoc, canBeArrow
let innerEndLoc = this.state.startLoc;
this.expect(tt.parenR);

if (canBeArrow && !this.canInsertSemicolon() && this.eat(tt.arrow)) {
let arrowNode = this.startNodeAt(startPos, startLoc);
if (canBeArrow && !this.canInsertSemicolon() && (arrowNode = this.parseArrow(arrowNode))) {
for (let param of exprList) {
if (param.extra && param.extra.parenthesized) this.unexpected(param.extra.parenStart);
}

return this.parseArrowExpression(this.startNodeAt(startPos, startLoc), exprList, isAsync);
return this.parseArrowExpression(arrowNode, exprList, isAsync);
}

if (!exprList.length) {
Expand All @@ -581,7 +582,7 @@ pp.parseParenAndDistinguishExpression = function (startPos, startLoc, canBeArrow
this.unexpected(this.state.lastTokStart);
}
}
if (optionalCommaStart && !allowOptionalCommaStart) this.unexpected(optionalCommaStart);
if (optionalCommaStart) this.unexpected(optionalCommaStart);
if (spreadStart) this.unexpected(spreadStart);
if (refShorthandDefaultPos.start) this.unexpected(refShorthandDefaultPos.start);

Expand All @@ -601,6 +602,12 @@ pp.parseParenAndDistinguishExpression = function (startPos, startLoc, canBeArrow
return val;
};

pp.parseArrow = function (node) {
if (this.eat(tt.arrow)) {
return node;
}
};

pp.parseParenItem = function (node) {
return node;
};
Expand Down
72 changes: 23 additions & 49 deletions packages/babylon/src/plugins/flow.js
View file
Expand Up @@ -726,30 +726,19 @@ export default function (instance) {
};
});

instance.extend("parseParenItem", function () {
return function (node, startLoc, startPos, forceArrow?) {
let canBeArrow = this.state.potentialArrowAt = startPos;
instance.extend("parseParenItem", function (inner) {
return function (node, startLoc, startPos) {
node = inner.call(this, node, startLoc, startPos);

if (this.match(tt.colon)) {
let typeCastNode = this.startNodeAt(startLoc, startPos);
typeCastNode.expression = node;
typeCastNode.typeAnnotation = this.flowParseTypeAnnotation();

if (forceArrow && !this.match(tt.arrow)) {
this.unexpected();
}

if (canBeArrow && this.eat(tt.arrow)) {
// ((lol): number => {});
let params = node.type === "SequenceExpression" ? node.expressions : [node];
let func = this.parseArrowExpression(this.startNodeAt(startLoc, startPos), params);
func.returnType = typeCastNode.typeAnnotation;
return func;
} else {
return this.finishNode(typeCastNode, "TypeCastExpression");
}
} else {
return node;
return this.finishNode(typeCastNode, "TypeCastExpression");
}

return node;
};
});

Expand Down Expand Up @@ -1047,40 +1036,25 @@ export default function (instance) {
});

// handle return types for arrow functions
instance.extend("parseParenAndDistinguishExpression", function (inner) {
return function (startPos, startLoc, canBeArrow, isAsync) {
startPos = startPos || this.state.start;
startLoc = startLoc || this.state.startLoc;

if (canBeArrow && this.lookahead().type === tt.parenR) {
// let foo = (): number => {};
this.expect(tt.parenL);
this.expect(tt.parenR);

let node = this.startNodeAt(startPos, startLoc);
if (this.match(tt.colon)) node.returnType = this.flowParseTypeAnnotation();
this.expect(tt.arrow);
return this.parseArrowExpression(node, [], isAsync);
} else {
// let foo = (foo): number => {};
let node = inner.call(this, startPos, startLoc, canBeArrow, isAsync, this.hasPlugin("trailingFunctionCommas"));

if (this.match(tt.colon)) {
let state = this.state.clone();
try {
return this.parseParenItem(node, startPos, startLoc, true);
} catch (err) {
if (err instanceof SyntaxError) {
this.state = state;
return node;
} else {
throw err;
}
instance.extend("parseArrow", function (inner) {
return function (node) {
if (this.match(tt.colon)) {
let state = this.state.clone();
try {
let returnType = this.flowParseTypeAnnotation();
if (!this.match(tt.arrow)) this.unexpected();
// assign after it is clear it is an arrow
node.returnType = returnType;
} catch (err) {
if (err instanceof SyntaxError) {
this.state = state;
} else {
throw err;
}
} else {
return node;
}
}

return inner.call(this, node);
};
});
}
4 changes: 0 additions & 4 deletions packages/babylon/test/fixtures/flow/regression/issue-2493/expected.json
View file
Expand Up @@ -171,10 +171,6 @@
"raw": "' world'"
},
"value": " world"
},
"extra": {
"parenthesized": true,
"parenStart": 12
}
}
],
Expand Down
1 change: 1 addition & 0 deletions packages/babylon/test/fixtures/flow/type-annotations/101/actual.js
View file
@@ -0,0 +1 @@
( ...props: SomeType ) : ?ReturnType => ( 3 );
232 changes: 232 additions & 0 deletions packages/babylon/test/fixtures/flow/type-annotations/101/expected.json
View file
@@ -0,0 +1,232 @@
{
"type": "File",
"start": 0,
"end": 46,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 1,
"column": 46
}
},
"program": {
"type": "Program",
"start": 0,
"end": 46,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 1,
"column": 46
}
},
"sourceType": "module",
"body": [
{
"type": "ExpressionStatement",
"start": 0,
"end": 46,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 1,
"column": 46
}
},
"expression": {
"type": "ArrowFunctionExpression",
"start": 0,
"end": 45,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 1,
"column": 45
}
},
"returnType": {
"type": "TypeAnnotation",
"start": 23,
"end": 36,
"loc": {
"start": {
"line": 1,
"column": 23
},
"end": {
"line": 1,
"column": 36
}
},
"typeAnnotation": {
"type": "NullableTypeAnnotation",
"start": 25,
"end": 36,
"loc": {
"start": {
"line": 1,
"column": 25
},
"end": {
"line": 1,
"column": 36
}
},
"typeAnnotation": {
"type": "GenericTypeAnnotation",
"start": 26,
"end": 36,
"loc": {
"start": {
"line": 1,
"column": 26
},
"end": {
"line": 1,
"column": 36
}
},
"typeParameters": null,
"id": {
"type": "Identifier",
"start": 26,
"end": 36,
"loc": {
"start": {
"line": 1,
"column": 26
},
"end": {
"line": 1,
"column": 36
}
},
"name": "ReturnType"
}
}
}
},
"id": null,
"generator": false,
"expression": true,
"async": false,
"params": [
{
"type": "RestElement",
"start": 2,
"end": 10,
"loc": {
"start": {
"line": 1,
"column": 2
},
"end": {
"line": 1,
"column": 10
}
},
"argument": {
"type": "Identifier",
"start": 5,
"end": 10,
"loc": {
"start": {
"line": 1,
"column": 5
},
"end": {
"line": 1,
"column": 10
}
},
"name": "props"
},
"typeAnnotation": {
"type": "TypeAnnotation",
"start": 10,
"end": 20,
"loc": {
"start": {
"line": 1,
"column": 10
},
"end": {
"line": 1,
"column": 20
}
},
"typeAnnotation": {
"type": "GenericTypeAnnotation",
"start": 12,
"end": 20,
"loc": {
"start": {
"line": 1,
"column": 12
},
"end": {
"line": 1,
"column": 20
}
},
"typeParameters": null,
"id": {
"type": "Identifier",
"start": 12,
"end": 20,
"loc": {
"start": {
"line": 1,
"column": 12
},
"end": {
"line": 1,
"column": 20
}
},
"name": "SomeType"
}
}
}
}
],
"body": {
"type": "NumericLiteral",
"start": 42,
"end": 43,
"loc": {
"start": {
"line": 1,
"column": 42
},
"end": {
"line": 1,
"column": 43
}
},
"extra": {
"rawValue": 3,
"raw": "3",
"parenthesized": true,
"parenStart": 40
},
"value": 3
}
}
}
],
"directives": []
}
}
1 change: 1 addition & 0 deletions packages/babylon/test/fixtures/flow/type-annotations/102/actual.js
View file
@@ -0,0 +1 @@
export default (...modifiers): Array<string> => {};

0 comments on commit 50792aa

Please sign in to comment.