Skip to content

fix(parser): fix end span for optional binding pattern without type annotation #9652

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
Mar 10, 2025
+6 −4
Merged

fix(parser): fix end span for optional binding pattern without type annotation #9652

Show file tree
Hide file tree
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
8 changes: 5 additions & 3 deletions crates/oxc_parser/src/js/binding.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,9 @@ impl<'a> ParserImpl<'a> {
let optional = if allow_question && self.is_ts { self.eat(Kind::Question) } else { false };
let type_annotation = self.parse_ts_type_annotation()?;
if let Some(type_annotation) = &type_annotation {
Self::extend_binding_pattern_span_end(type_annotation.span, &mut kind);
Self::extend_binding_pattern_span_end(type_annotation.span.end, &mut kind);
} else if optional {
Self::extend_binding_pattern_span_end(self.prev_token_end, &mut kind);
}
Ok(self.ast.binding_pattern(kind, type_annotation, optional))
}
Expand Down Expand Up @@ -178,13 +180,13 @@ impl<'a> ParserImpl<'a> {
}
}

pub(super) fn extend_binding_pattern_span_end(span: Span, kind: &mut BindingPatternKind<'a>) {
pub(super) fn extend_binding_pattern_span_end(end: u32, kind: &mut BindingPatternKind<'a>) {
let pat_span = match kind {
BindingPatternKind::BindingIdentifier(pat) => &mut pat.span,
BindingPatternKind::ObjectPattern(pat) => &mut pat.span,
BindingPatternKind::ArrayPattern(pat) => &mut pat.span,
BindingPatternKind::AssignmentPattern(pat) => &mut pat.span,
};
pat_span.end = span.end;
pat_span.end = end;
}
}
2 changes: 1 addition & 1 deletion crates/oxc_parser/src/js/declaration.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ impl<'a> ParserImpl<'a> {
let optional = self.eat(Kind::Question); // not allowed, but checked in checker/typescript.rs
let type_annotation = self.parse_ts_type_annotation()?;
if let Some(type_annotation) = &type_annotation {
Self::extend_binding_pattern_span_end(type_annotation.span, &mut binding_kind);
Self::extend_binding_pattern_span_end(type_annotation.span.end, &mut binding_kind);
}
(self.ast.binding_pattern(binding_kind, type_annotation, optional), definite)
} else {
Expand Down
Loading