From 2fcf1f14cf29bb68995f652f93a4f6e3cb55c8d7 Mon Sep 17 00:00:00 2001
From: David Sherret <dsherret@users.noreply.github.com>
Date: Tue, 21 Mar 2023 11:46:40 -0400
Subject: feat: TypeScript 5.0.2 (except decorators) (#18294)

This upgrades TypeScript to 5.0.2, but does not have ES decorator
support because swc does not support that yet.
---
 cli/lsp/completions.rs     | 2 --
 cli/lsp/diagnostics.rs     | 2 +-
 cli/lsp/documents.rs       | 9 ++++-----
 cli/lsp/language_server.rs | 2 +-
 4 files changed, 6 insertions(+), 9 deletions(-)

(limited to 'cli/lsp')

diff --git a/cli/lsp/completions.rs b/cli/lsp/completions.rs
index a767c4d82..ccb945a0b 100644
--- a/cli/lsp/completions.rs
+++ b/cli/lsp/completions.rs
@@ -680,7 +680,6 @@ mod tests {
       &text_info,
       &Range {
         specifier: ModuleSpecifier::parse("https://deno.land").unwrap(),
-        text: "".to_string(),
         start: deno_graph::Position {
           line: 0,
           character: 0,
@@ -705,7 +704,6 @@ mod tests {
       &text_info,
       &Range {
         specifier: ModuleSpecifier::parse("https://deno.land").unwrap(),
-        text: "".to_string(),
         start: deno_graph::Position {
           line: 0,
           character: 0,
diff --git a/cli/lsp/diagnostics.rs b/cli/lsp/diagnostics.rs
index 3ac15505f..a9274801a 100644
--- a/cli/lsp/diagnostics.rs
+++ b/cli/lsp/diagnostics.rs
@@ -1163,7 +1163,7 @@ let c: number = "a";
       )
       .await
       .unwrap();
-      assert_eq!(get_diagnostics_for_single(diagnostics).len(), 4);
+      assert_eq!(get_diagnostics_for_single(diagnostics).len(), 5);
       let diagnostics = generate_deno_diagnostics(
         &snapshot,
         &enabled_config,
diff --git a/cli/lsp/documents.rs b/cli/lsp/documents.rs
index 9299c662c..20ca755d9 100644
--- a/cli/lsp/documents.rs
+++ b/cli/lsp/documents.rs
@@ -528,7 +528,7 @@ impl Document {
     if let Some(Ok(module)) = &self.0.maybe_module {
       return module.media_type;
     }
-    let specifier_media_type = MediaType::from(&self.0.specifier);
+    let specifier_media_type = MediaType::from_specifier(&self.0.specifier);
     if specifier_media_type != MediaType::Unknown {
       return specifier_media_type;
     }
@@ -1102,7 +1102,7 @@ impl Documents {
       }
       if specifier.starts_with("asset:") {
         if let Ok(specifier) = ModuleSpecifier::parse(&specifier) {
-          let media_type = MediaType::from(&specifier);
+          let media_type = MediaType::from_specifier(&specifier);
           results.push(Some((specifier, media_type)));
         } else {
           results.push(None);
@@ -1487,9 +1487,8 @@ fn analyze_module(
       parsed_source,
       Some(resolver),
     )),
-    Err(err) => Err(deno_graph::ModuleGraphError::ParseErr(
-      specifier.clone(),
-      err.clone(),
+    Err(err) => Err(deno_graph::ModuleGraphError::ModuleError(
+      deno_graph::ModuleError::ParseErr(specifier.clone(), err.clone()),
     )),
   }
 }
diff --git a/cli/lsp/language_server.rs b/cli/lsp/language_server.rs
index 8a779d283..87c573f67 100644
--- a/cli/lsp/language_server.rs
+++ b/cli/lsp/language_server.rs
@@ -638,7 +638,7 @@ impl Inner {
   fn is_diagnosable(&self, specifier: &ModuleSpecifier) -> bool {
     if specifier.scheme() == "asset" {
       matches!(
-        MediaType::from(specifier),
+        MediaType::from_specifier(specifier),
         MediaType::JavaScript
           | MediaType::Jsx
           | MediaType::Mjs
-- 
cgit v1.2.3