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

Fix keymap bug

Browse Source
This commit is contained in:
hrsh7th
2021-09-19 13:40:27 +09:00
parent 7c8876330d
commit 13e8b61371
2 changed files with 5 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lua/cmp/core.lua
View File

@@ -142,7 +142,7 @@ end
---Keypress handler ---Keypress handler
core.on_keymap = function(keys, fallback) core.on_keymap = function(keys, fallback)
for key, action in pairs(config.get().mapping) do for key, action in pairs(config.get().mapping) do
if key == keys then if keymap.equals(key, keys) then
if type(action) == 'function' then if type(action) == 'function' then
action(fallback) action(fallback)
else else

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

@@ -54,30 +54,7 @@ end
---@param b string ---@param b string
---@return boolean ---@return boolean
keymap.equals = function(a, b) keymap.equals = function(a, b)
return keymap.to_upper(a) == keymap.to_upper(b) return keymap.t(a) == keymap.t(b)
end
---Return upper case key sequence.
---@param keys string
---@return string
keymap.to_upper = function(keys)
local result = {}
local ctrl = false
for i = 1, #keys do
local c = string.sub(keys, i, i)
if c == '<' then
table.insert(result, c)
ctrl = true
elseif ctrl and c ~= '>' then
table.insert(result, string.upper(c))
elseif ctrl and c == '>' then
table.insert(result, c)
ctrl = false
else
table.insert(result, c)
end
end
return table.concat(result, '')
end end
---Feedkeys with callback ---Feedkeys with callback
@@ -121,7 +98,7 @@ keymap.listen = setmetatable({
cache = cache.new(), cache = cache.new(),
}, { }, {
__call = function(self, mode, keys, callback) __call = function(self, mode, keys, callback)
keys = keymap.to_upper(keymap.to_keymap(keys)) keys = keymap.to_keymap(keys)
local existing = keymap.find_map_by_lhs(mode, keys) local existing = keymap.find_map_by_lhs(mode, keys)
if string.match(existing.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
@@ -193,21 +170,17 @@ end
keymap.find_map_by_lhs = function(mode, lhs) keymap.find_map_by_lhs = function(mode, lhs)
for _, map in ipairs(vim.api.nvim_buf_get_keymap(0, mode)) do for _, map in ipairs(vim.api.nvim_buf_get_keymap(0, mode)) do
if keymap.equals(map.lhs, lhs) then if keymap.equals(map.lhs, lhs) then
map.lhs = keymap.to_upper(map.lhs)
map.rhs = keymap.to_upper(map.rhs)
return map return map
end end
end end
for _, map in ipairs(vim.api.nvim_get_keymap(mode)) do for _, map in ipairs(vim.api.nvim_get_keymap(mode)) do
if keymap.equals(map.lhs, lhs) then if keymap.equals(map.lhs, lhs) then
map.lhs = keymap.to_upper(map.lhs)
map.rhs = keymap.to_upper(map.rhs)
return map return map
end end
end end
return { return {
lhs = keymap.to_upper(lhs), lhs = lhs,
rhs = keymap.to_upper(lhs), rhs = lhs,
expr = 0, expr = 0,
script = 0, script = 0,
noremap = 1, noremap = 1,