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

Improve key handling

Browse Source
This commit is contained in:
hrsh7th
2021-09-09 15:33:39 +09:00
parent ae54dcdc49
commit ff55c1bbca
1 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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
vim.api.nvim_buf_set_keymap(0, mode, '<Plug>(cmp-utils-keymap-listen-run:lhs)', existing.lhs, {
expr = false,
noremap = true,
silent = true,
})
-- TODO: Do not escape the keys inside <Cmd> ... <CR> / <C-r> = ... <CR>.
rhs = string.gsub(rhs, vim.pesc(existing.lhs), '<Plug>(cmp-utils-keymap-listen-run:lhs)')
end
vim.api.nvim_buf_set_keymap(0, mode, '<Plug>(cmp-utils-keymap-listen-run:_)', rhs, {
expr = existing.expr ~= 0, expr = existing.expr ~= 0,
noremap = existing.noremap ~= 0, noremap = existing.noremap ~= 0,
script = existing.script ~= 0, script = existing.script ~= 0,
silent = true, silent = true,
}) })
keymap.feedkeys(keymap.t('<Plug>(cmp-utils-keymap-listen-run:_)'), '') keymap.feedkeys(keymap.t('<Plug>(cmp-utils-keymap-listen-run:_)'), '')
elseif existing.noremap == 1 then
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) end)
return keymap.t('<Ignore>') return keymap.t('<Ignore>')
end) end)