refactor(actions): use vim.keymap.set/del

lua/nvim-tree/actions/init.lua

@@ -3,7 +3,6 @@ local a = vim.api
 local log = require "nvim-tree.log"
 local view = require "nvim-tree.view"
 local util = require "nvim-tree.utils"
-local nvim_tree_callback = require("nvim-tree.config").nvim_tree_callback
 
 -- BEGIN_DEFAULT_MAPPINGS
 local DEFAULT_MAPPINGS = {
@@ -240,15 +239,32 @@ local M = {
   custom_keypress_funcs = {},
 }
 
+local function set_map_for(bufnr)
+  local opts = { noremap = true, silent = true, nowait = true, buffer = bufnr }
+  return function(mode, rhs)
+    return function(lhs)
+      vim.keymap.set(mode or "n", lhs, rhs, opts)
+    end
+  end
+end
+
+local function run_dispatch(action)
+  return function()
+    require("nvim-tree.actions.dispatch").dispatch(action)
+  end
+end
+
 function M.apply_mappings(bufnr)
+  local setter_for = set_map_for(bufnr)
   for _, b in pairs(M.mappings) do
-    local mapping_rhs = b.cb or nvim_tree_callback(b.action)
+    local rhs = b.cb or run_dispatch(b.action)
-    if type(b.key) == "table" then
+    if rhs then
-      for _, key in pairs(b.key) do
+      local setter = setter_for(b.mode, rhs)
-        a.nvim_buf_set_keymap(bufnr, b.mode or "n", key, mapping_rhs, { noremap = true, silent = true, nowait = true })
+
+      local keys = type(b.key) == "table" and b.key or { b.key }
+      for _, key in pairs(keys) do
+        setter(key)
       end
-    elseif mapping_rhs then
-      a.nvim_buf_set_keymap(bufnr, b.mode or "n", b.key, mapping_rhs, { noremap = true, silent = true, nowait = true })
     end
   end
 end
@@ -330,13 +346,11 @@ local function cleanup_existing_mappings()
   if bufnr == nil or not a.nvim_buf_is_valid(bufnr) then
     return
   end
+
   for _, b in pairs(M.mappings) do
-    if type(b.key) == "table" then
+    local keys = type(b.key) == "table" and b.key or { b.key }
-      for _, key in pairs(b.key) do
+    for _, key in pairs(keys) do
-        a.nvim_buf_del_keymap(bufnr, b.mode or "n", key)
+      vim.keymap.del(b.mode or "n", key, { buffer = bufnr })
-      end
-    else
-      a.nvim_buf_del_keymap(bufnr, b.mode or "n", b.key)
     end
   end
 end