walkero
/
lite-xl
1
0
Fork 0
Code Issues 7 Pull Requests Projects Releases 17 Wiki Activity

vim-mode: accept multi-digit command multiplier

This commit is contained in:
Francesco Abbate 2021-03-25 14:22:36 +01:00
parent 40d69470fb
commit 296ea8b03d
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
data/core/keymap.lua
View File

@ -17,10 +17,14 @@ local modkey_map = {
function keymap.reset_vim_command()
keymap.command_verb = '.'
keymap.command_mult = 1
keymap.command_mult = ''
end
function keymap.vim_mult()
return keymap.command_mult == '' and 1 or tostring(keymap.command_mult)
end
local function table_find(t, e)
for i = 1, #t do
if t[i] == e then return i end
@ -136,17 +140,17 @@ function keymap.on_key_pressed(k)
local mode = core.get_editing_mode(core.active_view)
if mode == 'command' then
if keymap.command_verb == '.' and table_find(keymap.vim_verbs_imm, stroke) then
keymap.vim_execute(stroke, keymap.command_mult)
keymap.vim_execute(stroke, keymap.vim_mult())
keymap.reset_vim_command()
return true
elseif keymap.command_verb == '.' and table_find(keymap.vim_verbs_obj, stroke) then
keymap.command_verb = stroke
return true
elseif string.byte(k) >= string.byte('1') and string.byte(k) <= string.byte('9') then
keymap.command_mult = tonumber(k)
elseif string.byte(k) >= string.byte('0') and string.byte(k) <= string.byte('9') then
keymap.command_mult = keymap.command_mult .. k
return true
elseif table_find(keymap.vim_objects, stroke) then
keymap.vim_execute(keymap.command_verb, keymap.command_mult, stroke)
keymap.vim_execute(keymap.command_verb, keymap.vim_mult(), stroke)
keymap.reset_vim_command()
return true
elseif stroke == 'escape' then