refactor: correctness fixes, API modernization, and cleanup

2026-04-13 01:20:52 +02:00
parent 62e64182de
commit fc7060e0ed
12 changed files with 166 additions and 223 deletions
@@ -3,7 +3,7 @@ require("gitsigns").setup({
        border = "single",
    },
    on_attach = function(bufnr)
-        local gs = package.loaded.gitsigns
+        local gs = require("gitsigns")
        vim.keymap.set(
            "n",
            "<leader>gv",
@@ -14,12 +14,6 @@ require("gitsigns").setup({
        vim.keymap.set("x", "<leader>gs", function()
            gs.stage_hunk({ vim.fn.line("."), vim.fn.line("v") })
        end, { buffer = bufnr })
-        vim.keymap.set(
-            { "n", "x" },
-            "<leader>gu",
-            gs.undo_stage_hunk,
-            { buffer = bufnr }
-        )
        vim.keymap.set("n", "<leader>gr", gs.reset_hunk, { buffer = bufnr })
        vim.keymap.set(
            "x",
@@ -37,19 +31,25 @@ require("gitsigns").setup({
            gs.blame_line({ full = true, ignore_whitespace = true })
        end, { buffer = bufnr })
        vim.keymap.set({ "n", "x" }, "]g", function()
-            gs.next_hunk({
+            gs.nav_hunk("next", {
                wrap = true,
-                navigation_message = true,
                foldopen = true,
+                navigation_message = true,
+                greedy = true,
                preview = true,
+                count = 1,
+                target = "all",
            })
        end)
        vim.keymap.set({ "n", "x" }, "[g", function()
-            gs.prev_hunk({
+            gs.nav_hunk("prev", {
                wrap = true,
-                navigation_message = true,
                foldopen = true,
+                navigation_message = true,
+                greedy = true,
                preview = true,
+                count = 1,
+                target = "all",
            })
        end)
    end,