Fix maxTsServerMemory (#17758)

Release Notes: - N/A --------- Co-authored-by: Thorsten Ball <mrnugget@gmail.com>
zed-industries · Sep 12, 2024 · b341079 · b341079
1 parent 02d5f32
commit b341079
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 5 deletions.
diff --git a/crates/languages/src/vtsls.rs b/crates/languages/src/vtsls.rs
@@ -222,9 +222,6 @@ impl LspAdapter for VtslsLspAdapter {
             "suggest": {
                 "completeFunctionCalls": true
             },
-            "tsserver": {
-                "maxTsServerMemory": 8092
-            },
             "inlayHints": {
                 "parameterNames": {
                     "enabled": "all",
@@ -273,7 +270,21 @@ impl LspAdapter for VtslsLspAdapter {
             language_server_settings(delegate.as_ref(), SERVER_NAME, cx)
                 .and_then(|s| s.settings.clone())
         })?;
-        Ok(override_options.unwrap_or_default())
+
+        if let Some(options) = override_options {
+            return Ok(options);
+        }
+
+        let config = serde_json::json!({
+            "tsserver": {
+                "maxTsServerMemory": 8092
+            },
+        });
+
+        Ok(serde_json::json!({
+            "typescript": config,
+            "javascript": config
+        }))
     }
 
     fn language_ids(&self) -> HashMap<String, String> {

diff --git a/docs/src/languages/typescript.md b/docs/src/languages/typescript.md
@@ -52,7 +52,7 @@ Prettier will also be used for TypeScript files by default. To disable this:
 {
   "lsp": {
     "vtsls": {
-      "initialization_options": {
+      "settings": {
         // For TypeScript:
         "typescript": { "tsserver": { "maxTsServerMemory": 16184 } },
         // For JavaScript: