jank/lazy.nvim
1
0
Fork 0
mirror of https://github.com/folke/lazy.nvim.git synced 2025-06-28 19:34:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove unnecessary retrigger logic

Browse source 
we can just eval `"<Ignore>" .. lhs` to retrigger the mapping
This commit is contained in:
MurdeRM3L0DY 2023-01-20 21:43:18 +01:00
commit b9ad455e13
1 changed files with 4 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

39
lua/lazy/core/handler/keys.lua
View file

@ -27,40 +27,6 @@ function M.replace_special(feed)
return feed return feed
end end
function M.retrigger(keys)
local pending = ""
while true do
---@type number|string
local c = vim.fn.getchar(0)
if c == 0 then
break
end
c = type(c) == "number" and vim.fn.nr2char(c) or c
pending = pending .. c
end
local op = vim.v.operator
if op and op ~= "" and vim.api.nvim_get_mode().mode:find("o") then
-- we have to "<esc>" to ensure we're in normal mode
keys = "<esc>" .. op .. keys
end
local feed = keys .. pending
feed = M.replace_special(feed)
if vim.v.count ~= 0 then
feed = vim.v.count .. feed
end
vim.schedule(function()
if op == "c" then
-- offset col + 1 due to "<esc>" from insert mode
local row, col = unpack(vim.api.nvim_win_get_cursor(0))
vim.api.nvim_win_set_cursor(0, { row, col + 1 })
end
vim.api.nvim_input(feed)
end)
end
---@param value string|LazyKeys ---@param value string|LazyKeys
function M.parse(value) function M.parse(value)
local ret = vim.deepcopy(value) local ret = vim.deepcopy(value)
@ -110,6 +76,8 @@ end
function M:_add(keys) function M:_add(keys)
local lhs = keys[1] local lhs = keys[1]
local opts = M.opts(keys) local opts = M.opts(keys)
opts.remap = true
opts.expr = true
vim.keymap.set(keys.mode, lhs, function() vim.keymap.set(keys.mode, lhs, function()
local plugins = self.active[keys.id] local plugins = self.active[keys.id]
@ -119,8 +87,9 @@ function M:_add(keys)
Util.track({ keys = lhs }) Util.track({ keys = lhs })
Loader.load(plugins, { keys = lhs }) Loader.load(plugins, { keys = lhs })
M.retrigger(lhs)
Util.track() Util.track()
return "<Ignore>" .. lhs
end, opts) end, opts)
end end