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

Fix expression resolving timing

Browse Source
This commit is contained in:
hrsh7th
2022-01-15 22:56:01 +09:00
parent ec972710d3
commit 243d5f4a12
1 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -186,18 +186,12 @@ keymap.feed_map = function(map)
rhs = keymap.t(map.rhs)
end
rhs = keymap.expression(rhs)
if map.noremap then
vim.api.nvim_feedkeys(rhs, 'itn', true)
else
if string.find(rhs, lhs, 1, true) == 1 then
if not map.noremap and string.find(rhs, lhs, 1, true) == 1 then
rhs = string.gsub(rhs, '^' .. vim.pesc(lhs), '')
vim.api.nvim_feedkeys(rhs, 'itm', true)
vim.api.nvim_feedkeys(keymap.expression(rhs), 'itm', true)
vim.api.nvim_feedkeys(lhs, 'itn', true)
else
vim.api.nvim_feedkeys(rhs, 'itm', true)
end
vim.api.nvim_feedkeys(keymap.expression(rhs), 'it' .. (map.noremap and 'n' or 'm'), true)
end
end