Skip to content

perf(estree/tokens): do not branch on presence of override twice #19721

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
graphite-app merged 1 commit into from
Feb 25, 2026
Merged

perf(estree/tokens): do not branch on presence of override twice #19721

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 12 additions & 14 deletions crates/oxc_estree_tokens/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,15 +135,21 @@ fn to_estree_tokens<'a>(
span_converter.convert_offset(&mut end);
}

let token_override = if next_override_start == start {
let override_kind = next_override_kind;
let token_type = if next_override_start == start {
let token_type = match next_override_kind {
TokenKindOverride::Identifier => "Identifier",
TokenKindOverride::JSXIdentifier => "JSXIdentifier",
TokenKindOverride::JSXText => "JSXText",
};

// Get next override
(next_override_start, next_override_kind) =
overrides.next().unwrap_or((u32::MAX, TokenKindOverride::Identifier));
Some(override_kind)

token_type
} else {
None
get_token_type(kind)
};
let token_type = token_type(kind, token_override);

let source_value =
if kind == Kind::PrivateIdentifier { &source_value[1..] } else { source_value };
Expand Down Expand Up @@ -429,15 +435,7 @@ impl<'a> Visit<'a> for EstreeTokenContext {
}
}

fn token_type(kind: Kind, token_override: Option<TokenKindOverride>) -> &'static str {
if let Some(token_override) = token_override {
return match token_override {
TokenKindOverride::Identifier => "Identifier",
TokenKindOverride::JSXIdentifier => "JSXIdentifier",
TokenKindOverride::JSXText => "JSXText",
};
}

fn get_token_type(kind: Kind) -> &'static str {
match kind {
Kind::Ident | Kind::Await => "Identifier",
Kind::PrivateIdentifier => "PrivateIdentifier",
Expand Down
Loading