Skip to content

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

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

Closed
ArnaudBarre wants to merge 1 commit into from
Closed

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

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
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ target/
/editors/vscode/out/
/editors/vscode/*.vsix

# Jetbrains
/.idea/

# Cloned conformance repos
tasks/coverage/babel/
tasks/coverage/test262/
Expand Down
11 changes: 9 additions & 2 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 @@ -19,12 +19,19 @@ impl<'a> ParserImpl<'a> {
allow_question: bool,
) -> Result<BindingPattern<'a>> {
let mut kind = self.parse_binding_pattern_kind()?;
let optional = if allow_question && self.is_ts { self.eat(Kind::Question) } else { false };
let optional = if allow_question && self.is_ts {
let span = self.start_span();
if self.eat(Kind::Question) { Some(self.end_span(span)) } else { None }
} else {
None
};
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);
} else if let Some(span) = optional {
Self::extend_binding_pattern_span_end(span, &mut kind);
}
Ok(self.ast.binding_pattern(kind, type_annotation, optional))
Ok(self.ast.binding_pattern(kind, type_annotation, optional.is_some()))
}

pub(crate) fn parse_binding_pattern_kind(&mut self) -> Result<BindingPatternKind<'a>> {
Expand Down
Loading