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): Fix priority of >>> #6748

Merged
merged 11 commits into from
Jan 4, 2023
Merged

fix(es/parser): Fix priority of >>> #6748

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
114c656
Add tests
kdy1 Jan 4, 2023
ab5973f
Add a test
kdy1 Jan 4, 2023
593c335
Update test refs
kdy1 Jan 4, 2023
d2d0ed1
Update test refs
kdy1 Jan 4, 2023
c7cf592
Fix lexer
kdy1 Jan 4, 2023
127e3fa
Fix
kdy1 Jan 4, 2023
5ef34b0
Harden
kdy1 Jan 4, 2023
0cc308c
Update test refs
kdy1 Jan 4, 2023
663732a
Real fix
kdy1 Jan 4, 2023
19465dc
fixup
kdy1 Jan 4, 2023
c048e5f
Merge branch 'main' into parser
kdy1 Jan 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 8 additions & 0 deletions crates/swc/tests/fixture/issues-6xxx/6739/input/.swcrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"jsc": {
"parser": {
"syntax": "typescript",
"tsx": false
}
}
}
1 change: 1 addition & 0 deletions crates/swc/tests/fixture/issues-6xxx/6739/input/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
console.log(x < y >>> z);
1 change: 1 addition & 0 deletions crates/swc/tests/fixture/issues-6xxx/6739/output/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
console.log(x < y >>> z);
1 change: 1 addition & 0 deletions crates/swc/tests/fixture/issues-6xxx/6739/output/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
console.log(x < y >>> z);
2 changes: 1 addition & 1 deletion crates/swc_ecma_parser/src/lexer/state.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,7 @@ impl<'a, I: Input> Iterator for Lexer<'a, I> {
if c == '<' {
self.input.bump();
return Ok(Some(tok!('<')));
} else if c == '>' {
} else if c == '>' && !self.ctx.prefer_bin_op_over_type_arg_closing {
self.input.bump();
return Ok(Some(tok!('>')));
}
Expand Down
4 changes: 4 additions & 0 deletions crates/swc_ecma_parser/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,6 +375,10 @@ pub struct Context {
ignore_else_clause: bool,

disallow_conditional_types: bool,

/// Used for parsing `>`. If true, `>>` and `>>>` are parsed as binary
/// operators.
prefer_bin_op_over_type_arg_closing: bool,
}

#[derive(Debug, Clone, Copy, Default)]
Expand Down
6 changes: 5 additions & 1 deletion crates/swc_ecma_parser/src/parser/expr.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -671,7 +671,11 @@ impl<I: Tokens> Parser<I> {
return_if_arrow!(self, obj);

let type_args = if self.syntax().typescript() && is!(self, '<') {
self.try_parse_ts_type_args()
self.with_ctx(Context {
prefer_bin_op_over_type_arg_closing: true,
..self.ctx()
})
.try_parse_ts_type_args()
} else {
None
};
Expand Down
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 @@ -557,7 +557,11 @@ impl<I: Tokens> Parser<I> {
pub(super) fn try_parse_ts_type_args(&mut self) -> Option<Box<TsTypeParamInstantiation>> {
debug_assert!(self.input.syntax().typescript());

self.try_parse_ts(|p| {
self.with_ctx(Context {
prefer_bin_op_over_type_arg_closing: true,
..self.ctx()
})
.try_parse_ts(|p| {
let type_args = p.parse_ts_type_args()?;
if is_one_of!(
p, '<', // invalid syntax
Expand Down
1 change: 1 addition & 0 deletions crates/swc_ecma_parser/tests/typescript/issue-6739/1.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
console.log(x < y >>> z);
109 changes: 109 additions & 0 deletions crates/swc_ecma_parser/tests/typescript/issue-6739/1.ts.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,109 @@
{
"type": "Script",
"span": {
"start": 1,
"end": 26,
"ctxt": 0
},
"body": [
{
"type": "ExpressionStatement",
"span": {
"start": 1,
"end": 26,
"ctxt": 0
},
"expression": {
"type": "CallExpression",
"span": {
"start": 1,
"end": 25,
"ctxt": 0
},
"callee": {
"type": "MemberExpression",
"span": {
"start": 1,
"end": 12,
"ctxt": 0
},
"object": {
"type": "Identifier",
"span": {
"start": 1,
"end": 8,
"ctxt": 0
},
"value": "console",
"optional": false
},
"property": {
"type": "Identifier",
"span": {
"start": 9,
"end": 12,
"ctxt": 0
},
"value": "log",
"optional": false
}
},
"arguments": [
{
"spread": null,
"expression": {
"type": "BinaryExpression",
"span": {
"start": 13,
"end": 24,
"ctxt": 0
},
"operator": "<",
"left": {
"type": "Identifier",
"span": {
"start": 13,
"end": 14,
"ctxt": 0
},
"value": "x",
"optional": false
},
"right": {
"type": "BinaryExpression",
"span": {
"start": 17,
"end": 24,
"ctxt": 0
},
"operator": ">>>",
"left": {
"type": "Identifier",
"span": {
"start": 17,
"end": 18,
"ctxt": 0
},
"value": "y",
"optional": false
},
"right": {
"type": "Identifier",
"span": {
"start": 23,
"end": 24,
"ctxt": 0
},
"value": "z",
"optional": false
}
}
}
}
],
"typeArguments": null
}
}
],
"interpreter": null
}
1 change: 1 addition & 0 deletions crates/swc_ecma_parser/tests/typescript/issue-6739/2.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
console.log(x < y >>> z);
109 changes: 109 additions & 0 deletions crates/swc_ecma_parser/tests/typescript/issue-6739/2.tsx.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,109 @@
{
"type": "Script",
"span": {
"start": 1,
"end": 26,
"ctxt": 0
},
"body": [
{
"type": "ExpressionStatement",
"span": {
"start": 1,
"end": 26,
"ctxt": 0
},
"expression": {
"type": "CallExpression",
"span": {
"start": 1,
"end": 25,
"ctxt": 0
},
"callee": {
"type": "MemberExpression",
"span": {
"start": 1,
"end": 12,
"ctxt": 0
},
"object": {
"type": "Identifier",
"span": {
"start": 1,
"end": 8,
"ctxt": 0
},
"value": "console",
"optional": false
},
"property": {
"type": "Identifier",
"span": {
"start": 9,
"end": 12,
"ctxt": 0
},
"value": "log",
"optional": false
}
},
"arguments": [
{
"spread": null,
"expression": {
"type": "BinaryExpression",
"span": {
"start": 13,
"end": 24,
"ctxt": 0
},
"operator": "<",
"left": {
"type": "Identifier",
"span": {
"start": 13,
"end": 14,
"ctxt": 0
},
"value": "x",
"optional": false
},
"right": {
"type": "BinaryExpression",
"span": {
"start": 17,
"end": 24,
"ctxt": 0
},
"operator": ">>>",
"left": {
"type": "Identifier",
"span": {
"start": 17,
"end": 18,
"ctxt": 0
},
"value": "y",
"optional": false
},
"right": {
"type": "Identifier",
"span": {
"start": 23,
"end": 24,
"ctxt": 0
},
"value": "z",
"optional": false
}
}
}
}
],
"typeArguments": null
}
}
],
"interpreter": null
}