From 061ce8f84e7fcca63da4c70eeccab5de73493683 Mon Sep 17 00:00:00 2001 From: overlookmotel <557937+overlookmotel@users.noreply.github.com> Date: Wed, 25 Feb 2026 20:32:36 +0000 Subject: [PATCH] refactor(estree/tokens): simplify code (#19722) Pure refactor. Just simplify code and rename a couple of vars. --- crates/oxc_estree_tokens/src/lib.rs | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/crates/oxc_estree_tokens/src/lib.rs b/crates/oxc_estree_tokens/src/lib.rs index 2897708f138e3..8dae56ef5185d 100644 --- a/crates/oxc_estree_tokens/src/lib.rs +++ b/crates/oxc_estree_tokens/src/lib.rs @@ -126,7 +126,7 @@ fn to_estree_tokens<'a>( for token in tokens { let kind = token.kind(); - let source_value = &source_text[token.start() as usize..token.end() as usize]; + let mut value = &source_text[token.start() as usize..token.end() as usize]; let mut start = token.start(); let mut end = token.end(); @@ -151,18 +151,19 @@ fn to_estree_tokens<'a>( get_token_type(kind) }; - let source_value = - if kind == Kind::PrivateIdentifier { &source_value[1..] } else { source_value }; - let value = if options.decode_identifier_escapes + if kind == Kind::PrivateIdentifier { + value = &value[1..]; + } + + if options.decode_identifier_escapes && token.escaped() && (kind.is_identifier_name() || kind == Kind::PrivateIdentifier) { - decode_js_unicode_escapes(allocator, source_value) - } else { - source_value - }; + value = decode_js_unicode_escapes(allocator, value); + } + let regex = if kind == Kind::RegExp { - regex_parts(source_value).map(|(pattern, flags)| EstreeRegExpToken { pattern, flags }) + regex_parts(value).map(|(pattern, flags)| EstreeRegExpToken { pattern, flags }) } else { None };