Improve key handling
This commit is contained in:
@@ -142,24 +142,23 @@ misc.set(_G, { 'cmp', 'utils', 'keymap', 'listen', 'run' }, function(mode, keys)
|
|||||||
local existing = keymap.listen.cache:get({ mode, bufnr, keys }).existing
|
local existing = keymap.listen.cache:get({ mode, bufnr, keys }).existing
|
||||||
local callback = keymap.listen.cache:get({ mode, bufnr, keys }).callback
|
local callback = keymap.listen.cache:get({ mode, bufnr, keys }).callback
|
||||||
callback(keys, function()
|
callback(keys, function()
|
||||||
if existing.expr == 1 or existing.script == 1 then
|
local rhs = existing.rhs
|
||||||
vim.api.nvim_buf_set_keymap(0, mode, '<Plug>(cmp-utils-keymap-listen-run:_)', existing.rhs, {
|
if existing.noremap ~= 1 then
|
||||||
expr = existing.expr ~= 0,
|
vim.api.nvim_buf_set_keymap(0, mode, '<Plug>(cmp-utils-keymap-listen-run:lhs)', existing.lhs, {
|
||||||
noremap = existing.noremap ~= 0,
|
expr = false,
|
||||||
script = existing.script ~= 0,
|
noremap = true,
|
||||||
silent = true,
|
silent = true,
|
||||||
})
|
})
|
||||||
keymap.feedkeys(keymap.t('<Plug>(cmp-utils-keymap-listen-run:_)'), '')
|
-- TODO: Do not escape the keys inside <Cmd> ... <CR> / <C-r> = ... <CR>.
|
||||||
elseif existing.noremap == 1 then
|
rhs = string.gsub(rhs, vim.pesc(existing.lhs), '<Plug>(cmp-utils-keymap-listen-run:lhs)')
|
||||||
keymap.feedkeys(keymap.t(existing.rhs), 'n')
|
|
||||||
else
|
|
||||||
for i, keys_ in ipairs(vim.split(existing.rhs, existing.lhs, true)) do
|
|
||||||
if i ~= 1 then
|
|
||||||
keymap.feedkeys(keymap.t(existing.lhs), 'n')
|
|
||||||
end
|
|
||||||
keymap.feedkeys(keymap.t(keys_), '')
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
vim.api.nvim_buf_set_keymap(0, mode, '<Plug>(cmp-utils-keymap-listen-run:_)', rhs, {
|
||||||
|
expr = existing.expr ~= 0,
|
||||||
|
noremap = existing.noremap ~= 0,
|
||||||
|
script = existing.script ~= 0,
|
||||||
|
silent = true,
|
||||||
|
})
|
||||||
|
keymap.feedkeys(keymap.t('<Plug>(cmp-utils-keymap-listen-run:_)'), '')
|
||||||
end)
|
end)
|
||||||
return keymap.t('<Ignore>')
|
return keymap.t('<Ignore>')
|
||||||
end)
|
end)
|
||||||
|
|||||||
Reference in New Issue
Block a user