From 8fda87af2bb0625c502a23ddbd78a7447ada7bcb Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Thu, 30 Dec 2021 16:58:47 -0600
Subject: [PATCH] add tree-sitter-git-rebase (#1402)

* add submodule on tree-sitter-rebase, add to languages

* add basic highlights query

* inject bash in execute statements

* update tree-sitter-rebase

* tree-sitter-rebase->tree-sitter-git-rebase

* get injection working with tree-sitter-git-commit

* set scope under source.gitrebase

* unset include-children on commit message injections

* Revert "unset include-children on commit message injections"

This reverts commit 2ecee155ea8e229651920b291062c2ee84b47944.

* fix generated language docs

* use rebase_command scopes from tree-sitter-git-commit
---
 .gitmodules                                   |  4 ++++
 book/src/generated/lang-support.md            |  1 +
 helix-syntax/languages/tree-sitter-git-rebase |  1 +
 languages.toml                                |  9 +++++++++
 runtime/queries/git-commit/highlights.scm     |  1 -
 runtime/queries/git-commit/injections.scm     |  8 +++-----
 runtime/queries/git-rebase/highlights.scm     | 11 +++++++++++
 runtime/queries/git-rebase/injections.scm     |  4 ++++
 8 files changed, 33 insertions(+), 6 deletions(-)
 create mode 160000 helix-syntax/languages/tree-sitter-git-rebase
 create mode 100644 runtime/queries/git-rebase/highlights.scm
 create mode 100644 runtime/queries/git-rebase/injections.scm

diff --git a/.gitmodules b/.gitmodules
index 422671b4e729..22f70c802655 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -178,3 +178,7 @@
 	path = helix-syntax/languages/tree-sitter-git-diff
 	url = https://github.com/the-mikedavis/tree-sitter-git-diff.git
 	shallow = true
+[submodule "helix-syntax/languages/tree-sitter-git-rebase"]
+	path = helix-syntax/languages/tree-sitter-git-rebase
+	url = https://github.com/the-mikedavis/tree-sitter-git-rebase.git
+	shallow = true
diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index 91575c629ece..09284d467b77 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -13,6 +13,7 @@
 | fish | ✓ | ✓ | ✓ |  |
 | git-commit | ✓ |  |  |  |
 | git-diff | ✓ |  |  |  |
+| git-rebase | ✓ |  |  |  |
 | glsl | ✓ |  | ✓ |  |
 | go | ✓ | ✓ | ✓ | `gopls` |
 | html | ✓ |  |  |  |
diff --git a/helix-syntax/languages/tree-sitter-git-rebase b/helix-syntax/languages/tree-sitter-git-rebase
new file mode 160000
index 000000000000..332dc528f270
--- /dev/null
+++ b/helix-syntax/languages/tree-sitter-git-rebase
@@ -0,0 +1 @@
+Subproject commit 332dc528f27044bc4427024dbb33e6941fc131f2
diff --git a/languages.toml b/languages.toml
index c3ae9f628308..3d9bac7b5f5b 100644
--- a/languages.toml
+++ b/languages.toml
@@ -490,3 +490,12 @@ file-types = ["diff"]
 injection-regex = "diff"
 comment-token = "#"
 indent = { tab-width = 2, unit = "  " }
+
+[[language]]
+name = "git-rebase"
+scope = "source.gitrebase"
+roots = []
+file-types = ["git-rebase-todo"]
+injection-regex = "git-rebase"
+comment-token = "#"
+indent = { tab-width = 2, unit = " " }
diff --git a/runtime/queries/git-commit/highlights.scm b/runtime/queries/git-commit/highlights.scm
index ffcc31aef3e0..0b50d41908f5 100644
--- a/runtime/queries/git-commit/highlights.scm
+++ b/runtime/queries/git-commit/highlights.scm
@@ -4,7 +4,6 @@
 (commit) @constant
 (item) @markup.link.url
 (header) @tag
-(rebase_command) @markup.raw
 
 (change kind: "new file" @diff.plus)
 (change kind: "deleted" @diff.minus)
diff --git a/runtime/queries/git-commit/injections.scm b/runtime/queries/git-commit/injections.scm
index bd96f1de31d5..cf0657f725fa 100644
--- a/runtime/queries/git-commit/injections.scm
+++ b/runtime/queries/git-commit/injections.scm
@@ -3,8 +3,6 @@
  (#set! injection.include-children)
  (#set! injection.language "diff"))
 
-; once a rebase grammar is available, we can inject rebase highlighting into
-; interactive rebase summary sections like so:
-;
-; ((rebase_command) @injection.content
-;  (#set! injection.language "git-rebase"))
+((rebase_command) @injection.content
+ (#set! injection.include-children)
+ (#set! injection.language "git-rebase"))
diff --git a/runtime/queries/git-rebase/highlights.scm b/runtime/queries/git-rebase/highlights.scm
new file mode 100644
index 000000000000..4f007037d4b7
--- /dev/null
+++ b/runtime/queries/git-rebase/highlights.scm
@@ -0,0 +1,11 @@
+(operation operator: ["p" "pick" "r" "reword" "e" "edit" "s" "squash" "m" "merge" "d" "drop" "b" "break" "x" "exec"] @keyword)
+(operation operator: ["l" "label" "t" "reset"] @function)
+(operation operator: ["f" "fixup"] @function.special)
+
+(option) @operator
+(label) @string.special.symbol
+(commit) @constant
+"#" @punctuation.delimiter
+(comment) @comment
+
+(ERROR) @error
diff --git a/runtime/queries/git-rebase/injections.scm b/runtime/queries/git-rebase/injections.scm
new file mode 100644
index 000000000000..070129b63d88
--- /dev/null
+++ b/runtime/queries/git-rebase/injections.scm
@@ -0,0 +1,4 @@
+((operation
+   operator: ["x" "exec"]
+   (command) @injection.content)
+ (#set! injection.language "bash"))