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(parser): Handle trailing comma and bracket after arrow fn in conditional in TS #3685

Merged
merged 8 commits into from Feb 25, 2022
Merged

fix(parser): Handle trailing comma and bracket after arrow fn in conditional in TS #3685

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f10ca0e
handle trailing commad after arrow fn
williamtetlow Feb 22, 2022
cf97fbc
Merge branch 'main' into handle-trailing-comma-after-arrow-fn
kdy1 Feb 22, 2022
f6f0623
allow ) after arrow func and remove test
williamtetlow Feb 25, 2022
a02f5e8
Merge branch 'handle-trailing-comma-after-arrow-fn' of https://github…
williamtetlow Feb 25, 2022
80be8b2
remove debug logs
williamtetlow Feb 25, 2022
21afd67
remove debug code
williamtetlow Feb 25, 2022
116a972
no whitespace change
williamtetlow Feb 25, 2022
2edce8b
Merge branch 'main' into handle-trailing-comma-after-arrow-fn
kdy1 Feb 25, 2022
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
2 changes: 1 addition & 1 deletion crates/swc_ecma_parser/src/parser/expr.rs
View file
Open in desktop
Expand Up @@ -707,7 +707,7 @@ impl<'a, I: Tokens> Parser<I> {
params.is_simple_parameter_list(),
)?;

if is_direct_child_of_cond && !is_one_of!(p, ':', ';') {
if is_direct_child_of_cond && !is_one_of!(p, ':', ';', ',') {
trace_cur!(p, parse_arrow_in_cond__fail);
unexpected!(p, "fail")
}
Expand Down
11 changes: 11 additions & 0 deletions crates/swc_ecma_parser/src/parser/expr/tests.rs
View file
Open in desktop
Expand Up @@ -494,6 +494,17 @@ fn super_expr_computed() {
);
}

#[test]
fn issue_3672() {
test_parser(
"report({
fix: fixable ? null : (): RuleFix => {},
});",
Syntax::Typescript(Default::default()),
|p| p.parse_module(),
);
}

#[bench]
fn bench_new_expr_ts(b: &mut Bencher) {
bench_parser(
Expand Down