Skip to content
Closed
Changes from all commits
Commits
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
38 changes: 26 additions & 12 deletions crates/oxc_estree_tokens/src/serialize.rs
Original file line number Diff line number Diff line change
Expand Up @@ -636,26 +636,40 @@ impl<O: ESTreeTokenConfig> UpdateContext<'_, O> {
/// but their spans are converted from UTF-8 to UTF-16.
fn advance_to(&mut self, start: u32) -> &mut Token {
let Self { tokens, span_converter, .. } = self;
for token in &mut *tokens {
debug_assert!(
token.start() <= start,
"Expected token at position {start}, found token at position {}",
token.start(),
);

let is_target = token.start() == start;
if let Some(span_converter) = span_converter {
for token in tokens {
debug_assert!(
token.start() <= start,
"Expected token at position {start}, found token at position {}",
token.start(),
);

let is_target = token.start() == start;

// Convert span from UTF-8 byte offsets to UTF-16 offsets
if let Some(converter) = span_converter {
// Convert span from UTF-8 byte offsets to UTF-16 offsets
let mut span = token.span();
converter.convert_span(&mut span);
span_converter.convert_span(&mut span);
token.set_span(span);

if is_target {
return token;
}
}
} else {
for token in tokens {
debug_assert!(
token.start() <= start,
"Expected token at position {start}, found token at position {}",
token.start(),
);

if is_target {
return token;
if token.start() == start {
return token;
}
}
}

unreachable!("Expected token at position {start}");
}

Expand Down
Loading