From 1424a7a56a318d3401ca20a703905492a32e4be9 Mon Sep 17 00:00:00 2001 From: Mikayla Maki Date: Thu, 13 Jul 2023 21:43:53 -0700 Subject: [PATCH 1/3] Add svelte language server Add svelte tree sitter Add svelte config file Add svelte highlighting --- Cargo.lock | 10 ++ crates/zed/Cargo.toml | 1 + crates/zed/src/languages.rs | 8 +- crates/zed/src/languages/svelte.rs | 126 ++++++++++++++++++ crates/zed/src/languages/svelte/config.toml | 18 +++ crates/zed/src/languages/svelte/folds.scm | 9 ++ .../zed/src/languages/svelte/highlights.scm | 68 ++++++++++ crates/zed/src/languages/svelte/indents.scm | 20 +++ .../zed/src/languages/svelte/injections.scm | 9 ++ 9 files changed, 268 insertions(+), 1 deletion(-) create mode 100644 crates/zed/src/languages/svelte.rs create mode 100644 crates/zed/src/languages/svelte/config.toml create mode 100755 crates/zed/src/languages/svelte/folds.scm create mode 100755 crates/zed/src/languages/svelte/highlights.scm create mode 100755 crates/zed/src/languages/svelte/indents.scm create mode 100755 crates/zed/src/languages/svelte/injections.scm diff --git a/Cargo.lock b/Cargo.lock index 0ac6a2ee89..b2f05a116d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -8125,6 +8125,15 @@ dependencies = [ "tree-sitter", ] +[[package]] +name = "tree-sitter-svelte" +version = "0.10.2" +source = "git+https://github.com/Himujjal/tree-sitter-svelte?rev=697bb515471871e85ff799ea57a76298a71a9cca#697bb515471871e85ff799ea57a76298a71a9cca" +dependencies = [ + "cc", + "tree-sitter", +] + [[package]] name = "tree-sitter-toml" version = "0.5.1" @@ -9555,6 +9564,7 @@ dependencies = [ "tree-sitter-ruby", "tree-sitter-rust", "tree-sitter-scheme", + "tree-sitter-svelte", "tree-sitter-toml", "tree-sitter-typescript 0.20.2 (git+https://github.com/tree-sitter/tree-sitter-typescript?rev=5d20856f34315b068c41edaee2ac8a100081d259)", "tree-sitter-yaml", diff --git a/crates/zed/Cargo.toml b/crates/zed/Cargo.toml index 597e40161f..bf5d3bc8be 100644 --- a/crates/zed/Cargo.toml +++ b/crates/zed/Cargo.toml @@ -122,6 +122,7 @@ tree-sitter-html = "0.19.0" tree-sitter-scheme = { git = "https://github.com/6cdh/tree-sitter-scheme", rev = "af0fd1fa452cb2562dc7b5c8a8c55551c39273b9"} tree-sitter-racket = { git = "https://github.com/zed-industries/tree-sitter-racket", rev = "eb010cf2c674c6fd9a6316a84e28ef90190fe51a"} tree-sitter-yaml = { git = "https://github.com/zed-industries/tree-sitter-yaml", rev = "f545a41f57502e1b5ddf2a6668896c1b0620f930"} +tree-sitter-svelte = { git = "https://github.com/Himujjal/tree-sitter-svelte", rev = "697bb515471871e85ff799ea57a76298a71a9cca"} tree-sitter-lua = "0.0.14" url = "2.2" urlencoding = "2.1.2" diff --git a/crates/zed/src/languages.rs b/crates/zed/src/languages.rs index 820f564151..a7590001d7 100644 --- a/crates/zed/src/languages.rs +++ b/crates/zed/src/languages.rs @@ -17,6 +17,7 @@ mod python; mod ruby; mod rust; mod typescript; +mod svelte; mod yaml; // 1. Add tree-sitter-{language} parser to zed crate @@ -135,7 +136,12 @@ pub fn init(languages: Arc, node_runtime: Arc) { language( "yaml", tree_sitter_yaml::language(), - vec![Arc::new(yaml::YamlLspAdapter::new(node_runtime))], + vec![Arc::new(yaml::YamlLspAdapter::new(node_runtime.clone()))], + ); + language( + "svelte", + tree_sitter_svelte::language(), + vec![Arc::new(svelte::SvelteLspAdapter::new(node_runtime.clone()))], ); } diff --git a/crates/zed/src/languages/svelte.rs b/crates/zed/src/languages/svelte.rs new file mode 100644 index 0000000000..35f6945285 --- /dev/null +++ b/crates/zed/src/languages/svelte.rs @@ -0,0 +1,126 @@ +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::ResultExt; + +const SERVER_PATH: &'static str = + "node_modules/svelte-language-server/bin/server.js"; + +fn server_binary_arguments(server_path: &Path) -> Vec { + vec![server_path.into(), "--stdio".into()] +} + +pub struct SvelteLspAdapter { + node: Arc, +} + +impl SvelteLspAdapter { + pub fn new(node: Arc) -> Self { + SvelteLspAdapter { node } + } +} + +#[async_trait] +impl LspAdapter for SvelteLspAdapter { + async fn name(&self) -> LanguageServerName { + LanguageServerName("svelte-language-server".into()) + } + + async fn fetch_latest_server_version( + &self, + _: &dyn LspAdapterDelegate, + ) -> Result> { + Ok(Box::new( + self.node + .npm_package_latest_version("svelte-language-server") + .await?, + ) as Box<_>) + } + + async fn fetch_server_binary( + &self, + version: Box, + container_dir: PathBuf, + _: &dyn LspAdapterDelegate, + ) -> Result { + let version = version.downcast::().unwrap(); + let server_path = container_dir.join(SERVER_PATH); + + if fs::metadata(&server_path).await.is_err() { + self.node + .npm_install_packages( + &container_dir, + [("svelte-language-server", version.as_str())], + ) + .await?; + } + + Ok(LanguageServerBinary { + path: self.node.binary_path().await?, + arguments: server_binary_arguments(&server_path), + }) + } + + async fn cached_server_binary( + &self, + container_dir: PathBuf, + _: &dyn LspAdapterDelegate, + ) -> Option { + get_cached_server_binary(container_dir, &self.node).await + } + + async fn installation_test_binary( + &self, + container_dir: PathBuf, + ) -> Option { + get_cached_server_binary(container_dir, &self.node).await + } + + async fn initialization_options(&self) -> Option { + Some(json!({ + "provideFormatter": true + })) + } +} + +async fn get_cached_server_binary( + container_dir: PathBuf, + node: &NodeRuntime, +) -> Option { + (|| async move { + 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?, + arguments: server_binary_arguments(&server_path), + }) + } else { + Err(anyhow!( + "missing executable in directory {:?}", + last_version_dir + )) + } + })() + .await + .log_err() +} diff --git a/crates/zed/src/languages/svelte/config.toml b/crates/zed/src/languages/svelte/config.toml new file mode 100644 index 0000000000..41bb21a45d --- /dev/null +++ b/crates/zed/src/languages/svelte/config.toml @@ -0,0 +1,18 @@ +name = "Svelte" +path_suffixes = ["svelte"] +line_comment = "// " +autoclose_before = ";:.,=}])>" +brackets = [ + { start = "{", end = "}", close = true, newline = true }, + { start = "[", end = "]", close = true, newline = true }, + { start = "(", end = ")", close = true, newline = true }, + { start = "<", end = ">", close = false, newline = true, not_in = ["string", "comment"] }, + { start = "\"", end = "\"", close = true, newline = false, not_in = ["string"] }, + { start = "'", end = "'", close = true, newline = false, not_in = ["string", "comment"] }, + { start = "`", end = "`", close = true, newline = false, not_in = ["string"] }, + { start = "/*", end = " */", close = true, newline = false, not_in = ["string", "comment"] }, +] + +[overrides.element] +line_comment = { remove = true } +block_comment = ["{/* ", " */}"] diff --git a/crates/zed/src/languages/svelte/folds.scm b/crates/zed/src/languages/svelte/folds.scm new file mode 100755 index 0000000000..795c32fc4a --- /dev/null +++ b/crates/zed/src/languages/svelte/folds.scm @@ -0,0 +1,9 @@ +[ + (style_element) + (script_element) + (element) + (if_statement) + (else_statement) + (each_statement) + (await_statement) +] @fold diff --git a/crates/zed/src/languages/svelte/highlights.scm b/crates/zed/src/languages/svelte/highlights.scm new file mode 100755 index 0000000000..0b868b7591 --- /dev/null +++ b/crates/zed/src/languages/svelte/highlights.scm @@ -0,0 +1,68 @@ +; Special identifiers +;-------------------- +[ + "<" + ">" + "" + "#" + ":" + "/" + "@" +] @tag.delimiter + +[ + "{" + "}" +] @punctuation.bracket + +[ + (special_block_keyword) + (then) + (as) +] @keyword + +[ + (text) + (raw_text_expr) +] @none + +[ + (attribute_value) + (quoted_attribute_value) +] @string + +(tag_name) @tag +(attribute_name) @property +(erroneous_end_tag_name) @error +(comment) @comment + +((attribute + (attribute_name) @_attr + (quoted_attribute_value (attribute_value) @text.uri)) + (#match? @_attr "^(href|src)$")) + +; TODO: + +((element (start_tag (tag_name) @_tag) (text) @text.uri) + (#eq? @_tag "a")) + +((element (start_tag (tag_name) @_tag) (text) @text.literal) + (#match? @_tag "^(code|kbd)$")) + +((element (start_tag (tag_name) @_tag) (text) @text.underline) + (#eq? @_tag "u")) + +((element (start_tag (tag_name) @_tag) (text) @text.strike) + (#match? @_tag "^(s|del)$")) + +((element (start_tag (tag_name) @_tag) (text) @text.emphasis) + (#match? @_tag "^(em|i)$")) + +((element (start_tag (tag_name) @_tag) (text) @text.strong) + (#match? @_tag "^(strong|b)$")) + +((element (start_tag (tag_name) @_tag) (text) @text.title) + (#match? @_tag "^(h[0-9]|title)$")) + +"=" @operator diff --git a/crates/zed/src/languages/svelte/indents.scm b/crates/zed/src/languages/svelte/indents.scm new file mode 100755 index 0000000000..2f6f5c32e7 --- /dev/null +++ b/crates/zed/src/languages/svelte/indents.scm @@ -0,0 +1,20 @@ +[ + (element) + (if_statement) + (each_statement) + (await_statement) + (script_element) + (style_element) +] @indent + +[ + (end_tag) + (else_statement) + (if_end_expr) + (each_end_expr) + (await_end_expr) + ">" + "/>" +] @branch + +(comment) @ignore diff --git a/crates/zed/src/languages/svelte/injections.scm b/crates/zed/src/languages/svelte/injections.scm new file mode 100755 index 0000000000..84043c0061 --- /dev/null +++ b/crates/zed/src/languages/svelte/injections.scm @@ -0,0 +1,9 @@ +; injections.scm +; -------------- +(script_element + (raw_text) @content + (#set! "language" "javascript")) + +(style_element + (raw_text) @content + (#set! "language" "css")) From ff8a89a0758119ba62eb64ef5120361b90c24edc Mon Sep 17 00:00:00 2001 From: Mikayla Maki Date: Thu, 13 Jul 2023 22:30:41 -0700 Subject: [PATCH 2/3] Refine svelte queries to work with zed-style highlights Bump scheme dependency: --- Cargo.lock | 4 +- crates/zed/Cargo.toml | 2 +- .../zed/src/languages/svelte/highlights.scm | 86 +++++++------------ crates/zed/src/languages/svelte/indents.scm | 12 --- .../zed/src/languages/svelte/injections.scm | 19 ++++ 5 files changed, 52 insertions(+), 71 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b2f05a116d..1a4562954f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -8118,8 +8118,8 @@ dependencies = [ [[package]] name = "tree-sitter-scheme" -version = "0.2.0" -source = "git+https://github.com/6cdh/tree-sitter-scheme?rev=af0fd1fa452cb2562dc7b5c8a8c55551c39273b9#af0fd1fa452cb2562dc7b5c8a8c55551c39273b9" +version = "0.5.0" +source = "git+https://github.com/6cdh/tree-sitter-scheme?rev=ca8af220aaf2a80aaf609bfb0df193817e4f064b#ca8af220aaf2a80aaf609bfb0df193817e4f064b" dependencies = [ "cc", "tree-sitter", diff --git a/crates/zed/Cargo.toml b/crates/zed/Cargo.toml index bf5d3bc8be..28970b1a0f 100644 --- a/crates/zed/Cargo.toml +++ b/crates/zed/Cargo.toml @@ -119,7 +119,7 @@ tree-sitter-toml = { git = "https://github.com/tree-sitter/tree-sitter-toml", re tree-sitter-typescript = { git = "https://github.com/tree-sitter/tree-sitter-typescript", rev = "5d20856f34315b068c41edaee2ac8a100081d259" } tree-sitter-ruby = "0.20.0" tree-sitter-html = "0.19.0" -tree-sitter-scheme = { git = "https://github.com/6cdh/tree-sitter-scheme", rev = "af0fd1fa452cb2562dc7b5c8a8c55551c39273b9"} +tree-sitter-scheme = { git = "https://github.com/6cdh/tree-sitter-scheme", rev = "ca8af220aaf2a80aaf609bfb0df193817e4f064b"} tree-sitter-racket = { git = "https://github.com/zed-industries/tree-sitter-racket", rev = "eb010cf2c674c6fd9a6316a84e28ef90190fe51a"} tree-sitter-yaml = { git = "https://github.com/zed-industries/tree-sitter-yaml", rev = "f545a41f57502e1b5ddf2a6668896c1b0620f930"} tree-sitter-svelte = { git = "https://github.com/Himujjal/tree-sitter-svelte", rev = "697bb515471871e85ff799ea57a76298a71a9cca"} diff --git a/crates/zed/src/languages/svelte/highlights.scm b/crates/zed/src/languages/svelte/highlights.scm index 0b868b7591..de873684e4 100755 --- a/crates/zed/src/languages/svelte/highlights.scm +++ b/crates/zed/src/languages/svelte/highlights.scm @@ -1,5 +1,35 @@ ; Special identifiers ;-------------------- + +; TODO: +(tag_name) @tag +(attribute_name) @property +(erroneous_end_tag_name) @keyword +(comment) @comment + +[ + (attribute_value) + (quoted_attribute_value) +] @string + +[ + (text) + (raw_text_expr) +] @none + +[ + (special_block_keyword) + (then) + (as) +] @keyword + +[ + "{" + "}" +] @punctuation.bracket + +"=" @operator + [ "<" ">" @@ -10,59 +40,3 @@ "/" "@" ] @tag.delimiter - -[ - "{" - "}" -] @punctuation.bracket - -[ - (special_block_keyword) - (then) - (as) -] @keyword - -[ - (text) - (raw_text_expr) -] @none - -[ - (attribute_value) - (quoted_attribute_value) -] @string - -(tag_name) @tag -(attribute_name) @property -(erroneous_end_tag_name) @error -(comment) @comment - -((attribute - (attribute_name) @_attr - (quoted_attribute_value (attribute_value) @text.uri)) - (#match? @_attr "^(href|src)$")) - -; TODO: - -((element (start_tag (tag_name) @_tag) (text) @text.uri) - (#eq? @_tag "a")) - -((element (start_tag (tag_name) @_tag) (text) @text.literal) - (#match? @_tag "^(code|kbd)$")) - -((element (start_tag (tag_name) @_tag) (text) @text.underline) - (#eq? @_tag "u")) - -((element (start_tag (tag_name) @_tag) (text) @text.strike) - (#match? @_tag "^(s|del)$")) - -((element (start_tag (tag_name) @_tag) (text) @text.emphasis) - (#match? @_tag "^(em|i)$")) - -((element (start_tag (tag_name) @_tag) (text) @text.strong) - (#match? @_tag "^(strong|b)$")) - -((element (start_tag (tag_name) @_tag) (text) @text.title) - (#match? @_tag "^(h[0-9]|title)$")) - -"=" @operator diff --git a/crates/zed/src/languages/svelte/indents.scm b/crates/zed/src/languages/svelte/indents.scm index 2f6f5c32e7..886d8ca867 100755 --- a/crates/zed/src/languages/svelte/indents.scm +++ b/crates/zed/src/languages/svelte/indents.scm @@ -6,15 +6,3 @@ (script_element) (style_element) ] @indent - -[ - (end_tag) - (else_statement) - (if_end_expr) - (each_end_expr) - (await_end_expr) - ">" - "/>" -] @branch - -(comment) @ignore diff --git a/crates/zed/src/languages/svelte/injections.scm b/crates/zed/src/languages/svelte/injections.scm index 84043c0061..8c1ac9fcd0 100755 --- a/crates/zed/src/languages/svelte/injections.scm +++ b/crates/zed/src/languages/svelte/injections.scm @@ -4,6 +4,25 @@ (raw_text) @content (#set! "language" "javascript")) + ((script_element + (start_tag + (attribute + (quoted_attribute_value (attribute_value) @_language))) + (raw_text) @content) + (#eq? @_language "ts") + (#set! "language" "typescript")) + +((script_element + (start_tag + (attribute + (quoted_attribute_value (attribute_value) @_language))) + (raw_text) @content) + (#eq? @_language "typescript") + (#set! "language" "typescript")) + (style_element (raw_text) @content (#set! "language" "css")) + +((raw_text_expr) @content + (#set! "language" "javascript")) From f1b034d4f8963f40720007ab6538cf6c33d8691c Mon Sep 17 00:00:00 2001 From: Mikayla Maki Date: Thu, 13 Jul 2023 22:32:29 -0700 Subject: [PATCH 3/3] fmt --- crates/zed/src/languages.rs | 6 ++++-- crates/zed/src/languages/svelte.rs | 3 +-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/crates/zed/src/languages.rs b/crates/zed/src/languages.rs index a7590001d7..8e0e21faba 100644 --- a/crates/zed/src/languages.rs +++ b/crates/zed/src/languages.rs @@ -16,8 +16,8 @@ mod lua; mod python; mod ruby; mod rust; -mod typescript; mod svelte; +mod typescript; mod yaml; // 1. Add tree-sitter-{language} parser to zed crate @@ -141,7 +141,9 @@ pub fn init(languages: Arc, node_runtime: Arc) { language( "svelte", tree_sitter_svelte::language(), - vec![Arc::new(svelte::SvelteLspAdapter::new(node_runtime.clone()))], + vec![Arc::new(svelte::SvelteLspAdapter::new( + node_runtime.clone(), + ))], ); } diff --git a/crates/zed/src/languages/svelte.rs b/crates/zed/src/languages/svelte.rs index 35f6945285..8416859f5a 100644 --- a/crates/zed/src/languages/svelte.rs +++ b/crates/zed/src/languages/svelte.rs @@ -14,8 +14,7 @@ use std::{ }; use util::ResultExt; -const SERVER_PATH: &'static str = - "node_modules/svelte-language-server/bin/server.js"; +const SERVER_PATH: &'static str = "node_modules/svelte-language-server/bin/server.js"; fn server_binary_arguments(server_path: &Path) -> Vec { vec![server_path.into(), "--stdio".into()]