leigh/nvim-cmp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reduce flicker if not macro recording

Browse Source
This commit is contained in:
hrsh7th
2021-09-03 13:43:29 +09:00
parent 4f14279408
commit 2b48c15ca0
1 changed files with 32 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
lua/cmp/utils/keymap.lua
View File

@@ -50,22 +50,39 @@ keymap.to_keymap = function(s)
end end
---Feedkeys with callback ---Feedkeys with callback
keymap.feedkeys = function(keys, mode, callback) keymap.feedkeys = setmetatable({
if #keys ~= 0 then callbacks = {}
vim.fn.feedkeys(keys, mode) }, {
end __call = function(self, keys, mode, callback)
if callback then if #keys ~= 0 then
local wait vim.api.nvim_feedkeys(keys, mode, true)
wait = vim.schedule_wrap(function() end
if vim.fn.getchar(1) == 0 then if callback then
callback() if vim.fn.reg_recording() == '' then
local id = misc.id('cmp.utils.keymap.feedkeys')
self.callbacks[id] = callback
vim.api.nvim_feedkeys(keymap.t('<Cmd>call v:lua.cmp.utils.keymap.feedkeys.run(%s)<CR>'):format(id), 'n', true)
else else
vim.defer_fn(wait, 1) -- Does not feed extra keys if macro recording.
local wait
wait = vim.schedule_wrap(function()
if vim.fn.getchar(1) == 0 then
return callback()
end
vim.defer_fn(wait, 1)
end)
wait()
end end
end) end
wait()
end end
end })
misc.set(_G, { 'cmp', 'utils', 'keymap', 'feedkeys', 'run' }, function(id)
if keymap.feedkeys.callbacks[id] then
keymap.feedkeys.callbacks[id]()
keymap.feedkeys.callbacks[id] = nil
end
return ''
end)
---Register keypress handler. ---Register keypress handler.
keymap.listen = setmetatable({ keymap.listen = setmetatable({
@@ -110,7 +127,7 @@ keymap.listen = setmetatable({
existing = existing, existing = existing,
callback = callback, callback = callback,
}) })
vim.api.nvim_buf_set_keymap(0, mode, keys, ('v:lua.cmp.utils.keymap.expr("%s", "%s")'):format(mode, str.escape(keymap.escape(keys), { '"' })), { vim.api.nvim_buf_set_keymap(0, mode, keys, ('v:lua.cmp.utils.keymap.listen.expr("%s", "%s")'):format(mode, str.escape(keymap.escape(keys), { '"' })), {
expr = true, expr = true,
nowait = true, nowait = true,
noremap = true, noremap = true,
@@ -118,7 +135,7 @@ keymap.listen = setmetatable({
}) })
end, end,
}) })
misc.set(_G, { 'cmp', 'utils', 'keymap', 'expr' }, function(mode, keys) misc.set(_G, { 'cmp', 'utils', 'keymap', 'listen', 'expr' }, function(mode, keys)
local bufnr = vim.api.nvim_get_current_buf() local bufnr = vim.api.nvim_get_current_buf()
local existing = keymap.listen.cache:get({ mode, bufnr, keys }).existing local existing = keymap.listen.cache:get({ mode, bufnr, keys }).existing