Skip to content

fix(parser): Revert "check for @flow with recoverable errors as well" #5297

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
Aug 28, 2024
Merged

fix(parser): Revert "check for @flow with recoverable errors as well" #5297

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
18 changes: 4 additions & 14 deletions crates/oxc_parser/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,9 @@ impl<'a> ParserImpl<'a> {
let (program, panicked) = match self.parse_program() {
Ok(program) => (program, false),
Err(error) => {
self.error(self.overlong_error().unwrap_or(error));
let error =
self.flow_error().unwrap_or_else(|| self.overlong_error().unwrap_or(error));
self.error(error);
let program = self.ast.program(
Span::default(),
self.source_type,
Expand All @@ -314,18 +316,7 @@ impl<'a> ParserImpl<'a> {
(program, true)
}
};
let mut errors = vec![];
// only check for `@flow` if the file failed to parse.
if !self.lexer.errors.is_empty() || !self.errors.is_empty() {
if let Some(error) = self.flow_error() {
errors.push(error);
}
}
if errors.len() != 1 {
errors.reserve(self.lexer.errors.len() + self.errors.len());
errors.extend(self.lexer.errors);
errors.extend(self.errors);
}
let errors = self.lexer.errors.into_iter().chain(self.errors).collect();
let trivias = self.lexer.trivia_builder.build();
ParserReturn { program, errors, trivias, panicked }
}
Expand Down Expand Up @@ -457,7 +448,6 @@ mod test {
*/
asdf asdf
",
"/* @flow */ let a; let a;",
];
for source in sources {
let ret = Parser::new(&allocator, source, source_type).parse();
Expand Down