fix: remove unused keys from mode specific keymaps

Author: Saghen

lua/blink/cmp/keymap/apply.lua

@@ -39,11 +39,7 @@ function apply.keymap_to_current_buffer(keys_to_commands)
 
   -- snippet mode: uses only snippet commands
   for key, commands in pairs(keys_to_commands) do
-    local has_snippet_command = false
-    for _, command in ipairs(commands) do
-      if vim.tbl_contains(snippet_commands, command) or type(command) == 'function' then has_snippet_command = true end
-    end
-    if not has_snippet_command or #commands == 0 then goto continue end
+    if not apply.has_snippet_commands(commands) or #commands == 0 then goto continue end
 
     local fallback = require('blink.cmp.keymap.fallback').wrap('s', key)
     apply.set('s', key, function()
@@ -77,6 +73,13 @@ function apply.has_insert_command(commands)
   return false
 end
 
+function apply.has_snippet_commands(commands)
+  for _, command in ipairs(commands) do
+    if vim.tbl_contains(snippet_commands, command) or type(command) == 'function' then return true end
+  end
+  return false
+end
+
 function apply.term_keymaps(keys_to_commands)
   -- skip if we've already applied the keymaps
   for _, mapping in ipairs(vim.api.nvim_buf_get_keymap(0, 't')) do
@@ -110,6 +113,11 @@ function apply.term_keymaps(keys_to_commands)
 end
 
 function apply.cmdline_keymaps(keys_to_commands)
+  -- skip if we've already applied the keymaps
+  for _, mapping in ipairs(vim.api.nvim_get_keymap('c')) do
+    if mapping.desc == 'blink.cmp' then return end
+  end
+
   -- cmdline mode: uses only insert commands
   for key, commands in pairs(keys_to_commands) do
     if not apply.has_insert_command(commands) or #commands == 0 then goto continue end

lua/blink/cmp/keymap/init.lua

@@ -26,10 +26,20 @@ function keymap.merge_mappings(existing_mappings, new_mappings)
   return merged_mappings
 end
 
----@param keymap_config blink.cmp.KeymapConfig
-function keymap.get_mappings(keymap_config)
+--- @param keymap_config blink.cmp.KeymapConfig
+--- @param mode blink.cmp.Mode
+function keymap.get_mappings(keymap_config, mode)
   local mappings = vim.deepcopy(keymap_config)
 
+  -- Remove unused keys
+  if mode ~= 'default' then
+    for key, commands in pairs(mappings) do
+      if key ~= 'preset' and not require('blink.cmp.keymap.apply').has_insert_command(commands) then
+        mappings[key] = nil
+      end
+    end
+  end
+
   -- Handle preset
   if mappings.preset then
     local preset_keymap = require('blink.cmp.keymap.presets').get(mappings.preset)
@@ -48,7 +58,7 @@ function keymap.setup()
   local config = require('blink.cmp.config')
   local apply = require('blink.cmp.keymap.apply')
 
-  local mappings = keymap.get_mappings(config.keymap)
+  local mappings = keymap.get_mappings(config.keymap, 'default')
 
   -- We set on the buffer directly to avoid buffer-local keymaps (such as from autopairs)
   -- from overriding our mappings. We also use InsertEnter to avoid conflicts with keymaps
@@ -70,14 +80,14 @@ function keymap.setup()
   for _, mode in ipairs({ 'cmdline', 'term' }) do
     local mode_config = config[mode]
     if mode_config.enabled then
-      local mode_keymap = mode_config.keymap
+      local mode_keymap = vim.deepcopy(mode_config.keymap)
 
       if mode_config.keymap.preset == 'inherit' then
         mode_keymap = vim.tbl_deep_extend('force', config.keymap, mode_config.keymap)
         mode_keymap.preset = config.keymap.preset
       end
 
-      local mode_mappings = keymap.get_mappings(mode_keymap)
+      local mode_mappings = keymap.get_mappings(mode_keymap, mode)
       apply[mode .. '_keymaps'](mode_mappings)
     end
   end