vim: new way of adding keymaps for gitsigns.nvim

1 files changed, 43 insertions, 19 deletions

diff --git a/dotfiles/vim/lua/myConfig.lua b/dotfiles/vim/lua/myConfig.lua
index 3dc45ce..65753ea 100644
--- a/dotfiles/vim/lua/myConfig.lua
+++ b/dotfiles/vim/lua/myConfig.lua
@@ -160,25 +160,49 @@ end, mapopts)
 -- Gitsigns
 
 require("gitsigns").setup {
-        keymaps = {
-                noremap = true,
-                buffer = true,
-                silent = true,
-
-                ["n ]c"] = { expr = true, "&diff ? ']c' : '<cmd>lua require\"gitsigns\".next_hunk()<CR>'" },
-                ["n [c"] = { expr = true, "&diff ? '[c' : '<cmd>lua require\"gitsigns\".prev_hunk()<CR>'" },
-
-                ["n <leader>hs"] = '<cmd>lua require"gitsigns".stage_hunk()<CR>',
-                ["n <leader>hu"] = '<cmd>lua require"gitsigns".undo_stage_hunk()<CR>',
-                ["n <leader>hr"] = '<cmd>lua require"gitsigns".reset_hunk()<CR>',
-                ["n <leader>hR"] = '<cmd>lua require"gitsigns".reset_buffer()<CR>',
-                ["n <leader>hp"] = '<cmd>lua require"gitsigns".preview_hunk()<CR>',
-                ["n <leader>hb"] = '<cmd>lua require"gitsigns".blame_line()<CR>',
-
-                -- Text objects
-                ["o ih"] = ':<C-U>lua require"gitsigns".select_hunk()<CR>',
-                ["x ih"] = ':<C-U>lua require"gitsigns".select_hunk()<CR>',
-        },
+        on_attach = function(bufnr)
+                local gs = package.loaded.gitsigns
+
+                local function map(mode, l, r, opts)
+                        opts = vim.tbl_extend("force", {
+                                noremap = true,
+                                buffer = buffnr,
+                                silent = true,
+                        }, opts or {})
+                        vim.keymap.set(mode, l, r, opts)
+                end
+
+                -- Navigation
+                map('n', ']c', function()
+                        if vim.wo.diff then return ']c' end
+                        vim.schedule(function() gs.next_hunk() end)
+                        return '<Ignore>'
+                end, { expr = true })
+
+                map('n', '[c', function()
+                        if vim.wo.diff then return '[c' end
+                        vim.schedule(function() gs.prev_hunk() end)
+                        return '<Ignore>'
+                end, { expr = true })
+
+                -- Actions
+                map('n', '<leader>hs', gs.stage_hunk, { desc = "Stage Hunk" })
+                map('n', '<leader>hr', gs.reset_hunk, { desc = "reset Hunk" })
+                map('v', '<leader>hs', function() gs.stage_hunk { vim.fn.line('.'), vim.fn.line('v') } end, { desc = "Stage hunk" })
+                map('v', '<leader>hr', function() gs.reset_hunk { vim.fn.line('.'), vim.fn.line('v') } end, { desc = "Reset hunk" })
+                map('n', '<leader>hS', gs.stage_buffer, { desc = "Stage buffer" })
+                map('n', '<leader>hu', gs.undo_stage_hunk, { desc = "Undo stage hunk" })
+                map('n', '<leader>hR', gs.reset_buffer, { desc = "Reset buffer" })
+                map('n', '<leader>hp', gs.preview_hunk, { desc = "Preview hunk" })
+                map('n', '<leader>hb', function() gs.blame_line { full = true } end, { desc = "Blame line" })
+                map('n', '<leader>tb', gs.toggle_current_line_blame, { desc = "Toggle current line blame" })
+                map('n', '<leader>hd', gs.diffthis, { desc = "Diff this" })
+                map('n', '<leader>hD', function() gs.diffthis('~') end, { desc = "Diff this against ~" })
+                map('n', '<leader>td', gs.toggle_deleted, { desc = "Toggle deleted" })
+
+                -- Text object
+                map({ 'o', 'x' }, 'ih', ':<C-U>Gitsigns select_hunk<CR>', { desc = "Select hunk" })
+        end,
 }
 
 -- Treesitter