From 45fa6d81acaa2882eebdcbffbf5e586fe7e8dee0 Mon Sep 17 00:00:00 2001 From: Vitaly Slobodin Date: Wed, 3 Sep 2025 01:32:43 +0200 Subject: [PATCH] tailwind: Add `HTML+ERB` to the list of supported languages (#36797) Hi! As part of https://github.com/zed-extensions/ruby/issues/162 we would like to rename HTML/ERB to HTML+ERB since it is more syntactically correct to treat such language as ERB on top of HTML rather than HTML or ERB. To keep the user experience intact, we outlined the prerequisites in the linked issue. This is the first PR that adds the HTML+ERB language name to the list of enabled languages for the Emmet extension. We will do the same for the Tailwind configuration in the Zed codebase. Once the new versions of Emmet and Zed are released, we will merge the pull request in the Ruby extension repository and release the updated version. After that, we will remove the old HTML/ERB and YAML/ERB languages. Let me know if that sounds good. Thanks! Release Notes: - N/A Co-authored-by: Marshall Bowers --- crates/languages/src/lib.rs | 1 + crates/languages/src/tailwind.rs | 1 + 2 files changed, 2 insertions(+) diff --git a/crates/languages/src/lib.rs b/crates/languages/src/lib.rs index d391e67d33fe90ac7e678c1458b8985e221fafc3..168cf8f57ca25444e54c11bb8e594faa94726b5d 100644 --- a/crates/languages/src/lib.rs +++ b/crates/languages/src/lib.rs @@ -296,6 +296,7 @@ pub fn init(languages: Arc, node: NodeRuntime, cx: &mut App) { "Astro", "CSS", "ERB", + "HTML+ERB", "HTML/ERB", "HEEX", "HTML", diff --git a/crates/languages/src/tailwind.rs b/crates/languages/src/tailwind.rs index 47eb25405339b81b3c458b2443d4af77da883cf0..7215dc0d591daae93ca0ee37043bc1372fa32cd2 100644 --- a/crates/languages/src/tailwind.rs +++ b/crates/languages/src/tailwind.rs @@ -184,6 +184,7 @@ impl LspAdapter for TailwindLspAdapter { (LanguageName::new("Elixir"), "phoenix-heex".to_string()), (LanguageName::new("HEEX"), "phoenix-heex".to_string()), (LanguageName::new("ERB"), "erb".to_string()), + (LanguageName::new("HTML+ERB"), "erb".to_string()), (LanguageName::new("HTML/ERB"), "erb".to_string()), (LanguageName::new("PHP"), "php".to_string()), (LanguageName::new("Vue.js"), "vue".to_string()),