fix(git): rename hunk highlights

lua/git/hunks.lua

@@ -127,11 +127,11 @@ local function render_signs(buf)
             end
             pcall(vim.api.nvim_buf_set_extmark, buf, NS_SIGNS, row, 0, {
                 sign_text = signs.delete,
-                sign_hl_group = "GitHunkDelete",
+                sign_hl_group = "GitHunkDeleted",
                 priority = 100,
             })
         else
-            local hl = h.type == "add" and "GitHunkAdd" or "GitHunkChange"
+            local hl = h.type == "add" and "GitHunkAdded" or "GitHunkChanged"
             local sign = h.type == "add" and signs.add or signs.change
             for r = h.new_start, h.new_start + h.new_count - 1 do
                 local row = r - 1

plugin/git.lua

@@ -35,9 +35,9 @@ local DEFAULT_HIGHLIGHTS = {
     GitUnmergedDeletedByThem = "GitUnmerged",
     GitUnmergedDeletedByUs = "GitUnmerged",
 
-    GitHunkAdd = "Added",
+    GitHunkAdded = "Added",
-    GitHunkChange = "Changed",
+    GitHunkChanged = "Changed",
-    GitHunkDelete = "Removed",
+    GitHunkRemoved = "Removed",
     GitHunkAddLine = "DiffAdd",
     GitHunkDeleteLine = "DiffDelete",
 }

test/git/hunks_test.lua

@@ -69,8 +69,8 @@ t.test("pure add: hunk shape and add signs", function()
     t.eq(hk.new_start, 2)
     t.eq(hk.new_count, 2)
     t.eq(sign_marks(buf), {
-        { row = 1, sign = "┃", hl = "GitHunkAdd" },
+        { row = 1, sign = "┃", hl = "GitHunkAdded" },
-        { row = 2, sign = "┃", hl = "GitHunkAdd" },
+        { row = 2, sign = "┃", hl = "GitHunkAdded" },
     })
 end)
 
@@ -82,7 +82,7 @@ t.test("pure delete (middle): hunk shape and delete sign", function()
     t.eq(hk.new_count, 0)
     t.eq(hk.old_lines, { "b" })
     t.eq(sign_marks(buf), {
-        { row = 0, sign = "▁", hl = "GitHunkDelete" },
+        { row = 0, sign = "▁", hl = "GitHunkRemoved" },
     })
 end)
 
@@ -94,7 +94,7 @@ t.test("top-of-file delete: sign anchors on line 1", function()
     t.eq(hk.new_start, 0)
     t.eq(hk.old_lines, { "a" })
     t.eq(sign_marks(buf), {
-        { row = 0, sign = "▁", hl = "GitHunkDelete" },
+        { row = 0, sign = "▁", hl = "GitHunkRemoved" },
     })
 end)
 
@@ -110,8 +110,8 @@ t.test("change of N lines: hunk shape and change signs", function()
     t.eq(hk.old_lines, { "b", "c" })
     t.eq(hk.new_lines, { "B", "C" })
     t.eq(sign_marks(buf), {
-        { row = 1, sign = "┃", hl = "GitHunkChange" },
+        { row = 1, sign = "┃", hl = "GitHunkChanged" },
-        { row = 2, sign = "┃", hl = "GitHunkChange" },
+        { row = 2, sign = "┃", hl = "GitHunkChanged" },
     })
 end)
 
@@ -119,8 +119,8 @@ t.test("multi-hunk file: two separate change hunks", function()
     local _, buf, state = setup("a\nb\nc\nd\ne\n", "A\nb\nc\nd\nE\n")
     t.eq(#state.hunks, 2, "two hunks for two disjoint changes")
     t.eq(sign_marks(buf), {
-        { row = 0, sign = "┃", hl = "GitHunkChange" },
+        { row = 0, sign = "┃", hl = "GitHunkChanged" },
-        { row = 4, sign = "┃", hl = "GitHunkChange" },
+        { row = 4, sign = "┃", hl = "GitHunkChanged" },
     })
 end)
 
@@ -327,7 +327,7 @@ t.test("git_hunk_signs overrides the sign character per kind", function()
     end)
     local _, buf = setup("a\nb\nc\n", "a\nB\nc\n")
     t.eq(sign_marks(buf), {
-        { row = 1, sign = "C", hl = "GitHunkChange" },
+        { row = 1, sign = "C", hl = "GitHunkChanged" },
     })
 end)
 
@@ -339,7 +339,7 @@ t.test("git_hunk_signs falls back to the default for unset kinds", function()
     end)
     local _, buf = setup("a\nb\nc\n", "a\nB\nc\n")
     t.eq(sign_marks(buf), {
-        { row = 1, sign = "┃", hl = "GitHunkChange" },
+        { row = 1, sign = "┃", hl = "GitHunkChanged" },
     })
 end)