From 22b8662275e14acd56074d7c63ac2f542b2003e2 Mon Sep 17 00:00:00 2001
From: Cole Miller <cole@zed.dev>
Date: Tue, 18 Mar 2025 14:18:56 -0400
Subject: [PATCH] Fix syntax highlighting of git commit messages (#26988)

- Load syntax colors into commit message editors
- Fix name mismatches that were preventing the git commit grammar and
language config from being matched up

Release Notes:

- Fixed git commit messages not being syntax-highlighted
---
 crates/languages/src/gitcommit/config.toml    | 2 +-
 crates/languages/src/gitcommit/highlights.scm | 2 +-
 crates/languages/src/lib.rs                   | 4 ++++
 crates/panel/src/panel.rs                     | 1 +
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/crates/languages/src/gitcommit/config.toml b/crates/languages/src/gitcommit/config.toml
index c8ffca3105..ae4b836ed6 100644
--- a/crates/languages/src/gitcommit/config.toml
+++ b/crates/languages/src/gitcommit/config.toml
@@ -1,5 +1,5 @@
 name = "Git Commit"
-grammar = "git_commit"
+grammar = "gitcommit"
 path_suffixes = [
   "TAG_EDITMSG",
   "MERGE_MSG",
diff --git a/crates/languages/src/gitcommit/highlights.scm b/crates/languages/src/gitcommit/highlights.scm
index 319d76569e..8670a6615a 100644
--- a/crates/languages/src/gitcommit/highlights.scm
+++ b/crates/languages/src/gitcommit/highlights.scm
@@ -4,6 +4,7 @@
 (commit) @constant
 (item) @markup.link.url
 (header) @tag
+(comment) @comment
 
 (change kind: "new file" @diff.plus)
 (change kind: "deleted" @diff.minus)
@@ -15,4 +16,3 @@
   value: (trailer_value) @string)
 
 [":" "=" "->" (scissors)] @punctuation.delimiter
-(comment) @comment
diff --git a/crates/languages/src/lib.rs b/crates/languages/src/lib.rs
index 5504650fc0..29afa3f0a9 100644
--- a/crates/languages/src/lib.rs
+++ b/crates/languages/src/lib.rs
@@ -202,6 +202,10 @@ pub fn init(languages: Arc<LanguageRegistry>, node: NodeRuntime, cx: &mut App) {
             adapters: vec![yaml_lsp_adapter],
             ..Default::default()
         },
+        LanguageInfo {
+            name: "gitcommit",
+            ..Default::default()
+        },
     ];
 
     for registration in built_in_languages {
diff --git a/crates/panel/src/panel.rs b/crates/panel/src/panel.rs
index b1c55777c7..9859bf6444 100644
--- a/crates/panel/src/panel.rs
+++ b/crates/panel/src/panel.rs
@@ -113,6 +113,7 @@ pub fn panel_editor_style(monospace: bool, window: &Window, cx: &App) -> EditorS
             line_height: line_height.into(),
             ..Default::default()
         },
+        syntax: cx.theme().syntax().clone(),
         ..Default::default()
     }
 }