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

Support macro with commit characters

Browse Source
This commit is contained in:
hrsh7th
2021-09-10 03:23:52 +09:00
parent 613328c375
commit 8fb4ee1075
1 changed files with 32 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -122,7 +122,7 @@ keymap.listen = setmetatable({
keys = keymap.to_keymap(keys) keys = keymap.to_keymap(keys)
local bufnr = vim.api.nvim_get_current_buf() local bufnr = vim.api.nvim_get_current_buf()
if keymap.listen.cache:get({ mode, bufnr, keys }) then if keymap.listen.cache:get({ 'listen', mode, bufnr, keys }) then
return return
end end
@@ -152,41 +152,50 @@ keymap.listen = setmetatable({
noremap = 1, noremap = 1,
} }
keymap.listen.cache:set({ mode, bufnr, keys }, { -- Keep existing mapping as Plug mapping.
mode = mode, local rhs = existing.rhs
existing = existing, if existing.noremap == 0 then
callback = callback, local fallback_lhs = ('<Plug>(cmp-utils-keymap-fallback-lhs:%s)'):format(existing.lhs)
vim.api.nvim_buf_set_keymap(0, mode, fallback_lhs, existing.lhs, {
expr = false,
noremap = true,
silent = true,
}) })
rhs = keymap.replace(rhs, existing.lhs, fallback_lhs)
end
local fallback = ('<Plug>(cmp-utils-keymap-listen-fallback:%s)'):format(misc.id('cmp.utils.keymap.listen.fallback'))
vim.api.nvim_buf_set_keymap(0, mode, fallback, rhs, {
expr = existing.expr ~= 0,
noremap = existing.noremap ~= 0,
script = existing.script ~= 0,
silent = true,
})
-- Hijack mapping
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", "%s")<CR>'):format(mode, str.escape(keymap.escape(keys), { '"' })), {
expr = false, expr = false,
nowait = true, nowait = true,
noremap = true, noremap = true,
silent = true, silent = true,
}) })
-- Save state.
keymap.listen.cache:set({ 'listen', mode, bufnr, keys }, {
mode = mode,
existing = existing,
callback = callback,
fallback = fallback,
})
end, end,
}) })
misc.set(_G, { 'cmp', 'utils', 'keymap', 'listen', 'run' }, function(mode, keys) misc.set(_G, { 'cmp', 'utils', 'keymap', 'listen', 'run' }, 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 fallback = keymap.listen.cache:get({ 'listen', mode, bufnr, keys }).fallback
local callback = keymap.listen.cache:get({ mode, bufnr, keys }).callback local callback = keymap.listen.cache:get({ 'listen', mode, bufnr, keys }).callback
callback(keys, function() callback(keys, function()
local rhs = existing.rhs keymap.feedkeys(keymap.t(fallback), 't')
if existing.noremap == 0 then
vim.api.nvim_buf_set_keymap(0, mode, '<Plug>(cmp-utils-keymap-listen-run:lhs)', existing.lhs, {
expr = false,
noremap = true,
silent = true,
})
rhs = keymap.replace(rhs, 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,
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)