Extract HTML support into an extension (#10130)

This PR extracts HTML support into an extension and removes the built-in
HTML support from Zed.

Release Notes:

- Removed built-in support for HTML, in favor of making it available as
an extension. The HTML extension will be suggested for download when you
open a `.html`, `.htm`, or `.shtml` file.

crates/languages/Cargo.toml

@@ -50,7 +50,6 @@ tree-sitter-gomod.workspace = true
 tree-sitter-gowork.workspace = true
 tree-sitter-hcl.workspace = true
 tree-sitter-heex.workspace = true
-tree-sitter-html.workspace = true
 tree-sitter-jsdoc.workspace = true
 tree-sitter-json.workspace = true
 tree-sitter-lua.workspace = true

crates/languages/src/html.rs

@@ -1,134 +0,0 @@
-use anyhow::{anyhow, Result};
-use async_trait::async_trait;
-use futures::StreamExt;
-use language::{LanguageServerName, LspAdapter, LspAdapterDelegate};
-use lsp::LanguageServerBinary;
-use node_runtime::NodeRuntime;
-use serde_json::json;
-use smol::fs;
-use std::{
-    any::Any,
-    ffi::OsString,
-    path::{Path, PathBuf},
-    sync::Arc,
-};
-use util::{maybe, ResultExt};
-
-const SERVER_PATH: &str =
-    "node_modules/vscode-langservers-extracted/bin/vscode-html-language-server";
-
-fn server_binary_arguments(server_path: &Path) -> Vec<OsString> {
-    vec![server_path.into(), "--stdio".into()]
-}
-
-pub struct HtmlLspAdapter {
-    node: Arc<dyn NodeRuntime>,
-}
-
-impl HtmlLspAdapter {
-    pub fn new(node: Arc<dyn NodeRuntime>) -> Self {
-        HtmlLspAdapter { node }
-    }
-}
-
-#[async_trait(?Send)]
-impl LspAdapter for HtmlLspAdapter {
-    fn name(&self) -> LanguageServerName {
-        LanguageServerName("vscode-html-language-server".into())
-    }
-
-    async fn fetch_latest_server_version(
-        &self,
-        _: &dyn LspAdapterDelegate,
-    ) -> Result<Box<dyn 'static + Any + Send>> {
-        Ok(Box::new(
-            self.node
-                .npm_package_latest_version("vscode-langservers-extracted")
-                .await?,
-        ) as Box<_>)
-    }
-
-    async fn fetch_server_binary(
-        &self,
-        latest_version: Box<dyn 'static + Send + Any>,
-        container_dir: PathBuf,
-        _: &dyn LspAdapterDelegate,
-    ) -> Result<LanguageServerBinary> {
-        let latest_version = latest_version.downcast::<String>().unwrap();
-        let server_path = container_dir.join(SERVER_PATH);
-        let package_name = "vscode-langservers-extracted";
-
-        let should_install_language_server = self
-            .node
-            .should_install_npm_package(package_name, &server_path, &container_dir, &latest_version)
-            .await;
-
-        if should_install_language_server {
-            self.node
-                .npm_install_packages(&container_dir, &[(package_name, latest_version.as_str())])
-                .await?;
-        }
-
-        Ok(LanguageServerBinary {
-            path: self.node.binary_path().await?,
-            env: None,
-            arguments: server_binary_arguments(&server_path),
-        })
-    }
-
-    async fn cached_server_binary(
-        &self,
-        container_dir: PathBuf,
-        _: &dyn LspAdapterDelegate,
-    ) -> Option<LanguageServerBinary> {
-        get_cached_server_binary(container_dir, &*self.node).await
-    }
-
-    async fn installation_test_binary(
-        &self,
-        container_dir: PathBuf,
-    ) -> Option<LanguageServerBinary> {
-        get_cached_server_binary(container_dir, &*self.node).await
-    }
-
-    async fn initialization_options(
-        self: Arc<Self>,
-        _: &Arc<dyn LspAdapterDelegate>,
-    ) -> Result<Option<serde_json::Value>> {
-        Ok(Some(json!({
-            "provideFormatter": true
-        })))
-    }
-}
-
-async fn get_cached_server_binary(
-    container_dir: PathBuf,
-    node: &dyn NodeRuntime,
-) -> Option<LanguageServerBinary> {
-    maybe!(async {
-        let mut last_version_dir = None;
-        let mut entries = fs::read_dir(&container_dir).await?;
-        while let Some(entry) = entries.next().await {
-            let entry = entry?;
-            if entry.file_type().await?.is_dir() {
-                last_version_dir = Some(entry.path());
-            }
-        }
-        let last_version_dir = last_version_dir.ok_or_else(|| anyhow!("no cached binary"))?;
-        let server_path = last_version_dir.join(SERVER_PATH);
-        if server_path.exists() {
-            Ok(LanguageServerBinary {
-                path: node.binary_path().await?,
-                env: None,
-                arguments: server_binary_arguments(&server_path),
-            })
-        } else {
-            Err(anyhow!(
-                "missing executable in directory {:?}",
-                last_version_dir
-            ))
-        }
-    })
-    .await
-    .log_err()
-}

crates/languages/src/html/brackets.scm

@@ -1,2 +0,0 @@
-("<" @open ">" @close)
-("\"" @open "\"" @close)

crates/languages/src/html/config.toml

@@ -1,15 +0,0 @@
-name = "HTML"
-grammar = "html"
-path_suffixes = ["html", "htm", "shtml"]
-autoclose_before = ">})"
-block_comment = ["<!-- ", " -->"]
-brackets = [
-    { start = "{", end = "}", close = true, newline = true },
-    { start = "[", end = "]", close = true, newline = true },
-    { start = "(", end = ")", close = true, newline = true },
-    { start = "\"", end = "\"", close = true, newline = false, not_in = ["comment", "string"] },
-    { start = "<", end = ">", close = true, newline = true, not_in = ["comment", "string"] },
-    { start = "!--", end = " --", close = true, newline = false, not_in = ["comment", "string"] },
-]
-word_characters = ["-"]
-prettier_parser_name = "html"

crates/languages/src/html/highlights.scm

@@ -1,16 +0,0 @@
-(tag_name) @keyword
-(erroneous_end_tag_name) @keyword
-(doctype) @constant
-(attribute_name) @property
-(attribute_value) @string
-(comment) @comment
-
-"=" @operator
-
-[
-  "<"
-  ">"
-  "<!"
-  "</"
-  "/>"
-] @punctuation.bracket

crates/languages/src/html/indents.scm

@@ -1,6 +0,0 @@
-(start_tag ">" @end) @indent
-(self_closing_tag "/>" @end) @indent
-
-(element
-  (start_tag) @start
-  (end_tag)? @end) @indent

crates/languages/src/html/injections.scm

@@ -1,7 +0,0 @@
-(script_element
-  (raw_text) @content
-  (#set! "language" "javascript"))
-
-(style_element
-  (raw_text) @content
-  (#set! "language" "css"))

crates/languages/src/html/overrides.scm

@@ -1,2 +0,0 @@
-(comment) @comment
-(quoted_attribute_value) @string

crates/languages/src/lib.rs

@@ -18,7 +18,6 @@ mod deno;
 mod elixir;
 mod elm;
 mod go;
-mod html;
 mod json;
 mod lua;
 mod nu;
@@ -71,7 +70,6 @@ pub fn init(
         ("gowork", tree_sitter_gowork::language()),
         ("hcl", tree_sitter_hcl::language()),
         ("heex", tree_sitter_heex::language()),
-        ("html", tree_sitter_html::language()),
         ("jsdoc", tree_sitter_jsdoc::language()),
         ("json", tree_sitter_json::language()),
         ("lua", tree_sitter_lua::language()),
@@ -275,13 +273,6 @@ pub fn init(
         }
     }
 
-    language!(
-        "html",
-        vec![
-            Arc::new(html::HtmlLspAdapter::new(node_runtime.clone())),
-            Arc::new(tailwind::TailwindLspAdapter::new(node_runtime.clone())),
-        ]
-    );
     language!("ruby", vec![Arc::new(ruby::RubyLanguageServer)]);
     language!(
         "erb",
@@ -327,6 +318,10 @@ pub fn init(
         "Astro".into(),
         Arc::new(tailwind::TailwindLspAdapter::new(node_runtime.clone())),
     );
+    languages.register_secondary_lsp_adapter(
+        "HTML".into(),
+        Arc::new(tailwind::TailwindLspAdapter::new(node_runtime.clone())),
+    );
     languages.register_secondary_lsp_adapter(
         "PHP".into(),
         Arc::new(tailwind::TailwindLspAdapter::new(node_runtime.clone())),