punkfairie/marleyvim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: Set buffer on gitsigns.nvim mappings

Browse source
This commit is contained in:
punkfairie 2024-12-05 18:11:09 -08:00
parent d8949f0cee
commit c310916b13
Signed by: punkfairie
GPG key ID: A509E8F77FB9D696
1 changed files with 85 additions and 82 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

167
nvim/lua/plugins/editor/gitsigns-nvim.lua
View file

@ -27,102 +27,105 @@ return {
local icons = require('icons') local icons = require('icons')
local mkKey = MarleyVim.wkSpec(require('colors').git) local mkKey = MarleyVim.wkSpec(require('colors').git)
require('which-key').add({ require('which-key').add({
mkKey(']h', function() {
if vim.wo.diff then buffer = buf,
vim.cmd.normal({ ']c', bang = true }) mkKey(']h', function()
else if vim.wo.diff then
gitsigns.nav_hunk('next') vim.cmd.normal({ ']c', bang = true })
end else
end, icons.next, { desc = 'next hunk' }), gitsigns.nav_hunk('next')
end
end, icons.next, { desc = 'next hunk' }),
mkKey('[h', function() mkKey('[h', function()
if vim.wo.diff then if vim.wo.diff then
vim.cmd.normal({ '[c', bang = true }) vim.cmd.normal({ '[c', bang = true })
else else
gitsigns.nav_hunk('prev') gitsigns.nav_hunk('prev')
end end
end, icons.prev, { desc = 'previous hunk' }), end, icons.prev, { desc = 'previous hunk' }),
mkKey(']H', function() mkKey(']H', function()
gitsigns.nav_hunk('last') gitsigns.nav_hunk('last')
end, icons.last, { desc = 'last hunk' }), end, icons.last, { desc = 'last hunk' }),
mkKey('[H', function() mkKey('[H', function()
gitsigns.nav_hunk('first') gitsigns.nav_hunk('first')
end, icons.first, { desc = 'first hunk' }), end, icons.first, { desc = 'first hunk' }),
mkKey( mkKey(
'<LEADER>ghs', '<LEADER>ghs',
'<CMD>Gitsigns stage_hunk<CR>', '<CMD>Gitsigns stage_hunk<CR>',
icons.git.staged, icons.git.staged,
{ mode = { 'n', 'v' }, desc = 'stage hunk' } { mode = { 'n', 'v' }, desc = 'stage hunk' }
), ),
mkKey( mkKey(
'<LEADER>ghr', '<LEADER>ghr',
'<CMD>Gitsigns reset_hunk<CR>', '<CMD>Gitsigns reset_hunk<CR>',
icons.git.unstaged, icons.git.unstaged,
{ mode = { 'n', 'v' }, desc = 'reset hunk' } { mode = { 'n', 'v' }, desc = 'reset hunk' }
), ),
mkKey( mkKey(
'<LEADER>ghS', '<LEADER>ghS',
gitsigns.stage_buffer, gitsigns.stage_buffer,
icons.git.staged, icons.git.staged,
{ desc = 'stage buffer' } { desc = 'stage buffer' }
), ),
mkKey( mkKey(
'<LEADER>ghu', '<LEADER>ghu',
gitsigns.undo_stage_hunk, gitsigns.undo_stage_hunk,
icons.undo, icons.undo,
{ desc = 'undo stage hunk' } { desc = 'undo stage hunk' }
), ),
mkKey( mkKey(
'<LEADER>ghR', '<LEADER>ghR',
gitsigns.reset_buffer, gitsigns.reset_buffer,
icons.git.unstaged, icons.git.unstaged,
{ desc = 'reset buffer' } { desc = 'reset buffer' }
), ),
mkKey( mkKey(
'<LEADER>ghp', '<LEADER>ghp',
gitsigns.preview_hunk_inline, gitsigns.preview_hunk_inline,
'', '',
{ desc = 'preview hunk inline' } { desc = 'preview hunk inline' }
), ),
mkKey('<LEADER>ghb', function() mkKey('<LEADER>ghb', function()
gitsigns.blame_line({ full = true }) gitsigns.blame_line({ full = true })
end, { cat = 'filetype', name = 'git' }, { end, { cat = 'filetype', name = 'git' }, {
desc = 'blame line', desc = 'blame line',
}), }),
mkKey( mkKey(
'<LEADER>ghB', '<LEADER>ghB',
gitsigns.blame, gitsigns.blame,
{ cat = 'filetype', name = 'git' }, { cat = 'filetype', name = 'git' },
{ desc = 'blame buffer' } { desc = 'blame buffer' }
), ),
mkKey( mkKey(
'<LEADER>ghd', '<LEADER>ghd',
gitsigns.diffthis, gitsigns.diffthis,
icons.git.diff, icons.git.diff,
{ desc = 'diff file' } { desc = 'diff file' }
), ),
mkKey('<LEADER>ghD', function() mkKey('<LEADER>ghD', function()
gitsigns.diffthis('~') gitsigns.diffthis('~')
end, icons.git.diff, { desc = 'diff file from ~' }), end, icons.git.diff, { desc = 'diff file from ~' }),
mkKey( mkKey(
'ih', 'ih',
'<CMD><C-u>Gitsigns select_hunk<CR>', '<CMD><C-u>Gitsigns select_hunk<CR>',
'󰿚', '󰿚',
{ mode = { 'o', 'x' }, desc = 'select hunk' } { mode = { 'o', 'x' }, desc = 'select hunk' }
), ),
},
}) })
end, end,
}) })