Skip to content

armgit / zed

Public Imported from GitHub
0

Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.

vtsls: Fix invalid tsserver install error in TypeScript 7 projects (#61126)

Smit Barmasec7ee116ead34
diff --git a/crates/languages/src/typescript.rs b/crates/languages/src/typescript.rs
index a23b66021c1..0da1b63590e 100644
--- a/crates/languages/src/typescript.rs
+++ b/crates/languages/src/typescript.rs
@@ -637,6 +637,8 @@ impl TypeScriptLspAdapter {
"node_modules/typescript/lib"
};
+ // typescript-language-server doesn't support TypeScript 7+, which no longer
+ // ships `tsserver.js`.
if self
.fs
.is_file(
diff --git a/crates/languages/src/vtsls.rs b/crates/languages/src/vtsls.rs
index 426f09d6c94..5be98804d69 100644
--- a/crates/languages/src/vtsls.rs
+++ b/crates/languages/src/vtsls.rs
@@ -57,9 +57,15 @@ impl VtslsLspAdapter {
Self::TYPESCRIPT_TSDK_PATH
};
+ // vtsls doesn't support TypeScript 7+, which no longer ships `tsserver.js`.
if self
.fs
- .is_dir(&adapter.worktree_root_path().join(tsdk_path))
+ .is_file(
+ &adapter
+ .worktree_root_path()
+ .join(tsdk_path)
+ .join("tsserver.js"),
+ )
.await
{
Some(tsdk_path)