joao.dubas/ide
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

fix(nvim): set gitsigns mappings in opts table

Browse Source
This commit is contained in:
João Paulo Dubas 2024-03-03 23:25:15 +00:00
parent ed04d14a9a
commit f9e86a4dac
Signed by: joao.dubas
SSH Key Fingerprint: SHA256:V1mixgOGRc/YMhGx/DNkOSmJxgA2vHNrDZEk3wt/kOA
1 changed files with 63 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

126
patch/kickstart.nvim/updates.patch
View File

@ -1,5 +1,5 @@
diff --git a/init.lua b/init.lua
index 292ec07..19075db 100644
index 292ec07..284e1dc 100644
--- a/init.lua
+++ b/init.lua
@@ -101,8 +101,12 @@ vim.opt.number = true
@ -31,73 +31,73 @@ index 292ec07..19075db 100644
-- [[ Basic Keymaps ]]
-- See `:help vim.keymap.set()`
@@ -250,6 +262,66 @@ require('lazy').setup {
@@ -249,6 +261,66 @@ require('lazy').setup {
topdelete = { text = '‾' },
changedelete = { text = '~' },
},
+ on_attach = function(bufnr)
+ local gs = package.loaded.gitsigns
+
+ local function map(mode, l, r, opts)
+ opts = opts or {}
+ opts.buffer = bufnr
+ vim.keymap.set(mode, l, r, opts)
+ end
+
+ -- Navigation
+ map({ 'n', 'v' }, ']c', function()
+ if vim.wo.diff then
+ return ']c'
+ end
+ vim.schedule(function()
+ gs.next_hunk()
+ end)
+ return '<Ignore>'
+ end, { expr = true, desc = 'Jump to next hunk' })
+
+ map({ 'n', 'v' }, '[c', function()
+ if vim.wo.diff then
+ return '[c'
+ end
+ vim.schedule(function()
+ gs.prev_hunk()
+ end)
+ return '<Ignore>'
+ end, { expr = true, desc = 'Jump to previous hunk' })
+
+ -- Actions
+ -- visual mode
+ map('v', '<leader>hs', function()
+ gs.stage_hunk { vim.fn.line '.', vim.fn.line 'v' }
+ end, { desc = 'stage git hunk' })
+ map('v', '<leader>hr', function()
+ gs.reset_hunk { vim.fn.line '.', vim.fn.line 'v' }
+ end, { desc = 'reset git hunk' })
+ -- normal mode
+ map('n', '<leader>hs', gs.stage_hunk, { desc = 'git stage hunk' })
+ map('n', '<leader>hr', gs.reset_hunk, { desc = 'git reset hunk' })
+ map('n', '<leader>hS', gs.stage_buffer, { desc = 'git Stage buffer' })
+ map('n', '<leader>hu', gs.undo_stage_hunk, { desc = 'undo stage hunk' })
+ map('n', '<leader>hR', gs.reset_buffer, { desc = 'git Reset buffer' })
+ map('n', '<leader>hp', gs.preview_hunk, { desc = 'preview git hunk' })
+ map('n', '<leader>hb', function()
+ gs.blame_line { full = false }
+ end, { desc = 'git blame line' })
+ map('n', '<leader>hd', gs.diffthis, { desc = 'git diff against index' })
+ map('n', '<leader>hD', function()
+ gs.diffthis '~'
+ end, { desc = 'git diff against last commit' })
+
+ -- Toggles
+ map('n', '<leader>tb', gs.toggle_current_line_blame, { desc = 'toggle git blame line' })
+ map('n', '<leader>td', gs.toggle_deleted, { desc = 'toggle git show deleted' })
+
+ -- Text object
+ map({ 'o', 'x' }, 'ih', ':<C-U>Gitsigns select_hunk<CR>', { desc = 'select git hunk' })
+ end,
},
+ on_attach = function(bufnr)
+ local gs = package.loaded.gitsigns
+
+ local function map(mode, l, r, opts)
+ opts = opts or {}
+ opts.buffer = bufnr
+ vim.keymap.set(mode, l, r, opts)
+ end
+
+ -- Navigation
+ map({ 'n', 'v' }, ']c', function()
+ if vim.wo.diff then
+ return ']c'
+ end
+ vim.schedule(function()
+ gs.next_hunk()
+ end)
+ return '<Ignore>'
+ end, { expr = true, desc = 'Jump to next hunk' })
+
+ map({ 'n', 'v' }, '[c', function()
+ if vim.wo.diff then
+ return '[c'
+ end
+ vim.schedule(function()
+ gs.prev_hunk()
+ end)
+ return '<Ignore>'
+ end, { expr = true, desc = 'Jump to previous hunk' })
+
+ -- Actions
+ -- visual mode
+ map('v', '<leader>hs', function()
+ gs.stage_hunk { vim.fn.line '.', vim.fn.line 'v' }
+ end, { desc = 'stage git hunk' })
+ map('v', '<leader>hr', function()
+ gs.reset_hunk { vim.fn.line '.', vim.fn.line 'v' }
+ end, { desc = 'reset git hunk' })
+ -- normal mode
+ map('n', '<leader>hs', gs.stage_hunk, { desc = 'git stage hunk' })
+ map('n', '<leader>hr', gs.reset_hunk, { desc = 'git reset hunk' })
+ map('n', '<leader>hS', gs.stage_buffer, { desc = 'git Stage buffer' })
+ map('n', '<leader>hu', gs.undo_stage_hunk, { desc = 'undo stage hunk' })
+ map('n', '<leader>hR', gs.reset_buffer, { desc = 'git Reset buffer' })
+ map('n', '<leader>hp', gs.preview_hunk, { desc = 'preview git hunk' })
+ map('n', '<leader>hb', function()
+ gs.blame_line { full = false }
+ end, { desc = 'git blame line' })
+ map('n', '<leader>hd', gs.diffthis, { desc = 'git diff against index' })
+ map('n', '<leader>hD', function()
+ gs.diffthis '~'
+ end, { desc = 'git diff against last commit' })
+
+ -- Toggles
+ map('n', '<leader>tb', gs.toggle_current_line_blame, { desc = 'toggle git blame line' })
+ map('n', '<leader>td', gs.toggle_deleted, { desc = 'toggle git show deleted' })
+
+ -- Text object
+ map({ 'o', 'x' }, 'ih', ':<C-U>Gitsigns select_hunk<CR>', { desc = 'select git hunk' })
+ end,
},
-- NOTE: Plugins can also be configured to run lua code when they are loaded.
@@ -544,6 +616,18 @@ require('lazy').setup {
-- tsserver = {},
--