From b83edf40faea4e6cc432e5b3490d696d4fa47b3d Mon Sep 17 00:00:00 2001
From: Leonard Hecker <leonard@hecker.io>
Date: Mon, 20 Apr 2026 23:55:39 +0200
Subject: [PATCH] Align LSH language IDs with VS Code

---
 .../definitions/{git_commit_messsage.lsh => git_commit.lsh}   | 2 +-
 .../lsh/definitions/{git_rebase_todo.lsh => git_rebase.lsh}   | 2 +-
 crates/lsh/definitions/{git_ignore.lsh => ignore.lsh}         | 2 +-
 crates/lsh/src/compiler/generator.rs                          | 4 +++-
 4 files changed, 6 insertions(+), 4 deletions(-)
 rename crates/lsh/definitions/{git_commit_messsage.lsh => git_commit.lsh} (95%)
 rename crates/lsh/definitions/{git_rebase_todo.lsh => git_rebase.lsh} (95%)
 rename crates/lsh/definitions/{git_ignore.lsh => ignore.lsh} (86%)

diff --git a/crates/lsh/definitions/git_commit_messsage.lsh b/crates/lsh/definitions/git_commit.lsh
similarity index 95%
rename from crates/lsh/definitions/git_commit_messsage.lsh
rename to crates/lsh/definitions/git_commit.lsh
index 13e6103fb93..782bf08d0c3 100644
--- a/crates/lsh/definitions/git_commit_messsage.lsh
+++ b/crates/lsh/definitions/git_commit.lsh
@@ -1,7 +1,7 @@
 #[display_name = "Git Commit Message"]
 #[path = "**/COMMIT_EDITMSG"]
 #[path = "**/MERGE_MSG"]
-pub fn git_commit_message() {
+pub fn git_commit() {
     if /#\s*/ {
         yield comment;
         if /(?:modified:|renamed:).*/ {
diff --git a/crates/lsh/definitions/git_rebase_todo.lsh b/crates/lsh/definitions/git_rebase.lsh
similarity index 95%
rename from crates/lsh/definitions/git_rebase_todo.lsh
rename to crates/lsh/definitions/git_rebase.lsh
index 16d30ffb58e..6cc861cea00 100644
--- a/crates/lsh/definitions/git_rebase_todo.lsh
+++ b/crates/lsh/definitions/git_rebase.lsh
@@ -1,7 +1,7 @@
 #[display_name = "Git Rebase Message"]
 #[path = "**/git-rebase-todo"]
 #[path = "**/rebase-merge/done"]
-pub fn git_rebase_todo() {
+pub fn git_rebase() {
     if /#.*/ {
         yield comment;
     } else if /(?:break|exec|b|x)\>/ {
diff --git a/crates/lsh/definitions/git_ignore.lsh b/crates/lsh/definitions/ignore.lsh
similarity index 86%
rename from crates/lsh/definitions/git_ignore.lsh
rename to crates/lsh/definitions/ignore.lsh
index 72da71fce16..28019a2aa2e 100644
--- a/crates/lsh/definitions/git_ignore.lsh
+++ b/crates/lsh/definitions/ignore.lsh
@@ -1,7 +1,7 @@
 #[display_name = "Ignore"]
 #[path = "**/.git-blame-ignore-revs"]
 #[path = "**/.gitignore"]
-pub fn git_ignore() {
+pub fn ignore() {
     if /#.*/ {
         yield comment;
     }
diff --git a/crates/lsh/src/compiler/generator.rs b/crates/lsh/src/compiler/generator.rs
index 02f4ca6320d..8ccb0a87c44 100644
--- a/crates/lsh/src/compiler/generator.rs
+++ b/crates/lsh/src/compiler/generator.rs
@@ -216,7 +216,9 @@ impl TryFrom<u32> for HighlightKind {{
             _ = writeln!(
                 output,
                 "    Language {{ id: {:?}, name: {:?}, entrypoint: {} }},",
-                ep.name, ep.display_name, ep.address
+                ep.name.replace('_', "-"),
+                ep.display_name,
+                ep.address,
             );
         }
         output.push_str("];\n");