From e5e2c45998d3a655c4b2d78c0a1fcb61e09c1982 Mon Sep 17 00:00:00 2001
From: David Sherret <dsherret@users.noreply.github.com>
Date: Thu, 8 Feb 2024 20:40:26 -0500
Subject: 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
---
 cli/cache/module_info.rs   | 2 +-
 cli/cache/parsed_source.rs | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'cli/cache')

diff --git a/cli/cache/module_info.rs b/cli/cache/module_info.rs
index 063809f84..6bb718038 100644
--- a/cli/cache/module_info.rs
+++ b/cli/cache/module_info.rs
@@ -149,7 +149,7 @@ impl<'a> deno_graph::ModuleAnalyzer for ModuleInfoCacheModuleAnalyzer<'a> {
     specifier: &ModuleSpecifier,
     source: Arc<str>,
     media_type: MediaType,
-  ) -> Result<ModuleInfo, deno_ast::Diagnostic> {
+  ) -> Result<ModuleInfo, deno_ast::ParseDiagnostic> {
     // attempt to load from the cache
     let source_hash = ModuleInfoCacheSourceHash::from_source(source.as_bytes());
     match self.module_info_cache.get_module_info(
diff --git a/cli/cache/parsed_source.rs b/cli/cache/parsed_source.rs
index 75170aaf9..8d98587e2 100644
--- a/cli/cache/parsed_source.rs
+++ b/cli/cache/parsed_source.rs
@@ -32,7 +32,7 @@ impl<'a> LazyGraphSourceParser<'a> {
   pub fn get_or_parse_source(
     &self,
     module_specifier: &ModuleSpecifier,
-  ) -> Result<Option<deno_ast::ParsedSource>, deno_ast::Diagnostic> {
+  ) -> Result<Option<deno_ast::ParsedSource>, deno_ast::ParseDiagnostic> {
     let Some(deno_graph::Module::Js(module)) = self.graph.get(module_specifier)
     else {
       return Ok(None);
@@ -53,7 +53,7 @@ impl ParsedSourceCache {
   pub fn get_parsed_source_from_js_module(
     &self,
     module: &deno_graph::JsModule,
-  ) -> Result<ParsedSource, deno_ast::Diagnostic> {
+  ) -> Result<ParsedSource, deno_ast::ParseDiagnostic> {
     self.get_or_parse_module(
       &module.specifier,
       module.source.clone(),
@@ -68,7 +68,7 @@ impl ParsedSourceCache {
     specifier: &deno_graph::ModuleSpecifier,
     source: Arc<str>,
     media_type: MediaType,
-  ) -> deno_core::anyhow::Result<ParsedSource, deno_ast::Diagnostic> {
+  ) -> deno_core::anyhow::Result<ParsedSource, deno_ast::ParseDiagnostic> {
     let parser = self.as_capturing_parser();
     // this will conditionally parse because it's using a CapturingModuleParser
     parser.parse_module(ParseOptions {
-- 
cgit v1.2.3