feat: gitsigns & treesitter

update gitsigns mapping, rm treesitter-refactor

Author: aceforeverd

lua/aceforeverd/config/treesitter.lua

@@ -47,21 +47,6 @@ function M.setup()
       enable = false,
     },
     matchup = { enable = true },
-    refactor = {
-      highlight_definitions = { enable = false },
-      highlight_current_scope = { enable = false },
-      smart_rename = { enable = true, keymaps = { smart_rename = '<Leader>rt' } },
-      navigation = {
-        enable = true,
-        keymaps = {
-          goto_definition = '<space>gl',
-          list_definitions = '<space>gL',
-          list_definitions_toc = 'gO',
-          goto_next_usage = '<a-*>',
-          goto_previous_usage = '<a-#>',
-        },
-      },
-    },
     textobjects = {
       move = {
         enable = true,

lua/aceforeverd/integration/git.lua

@@ -25,34 +25,36 @@ function M.gitsigns()
       local map = function(mode, l, r, opts)
         opts = opts or {}
         opts.buffer = bufnr
-        require('aceforeverd.util.map').set_map(mode, l, r, opts)
+        vim.keymap.set(mode, l, r, opts)
       end
       local gs = package.loaded.gitsigns
 
       -- Navigation
       map('n', ']c', function()
         if vim.wo.diff then
-          return ']c'
+          vim.cmd.normal({ ']c', bang = true })
+        else
+          gs.nav_hunk('next')
         end
-        vim.schedule(function()
-          gs.next_hunk()
-        end)
-        return '<Ignore>'
-      end, { expr = true })
+      end)
 
       map('n', '[c', function()
         if vim.wo.diff then
-          return '[c'
+          vim.cmd.normal({ ']c', bang = true })
+        else
+          gs.nav_hunk('next')
         end
-        vim.schedule(function()
-          gs.prev_hunk()
-        end)
-        return '<Ignore>'
-      end, { expr = true })
+      end)
 
       -- Actions
-      map({ 'n', 'v' }, '<leader>hs', ':Gitsigns stage_hunk<CR>')
-      map({ 'n', 'v' }, '<leader>hr', ':Gitsigns reset_hunk<CR>')
+      map('n', '<leader>hs', gs.stage_hunk)
+      map('n', '<leader>hr', gs.reset_hunk)
+      map('v', '<leader>hs', function()
+        gs.stage_hunk({ vim.fn.line('.'), vim.fn.line('v') })
+      end)
+      map('v', '<leader>hr', function()
+        gs.reset_hunk({ vim.fn.line('.'), vim.fn.line('v') })
+      end)
       map('n', '<leader>hS', gs.stage_buffer)
       map('n', '<leader>hu', gs.undo_stage_hunk)
       map('n', '<leader>hR', gs.reset_buffer)

lua/aceforeverd/plugins/init.lua

@@ -439,7 +439,6 @@ M.plugin_list = {
     'nvim-treesitter/nvim-treesitter',
     dependencies = {
       'nvim-treesitter/nvim-treesitter-textobjects',
-      'nvim-treesitter/nvim-treesitter-refactor',
       'RRethy/nvim-treesitter-textsubjects',
       'RRethy/nvim-treesitter-endwise',
       'windwp/nvim-ts-autotag',