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
This commit is contained in:
Cole Miller 2025-03-18 14:18:56 -04:00 committed by GitHub
parent cc36cd9768
commit 22b8662275
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 7 additions and 2 deletions

View file

@ -1,5 +1,5 @@
name = "Git Commit"
grammar = "git_commit"
grammar = "gitcommit"
path_suffixes = [
"TAG_EDITMSG",
"MERGE_MSG",

View file

@ -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

View file

@ -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 {

View file

@ -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()
}
}