Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(es/parser): Adjust context while parsing type arguments of TypeScript type queries #7582

Merged
merged 3 commits into from
Jun 26, 2023
Merged

fix(es/parser): Adjust context while parsing type arguments of TypeScript type queries #7582

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d6f5fa2
Add a test
kdy1 Jun 26, 2023
502121c
Adjust ctx
kdy1 Jun 26, 2023
460527e
Update test refs
kdy1 Jun 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion crates/swc_ecma_parser/src/parser/typescript.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,11 @@ impl<I: Tokens> Parser<I> {
};

let type_args = if !self.input.had_line_break_before_cur() && is!(self, '<') {
Some(self.parse_ts_type_args()?)
let ctx = Context {
should_not_lex_lt_or_gt_as_type: false,
..self.ctx()
};
Some(self.with_ctx(ctx).parse_ts_type_args()?)
} else {
None
};
Expand Down
5 changes: 5 additions & 0 deletions crates/swc_ecma_parser/tests/typescript/issue-7580/input.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
const example = () => {
return {
func: callback<typeof something<Type1, Type2>>(options => null)
};
};
229 changes: 229 additions & 0 deletions crates/swc_ecma_parser/tests/typescript/issue-7580/input.tsx.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,229 @@
{
"type": "Script",
"span": {
"start": 1,
"end": 119,
"ctxt": 0
},
"body": [
{
"type": "VariableDeclaration",
"span": {
"start": 1,
"end": 119,
"ctxt": 0
},
"kind": "const",
"declare": false,
"declarations": [
{
"type": "VariableDeclarator",
"span": {
"start": 7,
"end": 118,
"ctxt": 0
},
"id": {
"type": "Identifier",
"span": {
"start": 7,
"end": 14,
"ctxt": 0
},
"value": "example",
"optional": false,
"typeAnnotation": null
},
"init": {
"type": "ArrowFunctionExpression",
"span": {
"start": 17,
"end": 118,
"ctxt": 0
},
"params": [],
"body": {
"type": "BlockStatement",
"span": {
"start": 23,
"end": 118,
"ctxt": 0
},
"stmts": [
{
"type": "ReturnStatement",
"span": {
"start": 29,
"end": 114,
"ctxt": 0
},
"argument": {
"type": "ObjectExpression",
"span": {
"start": 36,
"end": 113,
"ctxt": 0
},
"properties": [
{
"type": "KeyValueProperty",
"key": {
"type": "Identifier",
"span": {
"start": 44,
"end": 48,
"ctxt": 0
},
"value": "func",
"optional": false
},
"value": {
"type": "CallExpression",
"span": {
"start": 50,
"end": 107,
"ctxt": 0
},
"callee": {
"type": "Identifier",
"span": {
"start": 50,
"end": 58,
"ctxt": 0
},
"value": "callback",
"optional": false
},
"arguments": [
{
"spread": null,
"expression": {
"type": "ArrowFunctionExpression",
"span": {
"start": 91,
"end": 106,
"ctxt": 0
},
"params": [
{
"type": "Identifier",
"span": {
"start": 91,
"end": 98,
"ctxt": 0
},
"value": "options",
"optional": false,
"typeAnnotation": null
}
],
"body": {
"type": "NullLiteral",
"span": {
"start": 102,
"end": 106,
"ctxt": 0
}
},
"async": false,
"generator": false,
"typeParameters": null,
"returnType": null
}
}
],
"typeArguments": {
"type": "TsTypeParameterInstantiation",
"span": {
"start": 58,
"end": 90,
"ctxt": 0
},
"params": [
{
"type": "TsTypeQuery",
"span": {
"start": 59,
"end": 89,
"ctxt": 0
},
"exprName": {
"type": "Identifier",
"span": {
"start": 66,
"end": 75,
"ctxt": 0
},
"value": "something",
"optional": false
},
"typeArguments": {
"type": "TsTypeParameterInstantiation",
"span": {
"start": 75,
"end": 89,
"ctxt": 0
},
"params": [
{
"type": "TsTypeReference",
"span": {
"start": 76,
"end": 81,
"ctxt": 0
},
"typeName": {
"type": "Identifier",
"span": {
"start": 76,
"end": 81,
"ctxt": 0
},
"value": "Type1",
"optional": false
},
"typeParams": null
},
{
"type": "TsTypeReference",
"span": {
"start": 83,
"end": 88,
"ctxt": 0
},
"typeName": {
"type": "Identifier",
"span": {
"start": 83,
"end": 88,
"ctxt": 0
},
"value": "Type2",
"optional": false
},
"typeParams": null
}
]
}
}
]
}
}
}
]
}
}
]
},
"async": false,
"generator": false,
"typeParameters": null,
"returnType": null
},
"definite": false
}
]
}
],
"interpreter": null
}