From ba319f2bdee2baa8ab0256ba84790f97e804d362 Mon Sep 17 00:00:00 2001
From: Sanchayan Maity <sanchayan@sanchayanmaity.net>
Date: Mon, 31 Oct 2022 12:36:08 +0530
Subject: [PATCH] nvim: after/plugin/gitsigns: Use on_attach callback to setup
 mappings

keymaps is deprecated.
---
 nvim/.config/nvim/after/plugin/gitsigns.lua | 50 ++++++++++++---------
 1 file changed, 30 insertions(+), 20 deletions(-)

diff --git a/nvim/.config/nvim/after/plugin/gitsigns.lua b/nvim/.config/nvim/after/plugin/gitsigns.lua
index e4073de..4e96b13 100644
--- a/nvim/.config/nvim/after/plugin/gitsigns.lua
+++ b/nvim/.config/nvim/after/plugin/gitsigns.lua
@@ -39,27 +39,37 @@ require('gitsigns').setup {
     topdelete    = { hl = 'GitSignsDelete', text = '‾', numhl='GitSignsDeleteNr', linehl='GitSignsDeleteLn' },
     changedelete = { hl = 'GitSignsChange', text = '~', numhl='GitSignsChangeNr', linehl='GitSignsChangeLn' },
   },
-  keymaps = {
-    noremap          = true,
+  on_attach = function(bufnr)
+    local gs = package.loaded.gitsigns
 
-    ['n ]c']         = { expr = true, "&diff ? ']c' : '<cmd>lua require\"gitsigns.actions\".next_hunk()<CR>'" },
-    ['n [c']         = { expr = true, "&diff ? '[c' : '<cmd>lua require\"gitsigns.actions\".prev_hunk()<CR>'" },
+    local function map(mode, l, r, opts)
+      opts = opts or {}
+      opts.buffer = bufnr
+      vim.keymap.set(mode, l, r, opts)
+    end
 
-    ['n <Leader>hl'] = '<cmd>lua require"gitsigns".setloclist()<CR>',
-    ['n <Leader>hp'] = '<cmd>lua require"gitsigns".preview_hunk()<CR>',
-    ['n <Leader>hq'] = '<cmd>lua require"gitsigns".setqflist()<CR>',
-    ['n <Leader>hQ'] = '<cmd>lua require"gitsigns".setqflist("attached")<CR>',
-    ['n <Leader>hr'] = '<cmd>lua require"gitsigns".reset_hunk()<CR>',
-    ['v <Leader>hr'] = '<cmd>lua require"gitsigns".reset_hunk({vim.fn.line("."), vim.fn.line("v")})<CR>',
-    ['n <Leader>hR'] = '<cmd>lua require"gitsigns".reset_buffer()<CR>',
-    ['n <Leader>hs'] = '<cmd>lua require"gitsigns".stage_hunk()<CR>',
-    ['v <Leader>hs'] = '<cmd>lua require"gitsigns".stage_hunk({vim.fn.line("."), vim.fn.line("v")})<CR>',
-    ['n <Leader>hS'] = '<cmd>lua require"gitsigns".stage_buffer()<CR>',
-    ['n <Leader>ht'] = '<cmd>lua require"gitsigns".toggle_signs()<CR>',
-    ['n <Leader>hu'] = '<cmd>lua require"gitsigns".undo_stage_hunk()<CR>',
-    ['n <Leader>hU'] = '<cmd>lua require"gitsigns".reset_buffer_index()<CR>',
+    map('n', ']c', function()
+      if vim.wo.diff then return ']c' end
+      vim.schedule(function() gs.next_hunk() end)
+      return '<Ignore>'
+    end, {expr=true})
 
-    ['o ih']         = ':<C-U>lua require"gitsigns.actions".select_hunk()<CR>',
-    ['x ih']         = ':<C-U>lua require"gitsigns.actions".select_hunk()<CR>'
-  },
+    map('n', '[c', function()
+      if vim.wo.diff then return '[c' end
+      vim.schedule(function() gs.prev_hunk() end)
+      return '<Ignore>'
+    end, {expr=true})
+
+    map('n', '<Leader>hp', gs.preview_hunk)
+    map('n', '<Leader>hP', gs.preview_hunk_inline)
+    map('n', '<Leader>hl', gs.setloclist)
+    map('n', '<Leader>hq', gs.setqflist)
+    map('n', '<Leader>hQ', function() gs.setqflist('attached') end)
+    map('n', '<Leader>ht', gs.toggle_signs)
+    map('n', '<Leader>hu', gs.undo_stage_hunk)
+
+    map({'n', 'v'}, '<Leader>hs', ':Gitsigns stage_hunk<CR>')
+    map({'n', 'v'}, '<Leader>hr', ':Gitsigns reset_hunk<CR>')
+    map({'o', 'x'}, 'ih', ':<C-U>Gitsigns select_hunk<CR>')
+  end
 }