fix: missing buffer-based keymap registrations

Author: AntoineGS

lua/copilot/keymaps/init.lua

@@ -8,13 +8,14 @@ local previous_keymaps = {}
 ---@param key string
 ---@param action function
 ---@param desc string
-function M.register_keymap(mode, key, action, desc)
+---@param bufnr integer
+function M.register_keymap(mode, key, action, desc, bufnr)
   if not key then
     return
   end
 
   if not mode or not action then
-    logger.error("Invalid parameters to register_keymap" .. vim.inspect({ mode, key, action, desc }))
+    logger.error("Invalid parameters to register_keymap" .. vim.inspect({ mode, key, action, desc, bufnr }))
     return
   end
 
@@ -23,6 +24,7 @@ function M.register_keymap(mode, key, action, desc)
   end, {
     desc = desc,
     silent = true,
+    buffer = bufnr,
   })
 end
 
@@ -99,14 +101,15 @@ function M.unset_keymap_if_exists(mode, key, bufnr)
     return
   end
 
-  local ok, err = pcall(vim.api.nvim_del_buf_keymap, bufnr, mode, key)
+  local ok, err = pcall(vim.api.nvim_buf_del_keymap, bufnr, mode, key)
 
   if not ok then
     local suggestion_keymaps = config.suggestion.keymap or {}
+    local nes_keymaps = config.nes.keymap or {}
     local panel_keymaps = config.panel.keymap or {}
     local found = false
 
-    for _, tbl in ipairs({ suggestion_keymaps, panel_keymaps }) do
+    for _, tbl in ipairs({ suggestion_keymaps, nes_keymaps, panel_keymaps }) do
       for _, v in pairs(tbl) do
         if v == key then
           if found then
@@ -119,7 +122,7 @@ function M.unset_keymap_if_exists(mode, key, bufnr)
       end
     end
 
-    logger.error("Could not unset keymap for " .. mode .. " " .. key .. ": " .. err)
+    logger.error("Could not unset keymap for " .. mode .. " " .. key .. ", bufnr " .. bufnr .. ": " .. err)
   end
 end
 

tests/test_keymaps.lua

@@ -21,7 +21,7 @@ T["keymaps()"]["passthrough Esc - base test setting highlight"] = function()
   child.lua([[
     require("copilot.keymaps").register_keymap_with_passthrough("n", "<Esc>", function()
       return true
-    end, "Passthrough Esc")
+    end, "Passthrough Esc", vim.api.nvim_get_current_buf())
   ]])
   child.type_keys("i123", "<Esc>", "o456", "<Esc>")
   child.type_keys("/123", "<CR>")
@@ -37,7 +37,7 @@ T["keymaps()"]["passthrough Esc with func - return false, will remove hl"] = fun
   child.lua([[
     require("copilot.keymaps").register_keymap_with_passthrough("n", "<esc>", function()
       return false
-    end, "Passthrough Esc")
+    end, "Passthrough Esc", vim.api.nvim_get_current_buf())
   ]])
   child.type_keys("i123", "<Esc>", "o456", "<Esc>")
   child.type_keys("/123", "<CR>")
@@ -50,9 +50,9 @@ T["keymaps()"]["passthrough Esc - return false, will remove hl"] = function()
   child.o.lines, child.o.columns = 10, 15
   child.lua([[vim.keymap.set("n", "<Esc>", "<cmd>noh<CR>", { desc = "general clear highlights" })]])
   child.lua([[
-    require("copilot.keymaps").register_keymap_with_passthrough("n", "<Esc>", function()
+    require("copilot.keymaps").register_keymap_with_passthrough("n", "<esc>", function()
       return false
-    end, "Passthrough Esc")
+    end, "Passthrough Esc", vim.api.nvim_get_current_buf())
   ]])
   child.type_keys("i123", "<Esc>", "o456", "<Esc>")
   child.type_keys("/123", "<CR>")
@@ -67,7 +67,7 @@ T["keymaps()"]["passthrough Esc - return true, will not remove hl"] = function()
   child.lua([[
     require("copilot.keymaps").register_keymap_with_passthrough("n", "<Esc>", function()
       return true
-    end, "Passthrough Esc")
+    end, "Passthrough Esc", vim.api.nvim_get_current_buf())
   ]])
   child.type_keys("i123", "<Esc>", "o456", "<Esc>")
   child.type_keys("/123", "<CR>")