diff --git a/crates/languages/src/vtsls.rs b/crates/languages/src/vtsls.rs index f3b46d2685..9499b5c54f 100644 --- 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 { diff --git a/docs/src/languages/typescript.md b/docs/src/languages/typescript.md index 12529500d8..bfe63c5b2c 100644 --- 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: