refactor(swc): Change AST parsing error to return struct with message and location #10911
Conversation
| @@ -89,57 +82,18 @@ impl std::fmt::Display for Location { | |||
| } | |||
| } | |||
|
|
|||
| /// A buffer for collecting diagnostic messages from the AST parser. | |||
| #[derive(Debug)] | |||
| pub struct DiagnosticBuffer(Vec<String>); | |||
There was a problem hiding this comment.
The code only possibly returns one diagnostic. Removed and replaced with a single Diagnostic error struct. This will also allow me to format a diagnostic specifically for the REPL (no file name).
| @@ -192,9 +146,6 @@ pub enum ImportsNotUsedAsValues { | |||
| /// Options which can be adjusted when transpiling a module. | |||
| #[derive(Debug, Clone)] | |||
| pub struct EmitOptions { | |||
| /// Indicate if JavaScript is being checked/transformed as well, or if it is | |||
| /// only TypeScript. | |||
| pub check_js: bool, | |||
There was a problem hiding this comment.
Not used by the emit code, so removed (see PR description for more details).
| }) | ||
| let module = parser.parse_module().map_err(move |err| Diagnostic { | ||
| location: sm.lookup_char_pos(err.span().lo).into(), | ||
| message: err.into_kind().msg().to_string(), | ||
| })?; |
There was a problem hiding this comment.
I think the code above was copied from dprint-plugin-typescript when I didn't know the full swc API (my bad). This new code is a bit more straightforward and we can use parser.take_errors() in the future to get all the errors if necessary.
There was a problem hiding this comment.
I think the code above was copied from dprint-plugin-typescript
That's very likely
dsherret
changed the title
| }) | ||
| let module = parser.parse_module().map_err(move |err| Diagnostic { | ||
| location: sm.lookup_char_pos(err.span().lo).into(), | ||
| message: err.into_kind().msg().to_string(), | ||
| })?; |
There was a problem hiding this comment.
I think the code above was copied from dprint-plugin-typescript
That's very likely
DiagnosticBuffer. We can add back something similar, if we ever look atparser.take_errors()for diagnostics.EmitOptions#check_jsdid then realized it was never used for emitting (therefore, not an emit option). I removed this and changed the other code to just look at the value from the tsconfig.json.