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

improve

Browse Source
This commit is contained in:
hrsh7th
2022-01-31 17:02:29 +09:00
parent 55f04e49dc
commit d6838996da
1 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -130,13 +130,11 @@ keymap.fallback = function(bufnr, mode, map)
silent = map.silent and mode ~= 'c', silent = map.silent and mode ~= 'c',
}) })
vim.api.nvim_feedkeys(keymap.t(fallback_expr), 'itm', true) vim.api.nvim_feedkeys(keymap.t(fallback_expr), 'itm', true)
elseif not map.callback then
local solved = keymap.solve(bufnr, mode, map)
vim.api.nvim_feedkeys(solved.keys, solved.mode, true)
else else
if map.callback then map.callback()
map.callback()
else
local solved = keymap.solve(bufnr, mode, map)
vim.api.nvim_feedkeys(solved.keys, solved.mode, true)
end
end end
end end
end end
@@ -144,12 +142,7 @@ end
---Solve ---Solve
keymap.solve = function(bufnr, mode, map) keymap.solve = function(bufnr, mode, map)
local lhs = keymap.t(map.lhs) local lhs = keymap.t(map.lhs)
local rhs local rhs = map.expr and (map.callback and map.callback() or vim.api.nvim_eval(keymap.t(map.rhs))) or keymap.t(map.rhs)
if map.expr then
rhs = map.callback and map.callback() or vim.api.nvim_eval(keymap.t(map.rhs))
else
rhs = keymap.t(map.rhs)
end
if map.noremap then if map.noremap then
return { keys = rhs, mode = 'itn' } return { keys = rhs, mode = 'itn' }