From 2f65c3c6e6ad0e5009c20b4ad0f374a06a061c75 Mon Sep 17 00:00:00 2001
From: Marshall Bowers <elliott.codes@gmail.com>
Date: Mon, 3 Jun 2024 14:30:33 -0400
Subject: [PATCH] Disable `vtsls` by default (#12611)

This PR adds default settings to disable `vtsls` by default so that
there aren't multiple TypeScript language servers running.

I also renamed the language server from `vtsls-language-server` to just
`vtsls`, since the `-language-server` suffix was redundant.

Release Notes:

- N/A
---
 assets/settings/default.json  | 3 +++
 crates/languages/src/vtsls.rs | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/assets/settings/default.json b/assets/settings/default.json
index a551bc51c2..e7dd76c5cb 100644
--- a/assets/settings/default.json
+++ b/assets/settings/default.json
@@ -700,6 +700,7 @@
       }
     },
     "JavaScript": {
+      "language_servers": ["typescript-language-server", "!vtsls", ".."],
       "prettier": {
         "allowed": true
       }
@@ -748,6 +749,7 @@
       }
     },
     "TSX": {
+      "language_servers": ["typescript-language-server", "!vtsls", ".."],
       "prettier": {
         "allowed": true
       }
@@ -758,6 +760,7 @@
       }
     },
     "TypeScript": {
+      "language_servers": ["typescript-language-server", "!vtsls", ".."],
       "prettier": {
         "allowed": true
       }
diff --git a/crates/languages/src/vtsls.rs b/crates/languages/src/vtsls.rs
index 37002c2001..4c23362a99 100644
--- a/crates/languages/src/vtsls.rs
+++ b/crates/languages/src/vtsls.rs
@@ -38,7 +38,7 @@ struct TypeScriptVersions {
 #[async_trait(?Send)]
 impl LspAdapter for VtslsLspAdapter {
     fn name(&self) -> LanguageServerName {
-        LanguageServerName("vtsls-language-server".into())
+        LanguageServerName("vtsls".into())
     }
 
     async fn fetch_latest_server_version(