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

Fix macro again

Browse Source
This commit is contained in:
hrsh7th
2021-09-14 03:09:31 +09:00
parent 6fa1e70b48
commit a212356641
2 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -92,8 +92,8 @@ keymap.listen = setmetatable({
__call = function(self, mode, keys, callback) __call = function(self, mode, keys, callback)
keys = keymap.to_keymap(keys) keys = keymap.to_keymap(keys)
local origin = keymap.find_map_by_lhs(mode, keys) local existing = keymap.find_map_by_lhs(mode, keys)
if string.match(origin.rhs, '^.*' .. vim.pesc('v:lua.cmp.utils.keymap.listen.run') .. '.*$') then if string.match(existing.rhs, '^.*' .. vim.pesc('v:lua.cmp.utils.keymap.listen.run') .. '.*$') then
return return
end end
@@ -110,6 +110,7 @@ keymap.listen = setmetatable({
mode = mode, mode = mode,
callback = callback, callback = callback,
fallback = fallback, fallback = fallback,
existing = existing,
}) })
end, end,
}) })
@@ -118,11 +119,7 @@ misc.set(_G, { 'cmp', 'utils', 'keymap', 'listen', 'run' }, function(mode, keys)
local fallback = keymap.listen.cache:get({ mode, bufnr, keys }).fallback local fallback = keymap.listen.cache:get({ mode, bufnr, keys }).fallback
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 keymap.find_map_by_lhs(mode, fallback) then keymap.feedkeys(keymap.t(fallback), 'i')
keymap.feedkeys(keymap.t(fallback), 't')
else
keymap.feedkeys(keymap.t(keys), 'nt')
end
end) end)
return keymap.t('<Ignore>') return keymap.t('<Ignore>')
end) end)
@@ -133,10 +130,11 @@ end)
---@return string ---@return string
keymap.evacuate = function(mode, lhs) keymap.evacuate = function(mode, lhs)
local map = keymap.find_map_by_lhs(mode, lhs) local map = keymap.find_map_by_lhs(mode, lhs)
-- Keep existing mapping as <Plug> mapping. We escape fisrt recursive key sequence. See `:help recursive_mapping`) -- Keep existing mapping as <Plug> mapping. We escape fisrt recursive key sequence. See `:help recursive_mapping`)
local rhs = map.rhs local rhs = map.rhs
if map.noremap == 0 then if map.noremap == 0 then
local fallback_lhs = ('<Plug>(cmp-utils-keymap-listen-lhs:%s)'):format(misc.id('cmp.utils.keymap.listen.lhs')) local fallback_lhs = ('<Plug>(cmp-utils-keymap-listen-lhs:%s)'):format(map.lhs)
vim.api.nvim_buf_set_keymap(0, mode, fallback_lhs, map.lhs, { vim.api.nvim_buf_set_keymap(0, mode, fallback_lhs, map.lhs, {
expr = false, expr = false,
noremap = true, noremap = true,
@@ -146,7 +144,7 @@ keymap.evacuate = function(mode, lhs)
rhs = string.gsub(rhs, '^' .. vim.pesc(map.lhs), fallback_lhs) rhs = string.gsub(rhs, '^' .. vim.pesc(map.lhs), fallback_lhs)
end end
local fallback = ('<Plug>(cmp-utils-keymap-listen-rhs:%s)'):format(misc.id('cmp.utils.keymap.listen.rhs')) local fallback = ('<Plug>(cmp-utils-keymap-listen-rhs:%s)'):format(map.lhs)
vim.api.nvim_buf_set_keymap(0, mode, fallback, rhs, { vim.api.nvim_buf_set_keymap(0, mode, fallback, rhs, {
expr = map.expr ~= 0, expr = map.expr ~= 0,
noremap = map.noremap ~= 0, noremap = map.noremap ~= 0,

2
lua/cmp/utils/misc.lua
View File

@@ -53,7 +53,7 @@ misc.id = setmetatable({
group = {}, group = {},
}, { }, {
__call = function(_, group) __call = function(_, group)
misc.id.group[group] = misc.id.group[group] or 0 misc.id.group[group] = misc.id.group[group] or vim.loop.now()
misc.id.group[group] = misc.id.group[group] + 1 misc.id.group[group] = misc.id.group[group] + 1
return misc.id.group[group] return misc.id.group[group]
end, end,