diff options
author | David Sherret <dsherret@users.noreply.github.com> | 2024-02-08 20:40:26 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-02-09 01:40:26 +0000 |
commit | e5e2c45998d3a655c4b2d78c0a1fcb61e09c1982 (patch) | |
tree | 4a3af21378652245bdd2e58cc615458d5c163c2c /cli/tools/repl/session.rs | |
parent | b07a156b1d2548c07c7e822ab69d2ef9bfaca630 (diff) |
fix: upgrade to deno_ast 0.33 (#22341)
* Uses diagnostics from deno_ast
* Real fix for https://github.com/denoland/deno/pull/22310
* Moves `deno lint --json` code here
* Upgrades swc
Closes #22117
Closes #22109
Closes #21927
Closes #20993
Diffstat (limited to 'cli/tools/repl/session.rs')
-rw-r--r-- | cli/tools/repl/session.rs | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/cli/tools/repl/session.rs b/cli/tools/repl/session.rs index e98f4b430..a52eb095f 100644 --- a/cli/tools/repl/session.rs +++ b/cli/tools/repl/session.rs @@ -16,14 +16,15 @@ use crate::tools::test::worker_has_tests; use crate::tools::test::TestEvent; use crate::tools::test::TestEventSender; +use deno_ast::diagnostics::Diagnostic; use deno_ast::swc::ast as swc_ast; use deno_ast::swc::common::comments::CommentKind; use deno_ast::swc::visit::noop_visit_type; use deno_ast::swc::visit::Visit; use deno_ast::swc::visit::VisitWith; -use deno_ast::DiagnosticsError; use deno_ast::ImportsNotUsedAsValues; use deno_ast::ModuleSpecifier; +use deno_ast::ParseDiagnosticsError; use deno_ast::ParsedSource; use deno_ast::SourcePos; use deno_ast::SourceRangedForSpanned; @@ -324,7 +325,7 @@ impl ReplSession { &mut self, line: &str, ) -> EvaluationOutput { - fn format_diagnostic(diagnostic: &deno_ast::Diagnostic) -> String { + fn format_diagnostic(diagnostic: &deno_ast::ParseDiagnostic) -> String { let display_position = diagnostic.display_position(); format!( "{}: {} at {}:{}", @@ -377,11 +378,11 @@ impl ReplSession { } Err(err) => { // handle a parsing diagnostic - match err.downcast_ref::<deno_ast::Diagnostic>() { + match err.downcast_ref::<deno_ast::ParseDiagnostic>() { Some(diagnostic) => { Ok(EvaluationOutput::Error(format_diagnostic(diagnostic))) } - None => match err.downcast_ref::<DiagnosticsError>() { + None => match err.downcast_ref::<ParseDiagnosticsError>() { Some(diagnostics) => Ok(EvaluationOutput::Error( diagnostics .0 @@ -786,13 +787,13 @@ fn parse_source_as( media_type: deno_ast::MediaType, ) -> Result<deno_ast::ParsedSource, AnyError> { let specifier = if media_type == deno_ast::MediaType::Tsx { - "repl.tsx" + ModuleSpecifier::parse("file:///repl.tsx").unwrap() } else { - "repl.ts" + ModuleSpecifier::parse("file:///repl.ts").unwrap() }; let parsed = deno_ast::parse_module(deno_ast::ParseParams { - specifier: specifier.to_string(), + specifier, text_info: deno_ast::SourceTextInfo::from_string(source), media_type, capture_tokens: true, |