Fix Async Generic After Await Parsing Error #11092
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -1528,6 +1528,14 @@ export default (superClass: Class<Parser>): Class<Parser> => | |
| if (!this.isRelational("<")) { | ||
| return undefined; | ||
| } | ||
|
|
||
| const oldMaybeInArrowParameters = this.state.maybeInArrowParameters; | ||
| const oldYieldPos = this.state.yieldPos; | ||
|
There was a problem hiding this comment. I added I also wasn't entirely sure whether |
||
| const oldAwaitPos = this.state.awaitPos; | ||
| this.state.maybeInArrowParameters = true; | ||
| this.state.yieldPos = -1; | ||
| this.state.awaitPos = -1; | ||
|
|
||
| const res: ?N.ArrowFunctionExpression = this.tsTryParseAndCatch(() => { | ||
| const node: N.ArrowFunctionExpression = this.startNodeAt( | ||
| startPos, | ||
|
|
@@ -1541,6 +1549,10 @@ export default (superClass: Class<Parser>): Class<Parser> => | |
| return node; | ||
| }); | ||
|
|
||
| this.state.maybeInArrowParameters = oldMaybeInArrowParameters; | ||
| this.state.yieldPos = oldYieldPos; | ||
| this.state.awaitPos = oldAwaitPos; | ||
|
|
||
| if (!res) { | ||
| return undefined; | ||
| } | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| async () => { | ||
| await null; | ||
| async <T>() => null; | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,214 @@ | ||
| { | ||
| "type": "File", | ||
| "start": 0, | ||
| "end": 53, | ||
| "loc": { | ||
| "start": { | ||
| "line": 1, | ||
| "column": 0 | ||
| }, | ||
| "end": { | ||
| "line": 4, | ||
| "column": 2 | ||
| } | ||
| }, | ||
| "program": { | ||
| "type": "Program", | ||
| "start": 0, | ||
| "end": 53, | ||
| "loc": { | ||
| "start": { | ||
| "line": 1, | ||
| "column": 0 | ||
| }, | ||
| "end": { | ||
| "line": 4, | ||
| "column": 2 | ||
| } | ||
| }, | ||
| "sourceType": "module", | ||
| "interpreter": null, | ||
| "body": [ | ||
| { | ||
| "type": "ExpressionStatement", | ||
| "start": 0, | ||
| "end": 53, | ||
| "loc": { | ||
| "start": { | ||
| "line": 1, | ||
| "column": 0 | ||
| }, | ||
| "end": { | ||
| "line": 4, | ||
| "column": 2 | ||
| } | ||
| }, | ||
| "expression": { | ||
| "type": "ArrowFunctionExpression", | ||
| "start": 0, | ||
| "end": 52, | ||
| "loc": { | ||
| "start": { | ||
| "line": 1, | ||
| "column": 0 | ||
| }, | ||
| "end": { | ||
| "line": 4, | ||
| "column": 1 | ||
| } | ||
| }, | ||
| "id": null, | ||
| "generator": false, | ||
| "async": true, | ||
| "params": [], | ||
| "body": { | ||
| "type": "BlockStatement", | ||
| "start": 12, | ||
| "end": 52, | ||
| "loc": { | ||
| "start": { | ||
| "line": 1, | ||
| "column": 12 | ||
| }, | ||
| "end": { | ||
| "line": 4, | ||
| "column": 1 | ||
| } | ||
| }, | ||
| "body": [ | ||
| { | ||
| "type": "ExpressionStatement", | ||
| "start": 16, | ||
| "end": 27, | ||
| "loc": { | ||
| "start": { | ||
| "line": 2, | ||
| "column": 2 | ||
| }, | ||
| "end": { | ||
| "line": 2, | ||
| "column": 13 | ||
| } | ||
| }, | ||
| "expression": { | ||
| "type": "AwaitExpression", | ||
| "start": 16, | ||
| "end": 26, | ||
| "loc": { | ||
| "start": { | ||
| "line": 2, | ||
| "column": 2 | ||
| }, | ||
| "end": { | ||
| "line": 2, | ||
| "column": 12 | ||
| } | ||
| }, | ||
| "argument": { | ||
| "type": "NullLiteral", | ||
| "start": 22, | ||
| "end": 26, | ||
| "loc": { | ||
| "start": { | ||
| "line": 2, | ||
| "column": 8 | ||
| }, | ||
| "end": { | ||
| "line": 2, | ||
| "column": 12 | ||
| } | ||
| } | ||
| } | ||
| } | ||
| }, | ||
| { | ||
| "type": "ExpressionStatement", | ||
| "start": 30, | ||
| "end": 50, | ||
| "loc": { | ||
| "start": { | ||
| "line": 3, | ||
| "column": 2 | ||
| }, | ||
| "end": { | ||
| "line": 3, | ||
| "column": 22 | ||
| } | ||
| }, | ||
| "expression": { | ||
| "type": "ArrowFunctionExpression", | ||
| "start": 30, | ||
| "end": 49, | ||
| "loc": { | ||
| "start": { | ||
| "line": 3, | ||
| "column": 2 | ||
| }, | ||
| "end": { | ||
| "line": 3, | ||
| "column": 21 | ||
| } | ||
| }, | ||
| "typeParameters": { | ||
| "type": "TSTypeParameterDeclaration", | ||
| "start": 36, | ||
| "end": 39, | ||
| "loc": { | ||
| "start": { | ||
| "line": 3, | ||
| "column": 8 | ||
| }, | ||
| "end": { | ||
| "line": 3, | ||
| "column": 11 | ||
| } | ||
| }, | ||
| "params": [ | ||
| { | ||
| "type": "TSTypeParameter", | ||
| "start": 37, | ||
| "end": 38, | ||
| "loc": { | ||
| "start": { | ||
| "line": 3, | ||
| "column": 9 | ||
| }, | ||
| "end": { | ||
| "line": 3, | ||
| "column": 10 | ||
| } | ||
| }, | ||
| "name": "T" | ||
| } | ||
| ] | ||
| }, | ||
| "params": [], | ||
| "id": null, | ||
| "generator": false, | ||
| "async": true, | ||
| "body": { | ||
| "type": "NullLiteral", | ||
| "start": 45, | ||
| "end": 49, | ||
| "loc": { | ||
| "start": { | ||
| "line": 3, | ||
| "column": 17 | ||
| }, | ||
| "end": { | ||
| "line": 3, | ||
| "column": 21 | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| ], | ||
| "directives": [] | ||
| } | ||
| } | ||
| } | ||
| ], | ||
| "directives": [] | ||
| } | ||
| } |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I wasn't 100% sure where to put this change, and the one below to reset things.
For resetting these values, it seemed best to do it before any attempt to parse is started, but strictly speaking it only seemed to need to happen before
parseFunctionParams.For setting state back to oldState below, it looks like typically this is done before
parseArrowExpressionis called (e.g. https://github.com/liamfd/babel/blob/master/packages/babel-parser/src/parser/expression.js#L972), so I matched that.