Skip to content

Commit

Permalink
Do not allow member expressions to start async arrows (#10332)
Browse files Browse the repository at this point in the history 
* Do not allow member expressions to start async arrows

* Boolean -> boolean
  • Loading branch information
@nicolo-ribaudo
nicolo-ribaudo committed Oct 1, 2019
1 parent 94fcabc commit 80d99b4
Show file tree
Hide file tree
Showing 6 changed files with 210 additions and 24 deletions.
20 changes: 7 additions & 13 deletions packages/babel-parser/src/parser/expression.js
View file
Expand Up @@ -578,21 +578,16 @@ export default class ExpressionParser extends LValParser {
startLoc: Position,
noCalls?: ?boolean,
): N.Expression {
const maybeAsyncArrow = this.atPossibleAsync(base);

const state = {
optionalChainMember: false,
maybeAsyncArrow: this.atPossibleAsync(base),
stop: false,
};
do {
base = this.parseSubscript(
base,
startPos,
startLoc,
noCalls,
state,
maybeAsyncArrow,
);
base = this.parseSubscript(base, startPos, startLoc, noCalls, state);

// After parsing a subscript, this isn't "async" for sure.
state.maybeAsyncArrow = false;
} while (!state.stop);
return base;
}
Expand All @@ -607,7 +602,6 @@ export default class ExpressionParser extends LValParser {
startLoc: Position,
noCalls: ?boolean,
state: N.ParseSubscriptState,
maybeAsyncArrow: boolean,
): N.Expression {
if (!noCalls && this.eat(tt.doubleColon)) {
const node = this.startNodeAt(startPos, startLoc);
Expand Down Expand Up @@ -695,7 +689,7 @@ export default class ExpressionParser extends LValParser {

node.arguments = this.parseCallExpressionArguments(
tt.parenR,
maybeAsyncArrow,
state.maybeAsyncArrow,
base.type === "Import",
base.type !== "Super",
);
Expand All @@ -705,7 +699,7 @@ export default class ExpressionParser extends LValParser {
this.finishOptionalCallExpression(node);
}

if (maybeAsyncArrow && this.shouldParseAsyncArrow()) {
if (state.maybeAsyncArrow && this.shouldParseAsyncArrow()) {
state.stop = true;

this.checkCommaAfterRestFromSpread();
Expand Down
2 changes: 0 additions & 2 deletions packages/babel-parser/src/plugins/flow.js
View file
Expand Up @@ -2634,7 +2634,6 @@ export default (superClass: Class<Parser>): Class<Parser> =>
startLoc: Position,
noCalls: ?boolean,
subscriptState: N.ParseSubscriptState,
maybeAsyncArrow: boolean,
): N.Expression {
if (this.match(tt.questionDot) && this.isLookaheadRelational("<")) {
this.expectPlugin("optionalChaining");
Expand Down Expand Up @@ -2687,7 +2686,6 @@ export default (superClass: Class<Parser>): Class<Parser> =>
startLoc,
noCalls,
subscriptState,
maybeAsyncArrow,
);
}

Expand Down
10 changes: 1 addition & 9 deletions packages/babel-parser/src/plugins/typescript/index.js
View file
Expand Up @@ -1568,7 +1568,6 @@ export default (superClass: Class<Parser>): Class<Parser> =>
startLoc: Position,
noCalls: ?boolean,
state: N.ParseSubscriptState,
maybeAsyncArrow: boolean,
): N.Expression {
if (!this.hasPrecedingLineBreak() && this.match(tt.bang)) {
this.state.exprAllowed = false;
Expand Down Expand Up @@ -1631,14 +1630,7 @@ export default (superClass: Class<Parser>): Class<Parser> =>
if (result) return result;
}

return super.parseSubscript(
base,
startPos,
startLoc,
noCalls,
state,
maybeAsyncArrow,
);
return super.parseSubscript(base, startPos, startLoc, noCalls, state);
}

parseNewArguments(node: N.NewExpression): void {
Expand Down
1 change: 1 addition & 0 deletions packages/babel-parser/src/types.js
View file
Expand Up @@ -1447,5 +1447,6 @@ export type Placeholder<N: PlaceholderTypes> = NodeBase & {

export type ParseSubscriptState = {
optionalChainMember: boolean,
maybeAsyncArrow: boolean,
stop: boolean,
};
3 changes: 3 additions & 0 deletions packages/babel-parser/test/fixtures/flow/regression/issue-10314/input.js
View file
@@ -0,0 +1,3 @@
// @flow

true ? async.waterfall() : null;
198 changes: 198 additions & 0 deletions packages/babel-parser/test/fixtures/flow/regression/issue-10314/output.json
View file
@@ -0,0 +1,198 @@
{
"type": "File",
"start": 0,
"end": 42,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 3,
"column": 32
}
},
"program": {
"type": "Program",
"start": 0,
"end": 42,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 3,
"column": 32
}
},
"sourceType": "module",
"interpreter": null,
"body": [
{
"type": "ExpressionStatement",
"start": 10,
"end": 42,
"loc": {
"start": {
"line": 3,
"column": 0
},
"end": {
"line": 3,
"column": 32
}
},
"expression": {
"type": "ConditionalExpression",
"start": 10,
"end": 41,
"loc": {
"start": {
"line": 3,
"column": 0
},
"end": {
"line": 3,
"column": 31
}
},
"test": {
"type": "BooleanLiteral",
"start": 10,
"end": 14,
"loc": {
"start": {
"line": 3,
"column": 0
},
"end": {
"line": 3,
"column": 4
}
},
"value": true
},
"consequent": {
"type": "CallExpression",
"start": 17,
"end": 34,
"loc": {
"start": {
"line": 3,
"column": 7
},
"end": {
"line": 3,
"column": 24
}
},
"callee": {
"type": "MemberExpression",
"start": 17,
"end": 32,
"loc": {
"start": {
"line": 3,
"column": 7
},
"end": {
"line": 3,
"column": 22
}
},
"object": {
"type": "Identifier",
"start": 17,
"end": 22,
"loc": {
"start": {
"line": 3,
"column": 7
},
"end": {
"line": 3,
"column": 12
},
"identifierName": "async"
},
"name": "async"
},
"property": {
"type": "Identifier",
"start": 23,
"end": 32,
"loc": {
"start": {
"line": 3,
"column": 13
},
"end": {
"line": 3,
"column": 22
},
"identifierName": "waterfall"
},
"name": "waterfall"
},
"computed": false
},
"arguments": []
},
"alternate": {
"type": "NullLiteral",
"start": 37,
"end": 41,
"loc": {
"start": {
"line": 3,
"column": 27
},
"end": {
"line": 3,
"column": 31
}
}
}
},
"leadingComments": [
{
"type": "CommentLine",
"value": " @flow",
"start": 0,
"end": 8,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 1,
"column": 8
}
}
}
]
}
],
"directives": []
},
"comments": [
{
"type": "CommentLine",
"value": " @flow",
"start": 0,
"end": 8,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 1,
"column": 8
}
}
}
]
}

0 comments on commit 80d99b4

Please sign in to comment.