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

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

Browse source 
e1d8b92080 caused CI to fail. Revert it.
This commit is contained in:
overlookmotel 2024-08-28 12:48:37 +00:00
parent e1d8b92080
commit d4c06ef093
1 changed files with 4 additions and 14 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,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,
@ -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 }
}
@ -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();