Fix #279

lua/cmp/context.lua

@@ -38,7 +38,7 @@ context.new = function(prev_context, option)
   option = option or {}
 
   local self = setmetatable({}, { __index = context })
-  self.id = misc.id('context')
+  self.id = misc.id('cmp.context.new')
   self.cache = cache.new()
   self.prev_context = prev_context or context.empty()
   self.option = option or { reason = types.cmp.ContextReason.None }

lua/cmp/entry.lua

@@ -32,7 +32,7 @@ local entry = {}
 ---@return cmp.Entry
 entry.new = function(ctx, source, completion_item)
   local self = setmetatable({}, { __index = entry })
-  self.id = misc.id('entry')
+  self.id = misc.id('entry.new')
   self.cache = cache.new()
   self.match_cache = cache.new()
   self.score = 0

lua/cmp/source.lua

@@ -34,7 +34,7 @@ source.SourceStatus.COMPLETED = 3
 ---@return cmp.Source
 source.new = function(name, s)
   local self = setmetatable({}, { __index = source })
-  self.id = misc.id('source')
+  self.id = misc.id('cmp.source.new')
   self.name = name
   self.source = s
   self.cache = cache.new()

lua/cmp/utils/keymap.lua

@@ -136,46 +136,42 @@ end)
 keymap.listen = setmetatable({
   cache = cache.new(),
 }, {
-  __call = function(self, mode, keys, callback)
+  __call = function(self, mode, keys_or_chars, callback)
-    keys = keymap.to_keymap(keys)
+    local keys = keymap.to_keymap(keys_or_chars)
-
     local bufnr = vim.api.nvim_get_current_buf()
     local existing = keymap.find_map_by_lhs(mode, keys)
 
     local done = true
     done = done and string.match(existing.rhs, vim.pesc('v:lua.cmp.utils.keymap.listen.run'))
-    done = done and self.cache:get({ mode, bufnr, keys }) ~= nil
+    done = done and self.cache:get({ 'id', mode, bufnr, keys }) ~= nil
     if done then
       return
     end
+    self.cache:set({ 'id', mode, bufnr, keys }, misc.id('cmp.utils.keymap.listen'))
 
     local fallback = keymap.evacuate(mode, keys)
-    vim.api.nvim_buf_set_keymap(0, mode, keys, ('<Cmd>call v:lua.cmp.utils.keymap.listen.run("%s", "%s")<CR>'):format(mode, str.escape(keymap.escape(keys), { '"' })), {
+    vim.api.nvim_buf_set_keymap(0, mode, keys, ('<Cmd>call v:lua.cmp.utils.keymap.listen.run(%s)<CR>'):format(self.cache:get({ 'id', mode, bufnr, keys })), {
       expr = false,
       noremap = true,
       silent = true,
       nowait = true,
     })
 
-    self.cache:set({ mode, bufnr, keys }, {
+    self.cache:set({ 'definition', self.cache:get({ 'id', mode, bufnr, keys }) }, {
+      keys = keys,
       mode = mode,
+      bufnr = bufnr,
       callback = callback,
       fallback = fallback,
       existing = existing,
     })
   end,
 })
-misc.set(_G, { 'cmp', 'utils', 'keymap', 'listen', 'run' }, function(mode, keys)
+misc.set(_G, { 'cmp', 'utils', 'keymap', 'listen', 'run' }, function(id)
-  local bufnr = vim.api.nvim_get_current_buf()
+  local definition = keymap.listen.cache:get({ 'definition', id })
-  local fallback = keymap.listen.cache:get({ mode, bufnr, keys }).fallback
+  definition.callback(definition.keys, misc.once(function()
-  local callback = keymap.listen.cache:get({ mode, bufnr, keys }).callback
+    keymap.feedkeys(keymap.t(definition.fallback), 'i')
-  local done = false
+  end))
-  callback(keys, function()
-    if not done then
-      done = true
-      keymap.feedkeys(keymap.t(fallback), 'i')
-    end
-  end)
   return keymap.t('<Ignore>')
 end)
 

lua/cmp/utils/misc.lua

@@ -1,5 +1,19 @@
 local misc = {}
 
+---Create once callback
+---@param callback function
+---@return function
+misc.once = function(callback)
+  local done = false
+  return function()
+    if done then
+      return
+    end
+    done = true
+    callback()
+  end
+end
+
 ---Return concatenated list
 ---@param list1 any[]
 ---@param list2 any[]

lua/cmp/utils/str_spec.lua

@@ -25,5 +25,6 @@ describe('utils.str', function()
     assert.are.equal(str.escape('plain\\', {}), 'plain\\\\')
     assert.are.equal(str.escape('plain\\"', {}), 'plain\\\\"')
     assert.are.equal(str.escape('pla"in', { '"' }), 'pla\\"in')
+    assert.are.equal(str.escape('call("")', { '"' }), 'call(\\"\\")')
   end)
 end)

lua/cmp/utils/window.lua

@@ -24,7 +24,7 @@ local window = {}
 ---@return cmp.Window
 window.new = function()
   local self = setmetatable({}, { __index = window })
-  self.name = misc.id('cmp.utils.window')
+  self.name = misc.id('cmp.utils.window.new')
   self.win = nil
   self.swin1 = nil
   self.swin2 = nil