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

Correctly parse TS TypeAssertions around arrow functions (#9699)

Browse Source
This commit is contained in:
Daniel Tschinder 2019-03-18 22:18:47 -07:00 committed by GitHub
parent c285d5409e
commit 48d66eb648
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 433 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packages/babel-parser/src/plugins/typescript.js
View File

@ -2121,7 +2121,10 @@ export default (superClass: Class<Parser>): Class<Parser> =>
// This is similar to TypeScript's `tryParseParenthesizedArrowFunctionExpression`. // This is similar to TypeScript's `tryParseParenthesizedArrowFunctionExpression`.
typeParameters = this.tsParseTypeParameters(); typeParameters = this.tsParseTypeParameters();
arrowExpression = super.parseMaybeAssign(...args); arrowExpression = super.parseMaybeAssign(...args);
if (arrowExpression.type !== "ArrowFunctionExpression") { if (
arrowExpression.type !== "ArrowFunctionExpression" ||
(arrowExpression.extra && arrowExpression.extra.parenthesized)
) {
this.unexpected(); // Go to the catch block (needs a SyntaxError). this.unexpected(); // Go to the catch block (needs a SyntaxError).
} }
} catch (err) { } catch (err) {

1
packages/babel-parser/test/fixtures/typescript/cast/arrow-in-parens-with-parens-node/input.js vendored Normal file
View File

@ -0,0 +1 @@
var asserted1 = <any>((n) => { return n; });

4
packages/babel-parser/test/fixtures/typescript/cast/arrow-in-parens-with-parens-node/options.json vendored Normal file
View File

@ -0,0 +1,4 @@
{
"createParenthesizedExpressions": true,
"plugins": ["typescript"]
}

217
packages/babel-parser/test/fixtures/typescript/cast/arrow-in-parens-with-parens-node/output.json vendored Normal file
View File

@ -0,0 +1,217 @@
{
"type": "File",
"start": 0,
"end": 44,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 1,
"column": 44
}
},
"program": {
"type": "Program",
"start": 0,
"end": 44,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 1,
"column": 44
}
},
"sourceType": "module",
"interpreter": null,
"body": [
{
"type": "VariableDeclaration",
"start": 0,
"end": 44,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 1,
"column": 44
}
},
"declarations": [
{
"type": "VariableDeclarator",
"start": 4,
"end": 43,
"loc": {
"start": {
"line": 1,
"column": 4
},
"end": {
"line": 1,
"column": 43
}
},
"id": {
"type": "Identifier",
"start": 4,
"end": 13,
"loc": {
"start": {
"line": 1,
"column": 4
},
"end": {
"line": 1,
"column": 13
},
"identifierName": "asserted1"
},
"name": "asserted1"
},
"init": {
"type": "TSTypeAssertion",
"start": 16,
"end": 43,
"loc": {
"start": {
"line": 1,
"column": 16
},
"end": {
"line": 1,
"column": 43
}
},
"typeAnnotation": {
"type": "TSAnyKeyword",
"start": 17,
"end": 20,
"loc": {
"start": {
"line": 1,
"column": 17
},
"end": {
"line": 1,
"column": 20
}
}
},
"expression": {
"type": "ParenthesizedExpression",
"start": 21,
"end": 43,
"loc": {
"start": {
"line": 1,
"column": 21
},
"end": {
"line": 1,
"column": 43
}
},
"expression": {
"type": "ArrowFunctionExpression",
"start": 22,
"end": 42,
"loc": {
"start": {
"line": 1,
"column": 22
},
"end": {
"line": 1,
"column": 42
}
},
"id": null,
"generator": false,
"async": false,
"params": [
{
"type": "Identifier",
"start": 23,
"end": 24,
"loc": {
"start": {
"line": 1,
"column": 23
},
"end": {
"line": 1,
"column": 24
},
"identifierName": "n"
},
"name": "n"
}
],
"body": {
"type": "BlockStatement",
"start": 29,
"end": 42,
"loc": {
"start": {
"line": 1,
"column": 29
},
"end": {
"line": 1,
"column": 42
}
},
"body": [
{
"type": "ReturnStatement",
"start": 31,
"end": 40,
"loc": {
"start": {
"line": 1,
"column": 31
},
"end": {
"line": 1,
"column": 40
}
},
"argument": {
"type": "Identifier",
"start": 38,
"end": 39,
"loc": {
"start": {
"line": 1,
"column": 38
},
"end": {
"line": 1,
"column": 39
},
"identifierName": "n"
},
"name": "n"
}
}
],
"directives": []
}
}
}
}
}
],
"kind": "var"
}
],
"directives": []
}
}

1
packages/babel-parser/test/fixtures/typescript/cast/arrow-in-parens/input.js vendored Normal file
View File

@ -0,0 +1 @@
var asserted1 = <any>((n) => { return n; });

206
packages/babel-parser/test/fixtures/typescript/cast/arrow-in-parens/output.json vendored Normal file
View File

@ -0,0 +1,206 @@
{
"type": "File",
"start": 0,
"end": 44,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 1,
"column": 44
}
},
"program": {
"type": "Program",
"start": 0,
"end": 44,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 1,
"column": 44
}
},
"sourceType": "module",
"interpreter": null,
"body": [
{
"type": "VariableDeclaration",
"start": 0,
"end": 44,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 1,
"column": 44
}
},
"declarations": [
{
"type": "VariableDeclarator",
"start": 4,
"end": 43,
"loc": {
"start": {
"line": 1,
"column": 4
},
"end": {
"line": 1,
"column": 43
}
},
"id": {
"type": "Identifier",
"start": 4,
"end": 13,
"loc": {
"start": {
"line": 1,
"column": 4
},
"end": {
"line": 1,
"column": 13
},
"identifierName": "asserted1"
},
"name": "asserted1"
},
"init": {
"type": "TSTypeAssertion",
"start": 16,
"end": 43,
"loc": {
"start": {
"line": 1,
"column": 16
},
"end": {
"line": 1,
"column": 43
}
},
"typeAnnotation": {
"type": "TSAnyKeyword",
"start": 17,
"end": 20,
"loc": {
"start": {
"line": 1,
"column": 17
},
"end": {
"line": 1,
"column": 20
}
}
},
"expression": {
"type": "ArrowFunctionExpression",
"start": 22,
"end": 42,
"loc": {
"start": {
"line": 1,
"column": 22
},
"end": {
"line": 1,
"column": 42
}
},
"id": null,
"generator": false,
"async": false,
"params": [
{
"type": "Identifier",
"start": 23,
"end": 24,
"loc": {
"start": {
"line": 1,
"column": 23
},
"end": {
"line": 1,
"column": 24
},
"identifierName": "n"
},
"name": "n"
}
],
"body": {
"type": "BlockStatement",
"start": 29,
"end": 42,
"loc": {
"start": {
"line": 1,
"column": 29
},
"end": {
"line": 1,
"column": 42
}
},
"body": [
{
"type": "ReturnStatement",
"start": 31,
"end": 40,
"loc": {
"start": {
"line": 1,
"column": 31
},
"end": {
"line": 1,
"column": 40
}
},
"argument": {
"type": "Identifier",
"start": 38,
"end": 39,
"loc": {
"start": {
"line": 1,
"column": 38
},
"end": {
"line": 1,
"column": 39
},
"identifierName": "n"
},
"name": "n"
}
}
],
"directives": []
},
"extra": {
"parenthesized": true,
"parenStart": 21
}
}
}
}
],
"kind": "var"
}
],
"directives": []
}
}