diff --git a/crates/zed/src/languages.rs b/crates/zed/src/languages.rs index caf3cbf7c948ec239b8e620d30587f79c5e9b291..e5b3dfdcae84ed35fdf15d1dd53a75c19883fb36 100644 --- a/crates/zed/src/languages.rs +++ b/crates/zed/src/languages.rs @@ -76,7 +76,10 @@ pub fn init( elixir::ElixirLspSetting::ElixirLs => language( "elixir", tree_sitter_elixir::language(), - vec![Arc::new(elixir::ElixirLspAdapter)], + vec![ + Arc::new(elixir::ElixirLspAdapter), + Arc::new(tailwind::TailwindLspAdapter::new(node_runtime.clone())), + ], ), elixir::ElixirLspSetting::NextLs => language( "elixir", @@ -101,7 +104,10 @@ pub fn init( language( "heex", tree_sitter_heex::language(), - vec![Arc::new(elixir::ElixirLspAdapter)], + vec![ + Arc::new(elixir::ElixirLspAdapter), + Arc::new(tailwind::TailwindLspAdapter::new(node_runtime.clone())), + ], ); language( "json", @@ -184,9 +190,10 @@ pub fn init( language( "svelte", tree_sitter_svelte::language(), - vec![Arc::new(svelte::SvelteLspAdapter::new( - node_runtime.clone(), - ))], + vec![ + Arc::new(svelte::SvelteLspAdapter::new(node_runtime.clone())), + Arc::new(tailwind::TailwindLspAdapter::new(node_runtime.clone())), + ], ); language( "php", diff --git a/crates/zed/src/languages/elixir/config.toml b/crates/zed/src/languages/elixir/config.toml index 05c126e9da4ccfbe9c3beed134ed1b374cbcecab..8983c0e49b465c07ca3c0dd37a326c2244f52795 100644 --- a/crates/zed/src/languages/elixir/config.toml +++ b/crates/zed/src/languages/elixir/config.toml @@ -9,3 +9,8 @@ brackets = [ { start = "\"", end = "\"", close = true, newline = false, not_in = ["string", "comment"] }, { start = "'", end = "'", close = true, newline = false, not_in = ["string", "comment"] }, ] +scope_opt_in_language_servers = ["tailwindcss-language-server"] + +[overrides.string] +word_characters = ["-"] +opt_into_language_servers = ["tailwindcss-language-server"] diff --git a/crates/zed/src/languages/heex/config.toml b/crates/zed/src/languages/heex/config.toml index c9f952ee3c4f2813dcaf0e94fd3d5858e78d0922..74cb5ac9ff5df179bf190aac8f843fd82820e29a 100644 --- a/crates/zed/src/languages/heex/config.toml +++ b/crates/zed/src/languages/heex/config.toml @@ -5,3 +5,8 @@ brackets = [ { start = "<", end = ">", close = true, newline = true }, ] block_comment = ["<%!-- ", " --%>"] +scope_opt_in_language_servers = ["tailwindcss-language-server"] + +[overrides.string] +word_characters = ["-"] +opt_into_language_servers = ["tailwindcss-language-server"] diff --git a/crates/zed/src/languages/heex/overrides.scm b/crates/zed/src/languages/heex/overrides.scm new file mode 100644 index 0000000000000000000000000000000000000000..35ac9fe15fca6a727463c1408fa01ffbbee2c2f6 --- /dev/null +++ b/crates/zed/src/languages/heex/overrides.scm @@ -0,0 +1,4 @@ +[ + (attribute_value) + (quoted_attribute_value) +] @string diff --git a/crates/zed/src/languages/svelte/config.toml b/crates/zed/src/languages/svelte/config.toml index 41bb21a45d54db9944d50b6a93d8fbda3d34fe41..8a07b012c7c0e25c3f11e54b2d905d27179cd233 100644 --- a/crates/zed/src/languages/svelte/config.toml +++ b/crates/zed/src/languages/svelte/config.toml @@ -12,7 +12,8 @@ brackets = [ { start = "`", end = "`", close = true, newline = false, not_in = ["string"] }, { start = "/*", end = " */", close = true, newline = false, not_in = ["string", "comment"] }, ] +scope_opt_in_language_servers = ["tailwindcss-language-server"] -[overrides.element] -line_comment = { remove = true } -block_comment = ["{/* ", " */}"] +[overrides.string] +word_characters = ["-"] +opt_into_language_servers = ["tailwindcss-language-server"] diff --git a/crates/zed/src/languages/svelte/overrides.scm b/crates/zed/src/languages/svelte/overrides.scm new file mode 100644 index 0000000000000000000000000000000000000000..2a76410297833c9f1884f5e93c7851a38fc0b2f6 --- /dev/null +++ b/crates/zed/src/languages/svelte/overrides.scm @@ -0,0 +1,7 @@ +(comment) @comment + +[ + (raw_text) + (attribute_value) + (quoted_attribute_value) +] @string diff --git a/crates/zed/src/languages/tailwind.rs b/crates/zed/src/languages/tailwind.rs index 8e81f728dc1f39de023a8292018518ad772d3b3a..ef19b858be238ce542a137070d2daee1f0bc973c 100644 --- a/crates/zed/src/languages/tailwind.rs +++ b/crates/zed/src/languages/tailwind.rs @@ -123,6 +123,9 @@ impl LspAdapter for TailwindLspAdapter { ("CSS".to_string(), "css".to_string()), ("JavaScript".to_string(), "javascript".to_string()), ("TSX".to_string(), "typescriptreact".to_string()), + ("Svelte".to_string(), "svelte".to_string()), + ("Elixir".to_string(), "phoenix-heex".to_string()), + ("HEEX".to_string(), "phoenix-heex".to_string()), ] .into_iter(), )