From b91d6da6b6b628f29fa139fa6a26312a35c0fa7a Mon Sep 17 00:00:00 2001 From: Marshall Bowers Date: Sun, 18 Feb 2024 09:58:12 -0500 Subject: [PATCH] Remove Beancount as a built-in language (#7934) This PR removes Beancount as a built-in language, as it is now available as an [extension](https://github.com/zed-extensions/beancount). Release Notes: - Removed built-in support for Beancount, as it is now provided by an [extension](https://github.com/zed-extensions/beancount). --- Cargo.lock | 10 --------- Cargo.toml | 1 - crates/zed/Cargo.toml | 1 - crates/zed/src/languages.rs | 2 -- .../zed/src/languages/beancount/config.toml | 4 ---- .../src/languages/beancount/highlights.scm | 21 ------------------- 6 files changed, 39 deletions(-) delete mode 100644 crates/zed/src/languages/beancount/config.toml delete mode 100644 crates/zed/src/languages/beancount/highlights.scm diff --git a/Cargo.lock b/Cargo.lock index 7d8b74a79c..79790b0a6d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -10045,15 +10045,6 @@ dependencies = [ "tree-sitter", ] -[[package]] -name = "tree-sitter-beancount" -version = "2.2.0" -source = "git+https://github.com/polarmutex/tree-sitter-beancount?rev=da1bf8c6eb0ae7a97588affde7227630bcd678b6#da1bf8c6eb0ae7a97588affde7227630bcd678b6" -dependencies = [ - "cc", - "tree-sitter", -] - [[package]] name = "tree-sitter-c" version = "0.20.6" @@ -11958,7 +11949,6 @@ dependencies = [ "tree-sitter", "tree-sitter-astro", "tree-sitter-bash", - "tree-sitter-beancount", "tree-sitter-c", "tree-sitter-c-sharp", "tree-sitter-clojure", diff --git a/Cargo.toml b/Cargo.toml index c115a46231..917447b14a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -226,7 +226,6 @@ toml = "0.8" tree-sitter = { version = "0.20", features = ["wasm"] } tree-sitter-astro = { git = "https://github.com/virchau13/tree-sitter-astro.git", rev = "e924787e12e8a03194f36a113290ac11d6dc10f3" } tree-sitter-bash = { git = "https://github.com/tree-sitter/tree-sitter-bash", rev = "7331995b19b8f8aba2d5e26deb51d2195c18bc94" } -tree-sitter-beancount = { git = "https://github.com/polarmutex/tree-sitter-beancount", rev = "da1bf8c6eb0ae7a97588affde7227630bcd678b6" } tree-sitter-c = "0.20.1" tree-sitter-clojure = { git = "https://github.com/prcastro/tree-sitter-clojure", branch = "update-ts" } tree-sitter-c-sharp = { git = "https://github.com/tree-sitter/tree-sitter-c-sharp", rev = "dd5e59721a5f8dae34604060833902b882023aaf" } diff --git a/crates/zed/Cargo.toml b/crates/zed/Cargo.toml index 9ce5b7af0c..dd0d84ef44 100644 --- a/crates/zed/Cargo.toml +++ b/crates/zed/Cargo.toml @@ -111,7 +111,6 @@ tiny_http = "0.8" toml.workspace = true tree-sitter-astro.workspace = true tree-sitter-bash.workspace = true -tree-sitter-beancount.workspace = true tree-sitter-c-sharp.workspace = true tree-sitter-c.workspace = true tree-sitter-clojure.workspace = true diff --git a/crates/zed/src/languages.rs b/crates/zed/src/languages.rs index 5b3caa30dd..978a9244fb 100644 --- a/crates/zed/src/languages.rs +++ b/crates/zed/src/languages.rs @@ -68,7 +68,6 @@ pub fn init( languages.register_native_grammars([ ("astro", tree_sitter_astro::language()), ("bash", tree_sitter_bash::language()), - ("beancount", tree_sitter_beancount::language()), ("c", tree_sitter_c::language()), ("c_sharp", tree_sitter_c_sharp::language()), ("clojure", tree_sitter_clojure::language()), @@ -140,7 +139,6 @@ pub fn init( ], ); language("bash", vec![]); - language("beancount", vec![]); language("c", vec![Arc::new(c::CLspAdapter) as Arc]); language("clojure", vec![Arc::new(clojure::ClojureLspAdapter)]); language("cpp", vec![Arc::new(c::CLspAdapter)]); diff --git a/crates/zed/src/languages/beancount/config.toml b/crates/zed/src/languages/beancount/config.toml deleted file mode 100644 index fff6411e9d..0000000000 --- a/crates/zed/src/languages/beancount/config.toml +++ /dev/null @@ -1,4 +0,0 @@ -name = "Beancount" -grammar = "beancount" -path_suffixes = ["beancount"] -brackets = [{ start = "\"", end = "\"", close = false, newline = false }] diff --git a/crates/zed/src/languages/beancount/highlights.scm b/crates/zed/src/languages/beancount/highlights.scm deleted file mode 100644 index 87a383ddbf..0000000000 --- a/crates/zed/src/languages/beancount/highlights.scm +++ /dev/null @@ -1,21 +0,0 @@ -(comment) @comment -(headline) @comment -[ - (payee) - (narration) - (string) -] @string - -(number) @number -(date) @function -(currency) @constant -(account) @identifier - -[ - (option) - (include) - (open) - (balance) - (pad) - (close) -] @keyword