mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-06 19:38:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(mapset): support restoring Lua callback (#20024)

Browse Source 
vim-patch:9.0.0341: mapset() does not restore <Nop> mapping properly

Problem:    mapset() does not restore <Nop> mapping properly.
Solution:   Use an empty string for <Nop>. (closes vim/vim#11022)
92a3d20682
This commit is contained in:
zeertzjq
2022-09-01 06:19:49 +08:00
committed by GitHub
parent c0050b71e5
commit 0c6b39894f
4 changed files with 100 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
test/functional/vimscript/map_functions_spec.lua
View File

@@ -3,6 +3,8 @@ local helpers = require('test.functional.helpers')(after_each)
local clear = helpers.clear
local eq = helpers.eq
local eval = helpers.eval
local exec = helpers.exec
local exec_lua = helpers.exec_lua
local expect = helpers.expect
local feed = helpers.feed
local funcs = helpers.funcs
@@ -10,6 +12,7 @@ local meths = helpers.meths
local nvim = helpers.nvim
local source = helpers.source
local command = helpers.command
local pcall_err = helpers.pcall_err
describe('maparg()', function()
before_each(clear)
@@ -194,4 +197,43 @@ describe('mapset()', function()
feed('foo')
expect('<<lt><')
end)
it('can restore Lua callback from the dict returned by maparg()', function()
eq(0, exec_lua([[
GlobalCount = 0
vim.api.nvim_set_keymap('n', 'asdf', '', {callback = function() GlobalCount = GlobalCount + 1 end })
return GlobalCount
]]))
feed('asdf')
eq(1, exec_lua([[return GlobalCount]]))
exec_lua([[
_G.saved_asdf_map = vim.fn.maparg('asdf', 'n', false, true)
vim.api.nvim_set_keymap('n', 'asdf', '', {callback = function() GlobalCount = GlobalCount + 10 end })
]])
feed('asdf')
eq(11, exec_lua([[return GlobalCount]]))
exec_lua([[vim.fn.mapset('n', false, _G.saved_asdf_map)]])
feed('asdf')
eq(12, exec_lua([[return GlobalCount]]))
exec([[
let g:saved_asdf_map = maparg('asdf', 'n', v:false, v:true)
lua vim.api.nvim_set_keymap('n', 'asdf', '', {callback = function() GlobalCount = GlobalCount + 10 end })
]])
feed('asdf')
eq(22, exec_lua([[return GlobalCount]]))
command([[call mapset('n', v:false, g:saved_asdf_map)]])
feed('asdf')
eq(23, exec_lua([[return GlobalCount]]))
end)
it('does not leak memory if lhs is missing', function()
eq('Error executing lua: Vim:E460: entries missing in mapset() dict argument',
pcall_err(exec_lua, [[vim.fn.mapset('n', false, {rhs = 'foo'})]]))
eq('Error executing lua: Vim:E460: entries missing in mapset() dict argument',
pcall_err(exec_lua, [[vim.fn.mapset('n', false, {callback = function() end})]]))
end)
end)