From b5370cd15a0f41f3b4ec31bc7435ec94316f64d4 Mon Sep 17 00:00:00 2001 From: d1y Date: Fri, 8 Mar 2024 02:23:44 +0800 Subject: [PATCH] Remove git_commit syntax highlighting from core Zed (#9025) Fallback to extension https://github.com/zed-industries/extensions/pull/307 Release Notes: - Remove git_commit syntax highlighting from Zed core, `git-firefly` extension replaced that Co-authored-by: William Desportes Co-authored-by: Kirill Bulatov Co-authored-by: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com> --- Cargo.lock | 10 ------ Cargo.toml | 1 - crates/languages/Cargo.toml | 1 - crates/languages/src/gitcommit/config.toml | 12 ------- crates/languages/src/gitcommit/highlights.scm | 34 ------------------- crates/languages/src/gitcommit/injections.scm | 8 ----- crates/languages/src/lib.rs | 2 -- docs/src/languages/gitcommit.md | 4 --- 8 files changed, 72 deletions(-) delete mode 100644 crates/languages/src/gitcommit/config.toml delete mode 100644 crates/languages/src/gitcommit/highlights.scm delete mode 100644 crates/languages/src/gitcommit/injections.scm delete mode 100644 docs/src/languages/gitcommit.md diff --git a/Cargo.lock b/Cargo.lock index 1990699b88..09ed90954d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5355,7 +5355,6 @@ dependencies = [ "tree-sitter-elm", "tree-sitter-embedded-template", "tree-sitter-erlang", - "tree-sitter-gitcommit", "tree-sitter-gleam", "tree-sitter-glsl", "tree-sitter-go", @@ -10555,15 +10554,6 @@ dependencies = [ "tree-sitter", ] -[[package]] -name = "tree-sitter-gitcommit" -version = "0.3.3" -source = "git+https://github.com/gbprod/tree-sitter-gitcommit#7c01af8d227b5344f62aade2ff00f19bd0c458ca" -dependencies = [ - "cc", - "tree-sitter", -] - [[package]] name = "tree-sitter-gleam" version = "0.34.0" diff --git a/Cargo.toml b/Cargo.toml index f9b5cb3881..6215271a94 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -279,7 +279,6 @@ tree-sitter-elixir = { git = "https://github.com/elixir-lang/tree-sitter-elixir" tree-sitter-elm = { git = "https://github.com/elm-tooling/tree-sitter-elm", rev = "692c50c0b961364c40299e73c1306aecb5d20f40" } tree-sitter-embedded-template = "0.20.0" tree-sitter-erlang = "0.4.0" -tree-sitter-gitcommit = { git = "https://github.com/gbprod/tree-sitter-gitcommit" } tree-sitter-gleam = { git = "https://github.com/gleam-lang/tree-sitter-gleam", rev = "58b7cac8fc14c92b0677c542610d8738c373fa81" } tree-sitter-glsl = { git = "https://github.com/theHamsta/tree-sitter-glsl", rev = "2a56fb7bc8bb03a1892b4741279dd0a8758b7fb3" } tree-sitter-go = { git = "https://github.com/tree-sitter/tree-sitter-go", rev = "aeb2f33b366fd78d5789ff104956ce23508b85db" } diff --git a/crates/languages/Cargo.toml b/crates/languages/Cargo.toml index 122607791e..facb1460c2 100644 --- a/crates/languages/Cargo.toml +++ b/crates/languages/Cargo.toml @@ -49,7 +49,6 @@ tree-sitter-elixir.workspace = true tree-sitter-elm.workspace = true tree-sitter-embedded-template.workspace = true tree-sitter-erlang.workspace = true -tree-sitter-gitcommit.workspace = true tree-sitter-gleam.workspace = true tree-sitter-glsl.workspace = true tree-sitter-go.workspace = true diff --git a/crates/languages/src/gitcommit/config.toml b/crates/languages/src/gitcommit/config.toml deleted file mode 100644 index 0b4d84069e..0000000000 --- a/crates/languages/src/gitcommit/config.toml +++ /dev/null @@ -1,12 +0,0 @@ -name = "Git Commit" -grammar = "git_commit" -path_suffixes = [ - # Refer to https://github.com/neovim/neovim/blob/master/runtime/lua/vim/filetype.lua#L1286-L1290 - "TAG_EDITMSG", - "MERGE_MSG", - "COMMIT_EDITMSG", - "NOTES_EDITMSG", - "EDIT_DESCRIPTION", -] -line_comments = ["#"] -brackets = [] diff --git a/crates/languages/src/gitcommit/highlights.scm b/crates/languages/src/gitcommit/highlights.scm deleted file mode 100644 index a8a3352057..0000000000 --- a/crates/languages/src/gitcommit/highlights.scm +++ /dev/null @@ -1,34 +0,0 @@ -(comment) @comment -(generated_comment) @comment -(title) @text.title -(text) @text -(branch) @text.reference -(change) @keyword -(filepath) @text.uri -(arrow) @punctuation.delimiter - -(subject) @text.title -(subject (overflow) @text) -(prefix (type) @keyword) -(prefix (scope) @parameter) -(prefix [ - "(" - ")" - ":" -] @punctuation.delimiter) -(prefix [ - "!" -] @punctuation.special) - -(message) @text - -(trailer (token) @keyword) -(trailer (value) @text) - -(breaking_change (token) @text.warning) -(breaking_change (value) @text) - -(scissor) @comment -(subject_prefix) @keyword - -(ERROR) @error diff --git a/crates/languages/src/gitcommit/injections.scm b/crates/languages/src/gitcommit/injections.scm deleted file mode 100644 index 5e516f5a23..0000000000 --- a/crates/languages/src/gitcommit/injections.scm +++ /dev/null @@ -1,8 +0,0 @@ -((diff) @injection.content - (#set! injection.combined) - (#set! injection.language "diff")) - -((rebase_command) @injection.content - (#set! injection.combined) - (#set! injection.language "git_rebase")) - diff --git a/crates/languages/src/lib.rs b/crates/languages/src/lib.rs index 6aef9f6d16..5cd46edaea 100644 --- a/crates/languages/src/lib.rs +++ b/crates/languages/src/lib.rs @@ -82,7 +82,6 @@ pub fn init( tree_sitter_embedded_template::language(), ), ("erlang", tree_sitter_erlang::language()), - ("git_commit", tree_sitter_gitcommit::language()), ("gleam", tree_sitter_gleam::language()), ("glsl", tree_sitter_glsl::language()), ("go", tree_sitter_go::language()), @@ -214,7 +213,6 @@ pub fn init( ); } } - language!("gitcommit"); language!("erlang", vec![Arc::new(erlang::ErlangLspAdapter)]); language!("gleam", vec![Arc::new(gleam::GleamLspAdapter)]); diff --git a/docs/src/languages/gitcommit.md b/docs/src/languages/gitcommit.md deleted file mode 100644 index 09f3e3c9e8..0000000000 --- a/docs/src/languages/gitcommit.md +++ /dev/null @@ -1,4 +0,0 @@ -# Git Commit - -- Tree Sitter: [tree-sitter-gitcommit](https://github.com/gbprod/tree-sitter-gitcommit) -- Language Server: N/A