dan/oxc
1
0
Fork 0
mirror of https://github.com/danbulant/oxc synced 2026-05-19 04:08:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(parser): check for @flow with recoverable errors as well

Browse source
This commit is contained in:
Boshen 2024-08-28 19:32:08 +08:00
parent 5e27798dc3
commit e1d8b92080
No known key found for this signature in database
GPG key ID: 9C7A8C8AB22BEBD1
1 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
crates/oxc_parser/src/lib.rs
View file

@ -303,9 +303,7 @@ impl<'a> ParserImpl<'a> {
let (program, panicked) = match self.parse_program() {
Ok(program) => (program, false),
Err(error) => {
let error =
self.flow_error().unwrap_or_else(|| self.overlong_error().unwrap_or(error));
self.error(error);
self.error(self.overlong_error().unwrap_or(error));
let program = self.ast.program(
Span::default(),
self.source_type,
@ -316,7 +314,18 @@ impl<'a> ParserImpl<'a> {
(program, true)
}
};
let errors = self.lexer.errors.into_iter().chain(self.errors).collect();
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 trivias = self.lexer.trivia_builder.build();
ParserReturn { program, errors, trivias, panicked }
}
@ -448,6 +457,7 @@ mod test {
*/
asdf asdf
",
"/* @flow */ let a; let a;",
];
for source in sources {
let ret = Parser::new(&allocator, source, source_type).parse();