fix(completion): prevent K_LUA from closing pum

zeertzjq · zeertzjq · commit 42e5fd32b0f5 · 2022-01-10T21:30:32.000+08:00
diff --git a/src/nvim/edit.c b/src/nvim/edit.c
@@ -3620,7 +3620,7 @@ static bool ins_compl_prep(int c)
   // Ignore end of Select mode mapping and mouse scroll buttons.
   if (c == K_SELECT || c == K_MOUSEDOWN || c == K_MOUSEUP
       || c == K_MOUSELEFT || c == K_MOUSERIGHT || c == K_EVENT
-      || c == K_COMMAND) {
+      || c == K_COMMAND || c == K_LUA) {
     return retval;
   }
 
diff --git a/test/functional/api/keymap_spec.lua b/test/functional/api/keymap_spec.lua
@@ -820,6 +820,16 @@ describe('nvim_set_keymap, nvim_del_keymap', function()
     eq(99, exec_lua[[return SomeValue]])
   end)
 
+  it('does not reset pum in lua mapping', function()
+    eq(0, exec_lua [[
+      VisibleCount = 0
+      vim.api.nvim_set_keymap ('i', '<F2>', '', {callback = function() VisibleCount = VisibleCount + vim.fn.pumvisible() end})
+      return VisibleCount
+    ]])
+    feed('i<C-X><C-V><F2><F2><esc>')
+    eq(2, exec_lua[[return VisibleCount]])
+  end)
+
   it('can overwrite lua mappings', function()
     eq(0, exec_lua [[
       GlobalCount = 0

Original file line number	Diff line number	Diff line change
`@@ -3620,7 +3620,7 @@ static bool ins_compl_prep(int c)`
`3620`	`3620`	`// Ignore end of Select mode mapping and mouse scroll buttons.`
`3621`	`3621`	`if (c == K_SELECT \|\| c == K_MOUSEDOWN \|\| c == K_MOUSEUP`
`3622`	`3622`	`\|\| c == K_MOUSELEFT \|\| c == K_MOUSERIGHT \|\| c == K_EVENT`
`3623`		`- \|\| c == K_COMMAND) {`
	`3623`	`+ \|\| c == K_COMMAND \|\| c == K_LUA) {`
`3624`	`3624`	`return retval;`
`3625`	`3625`	`}`
`3626`	`3626`