diff --git a/crates/languages/src/tailwind.rs b/crates/languages/src/tailwind.rs index 6375b70c427399579d6c557879b6f357eb87bd3f..7e23c4ba5255c0413904797d1f8094e67834fa6a 100644 --- a/crates/languages/src/tailwind.rs +++ b/crates/languages/src/tailwind.rs @@ -140,13 +140,6 @@ impl LspAdapter for TailwindLspAdapter { ) -> Result> { Ok(Some(json!({ "provideFormatter": true, - "userLanguages": { - "html": "html", - "css": "css", - "javascript": "javascript", - "typescript": "typescript", - "typescriptreact": "typescriptreact", - }, }))) } @@ -167,8 +160,18 @@ impl LspAdapter for TailwindLspAdapter { tailwind_user_settings["emmetCompletions"] = Value::Bool(true); } + if tailwind_user_settings.get("includeLanguages").is_none() { + tailwind_user_settings["includeLanguages"] = json!({ + "html": "html", + "css": "css", + "javascript": "javascript", + "typescript": "typescript", + "typescriptreact": "typescriptreact", + }); + } + Ok(json!({ - "tailwindCSS": tailwind_user_settings, + "tailwindCSS": tailwind_user_settings })) }