Skip to content

perf(parser): avoid checkpoint when parsing left curly in jsx #11377

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

Merged
Boshen merged 2 commits into from
May 30, 2025
+15 −18
Merged

perf(parser): avoid checkpoint when parsing left curly in jsx #11377

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
233b805
perf(linter): avoid checkpoint when parsing left curly in jsx
ulrichstark May 29, 2025
b1a237b
u
Boshen May 30, 2025
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
33 changes: 15 additions & 18 deletions crates/oxc_parser/src/jsx/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,18 +264,16 @@ impl<'a> ParserImpl<'a> {
self.unexpected()
}
Kind::LCurly => {
let checkpoint = self.checkpoint();
self.bump_any();
let span_start = self.start_span();
self.bump_any(); // bump `{`

// {...expr}
if self.at(Kind::Dot3) {
self.rewind(checkpoint);
return Some(JSXChild::Spread(self.parse_jsx_spread_child()));
if self.eat(Kind::Dot3) {
return Some(JSXChild::Spread(self.parse_jsx_spread_child(span_start)));
}
// {expr}
self.rewind(checkpoint);
Some(JSXChild::ExpressionContainer(
self.parse_jsx_expression_container(/* in_jsx_child */ true),
self.parse_jsx_expression_container(span_start, /* in_jsx_child */ true),
))
}
// text
Expand All @@ -287,18 +285,16 @@ impl<'a> ParserImpl<'a> {
/// { `JSXChildExpression_opt` }
fn parse_jsx_expression_container(
&mut self,
span_start: u32,
in_jsx_child: bool,
) -> Box<'a, JSXExpressionContainer<'a>> {
let span = self.start_span();
self.bump_any(); // bump `{`

let expr = if self.at(Kind::RCurly) {
if in_jsx_child {
self.expect_jsx_child(Kind::RCurly);
} else {
self.expect(Kind::RCurly);
}
let span = self.end_span(span);
let span = self.end_span(span_start);
// Handle comment between curly braces (ex. `{/* comment */}`)
// ^^^^^^^^^^^^^ span
let expr = self.ast.jsx_empty_expression(Span::new(span.start + 1, span.end - 1));
Expand All @@ -313,7 +309,7 @@ impl<'a> ParserImpl<'a> {
expr
};

self.ast.alloc_jsx_expression_container(self.end_span(span), expr)
self.ast.alloc_jsx_expression_container(self.end_span(span_start), expr)
}

fn parse_jsx_assignment_expression(&mut self) -> Expression<'a> {
Expand All @@ -324,13 +320,10 @@ impl<'a> ParserImpl<'a> {

/// `JSXChildExpression` :
/// { ... `AssignmentExpression` }
fn parse_jsx_spread_child(&mut self) -> Box<'a, JSXSpreadChild<'a>> {
let span = self.start_span();
self.bump_any(); // bump `{`
self.expect(Kind::Dot3);
fn parse_jsx_spread_child(&mut self, span_start: u32) -> Box<'a, JSXSpreadChild<'a>> {
let expr = self.parse_jsx_assignment_expression();
self.expect_jsx_child(Kind::RCurly);
self.ast.alloc_jsx_spread_child(self.end_span(span), expr)
self.ast.alloc_jsx_spread_child(self.end_span(span_start), expr)
}

/// `JSXAttributes` :
Expand Down Expand Up @@ -403,7 +396,11 @@ impl<'a> ParserImpl<'a> {
JSXAttributeValue::StringLiteral(self.alloc(str_lit))
}
Kind::LCurly => {
let expr = self.parse_jsx_expression_container(/* in_jsx_child */ false);
let span_start = self.start_span();
self.bump_any(); // bump `{`

let expr =
self.parse_jsx_expression_container(span_start, /* in_jsx_child */ false);
JSXAttributeValue::ExpressionContainer(expr)
}
Kind::LAngle => match self.parse_jsx_expression() {
Expand Down
Loading