swc-project/swc
1
1
Fork 0
mirror of https://github.com/swc-project/swc.git synced 2024-12-23 21:54:36 +03:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

fix(es/parser): Adjust context in a function block (#4264)

Browse Source
This commit is contained in:
William Tetlow 2022-04-07 04:15:59 +01:00 committed by GitHub
parent 91e889f531
commit b89937c3c0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 503 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
crates/swc_ecma_parser/src/parser/class_and_fn.rs
View File

@ -1514,7 +1514,13 @@ fn has_use_strict(block: &BlockStmt) -> Option<Span> {
impl<I: Tokens> FnBodyParser<BlockStmtOrExpr> for Parser<I> {
fn parse_fn_body_inner(&mut self, is_simple_parameter_list: bool) -> PResult<BlockStmtOrExpr> {
if is!(self, '{') {
self.parse_block(false).map(|block_stmt| {
let cur_ctx = self.ctx();
let ctx = Context {
is_direct_child_of_braceless_arrow_function: false,
..cur_ctx
};
let result = self.with_ctx(ctx).parse_block(false);
result.map(|block_stmt| {
if !self.input.syntax().typescript() && !is_simple_parameter_list {
if let Some(span) = has_use_strict(&block_stmt) {
self.emit_err(span, SyntaxError::IllegalLanguageModeDirective);

0
crates/swc_ecma_parser/tests/typescript/issue-4178/index.ts → crates/swc_ecma_parser/tests/typescript/issue-4178/1/index.ts
View File

0
crates/swc_ecma_parser/tests/typescript/issue-4178/index.ts.json → crates/swc_ecma_parser/tests/typescript/issue-4178/1/index.ts.json
View File

3
crates/swc_ecma_parser/tests/typescript/issue-4178/2/index.ts Normal file
View File

@ -0,0 +1,3 @@
export const x = (a: number) => () => {
const y = a && b ? (z: number): string => "hello" : null
}

259
crates/swc_ecma_parser/tests/typescript/issue-4178/2/index.ts.json Normal file
View File

@ -0,0 +1,259 @@
{
"type": "Module",
"span": {
"start": 0,
"end": 100,
"ctxt": 0
},
"body": [
{
"type": "ExportDeclaration",
"span": {
"start": 0,
"end": 100,
"ctxt": 0
},
"declaration": {
"type": "VariableDeclaration",
"span": {
"start": 7,
"end": 100,
"ctxt": 0
},
"kind": "const",
"declare": false,
"declarations": [
{
"type": "VariableDeclarator",
"span": {
"start": 13,
"end": 100,
"ctxt": 0
},
"id": {
"type": "Identifier",
"span": {
"start": 13,
"end": 14,
"ctxt": 0
},
"value": "x",
"optional": false,
"typeAnnotation": null
},
"init": {
"type": "ArrowFunctionExpression",
"span": {
"start": 17,
"end": 100,
"ctxt": 0
},
"params": [
{
"type": "Identifier",
"span": {
"start": 18,
"end": 27,
"ctxt": 0
},
"value": "a",
"optional": false,
"typeAnnotation": {
"type": "TsTypeAnnotation",
"span": {
"start": 19,
"end": 27,
"ctxt": 0
},
"typeAnnotation": {
"type": "TsKeywordType",
"span": {
"start": 21,
"end": 27,
"ctxt": 0
},
"kind": "number"
}
}
}
],
"body": {
"type": "ArrowFunctionExpression",
"span": {
"start": 32,
"end": 100,
"ctxt": 0
},
"params": [],
"body": {
"type": "BlockStatement",
"span": {
"start": 38,
"end": 100,
"ctxt": 0
},
"stmts": [
{
"type": "VariableDeclaration",
"span": {
"start": 42,
"end": 98,
"ctxt": 0
},
"kind": "const",
"declare": false,
"declarations": [
{
"type": "VariableDeclarator",
"span": {
"start": 48,
"end": 98,
"ctxt": 0
},
"id": {
"type": "Identifier",
"span": {
"start": 48,
"end": 49,
"ctxt": 0
},
"value": "y",
"optional": false,
"typeAnnotation": null
},
"init": {
"type": "ConditionalExpression",
"span": {
"start": 52,
"end": 98,
"ctxt": 0
},
"test": {
"type": "BinaryExpression",
"span": {
"start": 52,
"end": 58,
"ctxt": 0
},
"operator": "&&",
"left": {
"type": "Identifier",
"span": {
"start": 52,
"end": 53,
"ctxt": 0
},
"value": "a",
"optional": false
},
"right": {
"type": "Identifier",
"span": {
"start": 57,
"end": 58,
"ctxt": 0
},
"value": "b",
"optional": false
}
},
"consequent": {
"type": "ArrowFunctionExpression",
"span": {
"start": 61,
"end": 91,
"ctxt": 0
},
"params": [
{
"type": "Identifier",
"span": {
"start": 62,
"end": 71,
"ctxt": 0
},
"value": "z",
"optional": false,
"typeAnnotation": {
"type": "TsTypeAnnotation",
"span": {
"start": 63,
"end": 71,
"ctxt": 0
},
"typeAnnotation": {
"type": "TsKeywordType",
"span": {
"start": 65,
"end": 71,
"ctxt": 0
},
"kind": "number"
}
}
}
],
"body": {
"type": "StringLiteral",
"span": {
"start": 84,
"end": 91,
"ctxt": 0
},
"value": "hello",
"raw": "\"hello\""
},
"async": false,
"generator": false,
"typeParameters": null,
"returnType": {
"type": "TsTypeAnnotation",
"span": {
"start": 72,
"end": 80,
"ctxt": 0
},
"typeAnnotation": {
"type": "TsKeywordType",
"span": {
"start": 74,
"end": 80,
"ctxt": 0
},
"kind": "string"
}
}
},
"alternate": {
"type": "NullLiteral",
"span": {
"start": 94,
"end": 98,
"ctxt": 0
}
}
},
"definite": false
}
]
}
]
},
"async": false,
"generator": false,
"typeParameters": null,
"returnType": null
},
"async": false,
"generator": false,
"typeParameters": null,
"returnType": null
},
"definite": false
}
]
}
}
],
"interpreter": null
}

5
crates/swc_ecma_parser/tests/typescript/issue-4178/3/index.ts Normal file
View File

@ -0,0 +1,5 @@
export function x() {
return () => {
const y = a && b ? (z: number): string => "hello" : null;
};
}

229
crates/swc_ecma_parser/tests/typescript/issue-4178/3/index.ts.json Normal file
View File

@ -0,0 +1,229 @@
{
"type": "Module",
"span": {
"start": 0,
"end": 109,
"ctxt": 0
},
"body": [
{
"type": "ExportDeclaration",
"span": {
"start": 0,
"end": 109,
"ctxt": 0
},
"declaration": {
"type": "FunctionDeclaration",
"identifier": {
"type": "Identifier",
"span": {
"start": 16,
"end": 17,
"ctxt": 0
},
"value": "x",
"optional": false
},
"declare": false,
"params": [],
"decorators": [],
"span": {
"start": 7,
"end": 109,
"ctxt": 0
},
"body": {
"type": "BlockStatement",
"span": {
"start": 20,
"end": 109,
"ctxt": 0
},
"stmts": [
{
"type": "ReturnStatement",
"span": {
"start": 24,
"end": 107,
"ctxt": 0
},
"argument": {
"type": "ArrowFunctionExpression",
"span": {
"start": 31,
"end": 106,
"ctxt": 0
},
"params": [],
"body": {
"type": "BlockStatement",
"span": {
"start": 37,
"end": 106,
"ctxt": 0
},
"stmts": [
{
"type": "VariableDeclaration",
"span": {
"start": 45,
"end": 102,
"ctxt": 0
},
"kind": "const",
"declare": false,
"declarations": [
{
"type": "VariableDeclarator",
"span": {
"start": 51,
"end": 101,
"ctxt": 0
},
"id": {
"type": "Identifier",
"span": {
"start": 51,
"end": 52,
"ctxt": 0
},
"value": "y",
"optional": false,
"typeAnnotation": null
},
"init": {
"type": "ConditionalExpression",
"span": {
"start": 55,
"end": 101,
"ctxt": 0
},
"test": {
"type": "BinaryExpression",
"span": {
"start": 55,
"end": 61,
"ctxt": 0
},
"operator": "&&",
"left": {
"type": "Identifier",
"span": {
"start": 55,
"end": 56,
"ctxt": 0
},
"value": "a",
"optional": false
},
"right": {
"type": "Identifier",
"span": {
"start": 60,
"end": 61,
"ctxt": 0
},
"value": "b",
"optional": false
}
},
"consequent": {
"type": "ArrowFunctionExpression",
"span": {
"start": 64,
"end": 94,
"ctxt": 0
},
"params": [
{
"type": "Identifier",
"span": {
"start": 65,
"end": 74,
"ctxt": 0
},
"value": "z",
"optional": false,
"typeAnnotation": {
"type": "TsTypeAnnotation",
"span": {
"start": 66,
"end": 74,
"ctxt": 0
},
"typeAnnotation": {
"type": "TsKeywordType",
"span": {
"start": 68,
"end": 74,
"ctxt": 0
},
"kind": "number"
}
}
}
],
"body": {
"type": "StringLiteral",
"span": {
"start": 87,
"end": 94,
"ctxt": 0
},
"value": "hello",
"raw": "\"hello\""
},
"async": false,
"generator": false,
"typeParameters": null,
"returnType": {
"type": "TsTypeAnnotation",
"span": {
"start": 75,
"end": 83,
"ctxt": 0
},
"typeAnnotation": {
"type": "TsKeywordType",
"span": {
"start": 77,
"end": 83,
"ctxt": 0
},
"kind": "string"
}
}
},
"alternate": {
"type": "NullLiteral",
"span": {
"start": 97,
"end": 101,
"ctxt": 0
}
}
},
"definite": false
}
]
}
]
},
"async": false,
"generator": false,
"typeParameters": null,
"returnType": null
}
}
]
},
"generator": false,
"async": false,
"typeParameters": null,
"returnType": null
}
}
],
"interpreter": null
}