From 7cab261694705050bda7091f5eed0601430143c4 Mon Sep 17 00:00:00 2001
From: Lyall Cooper <git@lyall.co>
Date: Thu, 18 Jun 2026 14:29:03 +0000
Subject: [PATCH] Add modeline_aliases for git filetypes

Zed resolves a modeline's mode/ft token against each language's
modeline_aliases, then grammar name, then display name. The Git Config
and Git Rebase grammars are named git_config/git_rebase, so the
canonical filetypes 'gitconfig' and 'gitrebase' did not resolve and
such files fell back to plain text.

Declare modeline_aliases with the canonical Vim/Neovim filetype name
(per the filetype.lua references already in these configs) for all four
languages, so '# vim: ft=gitconfig' and '# -*- mode: gitconfig -*-'
modelines select the right language.
---
 languages/gitattributes/config.toml | 1 +
 languages/gitconfig/config.toml     | 1 +
 languages/gitignore/config.toml     | 1 +
 languages/gitrebase/config.toml     | 1 +
 4 files changed, 4 insertions(+)

diff --git a/languages/gitattributes/config.toml b/languages/gitattributes/config.toml
index 65c8415..bdb2dca 100644
--- a/languages/gitattributes/config.toml
+++ b/languages/gitattributes/config.toml
@@ -1,5 +1,6 @@
 name = "Git Attributes"
 grammar = "gitattributes"
+modeline_aliases = ["gitattributes"]
 path_suffixes = [
   # https://github.com/neovim/neovim/blob/master/runtime/lua/vim/filetype.lua
   "gitattributes",
diff --git a/languages/gitconfig/config.toml b/languages/gitconfig/config.toml
index 0b7d3c3..26accde 100644
--- a/languages/gitconfig/config.toml
+++ b/languages/gitconfig/config.toml
@@ -1,5 +1,6 @@
 name = "Git Config"
 grammar = "git_config"
+modeline_aliases = ["gitconfig"]
 path_suffixes = [
   # https://github.com/neovim/neovim/blob/master/runtime/lua/vim/filetype.lua
   "config.worktree",
diff --git a/languages/gitignore/config.toml b/languages/gitignore/config.toml
index d35a563..ad11ed6 100644
--- a/languages/gitignore/config.toml
+++ b/languages/gitignore/config.toml
@@ -16,6 +16,7 @@ path_suffixes = [
 ]
 name = "Git Ignore"
 grammar = "gitignore"
+modeline_aliases = ["gitignore"]
 line_comments = ["# "]
 autoclose_before = "]"
 brackets = [
diff --git a/languages/gitrebase/config.toml b/languages/gitrebase/config.toml
index ee7cfdd..c9ecbee 100644
--- a/languages/gitrebase/config.toml
+++ b/languages/gitrebase/config.toml
@@ -1,5 +1,6 @@
 name = "Git Rebase"
 grammar = "git_rebase"
+modeline_aliases = ["gitrebase"]
 path_suffixes = [
   # https://github.com/neovim/neovim/blob/master/runtime/lua/vim/filetype.lua
   "git-rebase-todo",