Merge remote-tracking branch 'upstream/master' into usermarksusermarks

1 files changed, 63 insertions, 6 deletions

diff --git a/test/functional/vimscript/map_functions_spec.lua b/test/functional/vimscript/map_functions_spec.lua
index aa64006de0..ba1b4d7a76 100644
--- a/test/functional/vimscript/map_functions_spec.lua
+++ b/test/functional/vimscript/map_functions_spec.lua
@@ -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,8 @@ local meths = helpers.meths
 local nvim = helpers.nvim
 local source = helpers.source
 local command = helpers.command
+local exec_capture = helpers.exec_capture
+local pcall_err = helpers.pcall_err
 
 describe('maparg()', function()
   before_each(clear)
@@ -172,14 +176,12 @@ describe('mapset()', function()
 
   it('can restore mapping description from the dict returned by maparg()', function()
     meths.set_keymap('n', 'lhs', 'rhs', {desc = 'map description'})
-    eq('\nn  lhs           rhs\n                 map description',
-       helpers.exec_capture("nmap lhs"))
+    eq('\nn  lhs           rhs\n                 map description', exec_capture("nmap lhs"))
     local mapargs = funcs.maparg('lhs', 'n', false, true)
-    meths.del_keymap('n', 'lhs')
-    eq('\nNo mapping found', helpers.exec_capture("nmap lhs"))
+    meths.set_keymap('n', 'lhs', 'rhs', {desc = 'MAP DESCRIPTION'})
+    eq('\nn  lhs           rhs\n                 MAP DESCRIPTION', exec_capture("nmap lhs"))
     funcs.mapset('n', false, mapargs)
-    eq('\nn  lhs           rhs\n                 map description',
-       helpers.exec_capture("nmap lhs"))
+    eq('\nn  lhs           rhs\n                 map description', exec_capture("nmap lhs"))
   end)
 
   it('can restore "replace_keycodes" from the dict returned by maparg()', function()
@@ -194,4 +196,59 @@ describe('mapset()', function()
     feed('foo')
     expect('<<lt><')
   end)
+
+  it('replaces an abbreviation of the same lhs #20320', function()
+    command('inoreabbr foo bar')
+    eq('\ni  foo         * bar', exec_capture('iabbr foo'))
+    feed('ifoo ')
+    expect('bar ')
+    local mapargs = funcs.maparg('foo', 'i', true, true)
+    command('inoreabbr foo BAR')
+    eq('\ni  foo         * BAR', exec_capture('iabbr foo'))
+    feed('foo ')
+    expect('bar BAR ')
+    funcs.mapset('i', true, mapargs)
+    eq('\ni  foo         * bar', exec_capture('iabbr foo'))
+    feed('foo<Esc>')
+    expect('bar BAR bar')
+  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('Vim:E460: entries missing in mapset() dict argument',
+       pcall_err(exec_lua, [[vim.fn.mapset('n', false, {rhs = 'foo'})]]))
+    eq('Vim:E460: entries missing in mapset() dict argument',
+       pcall_err(exec_lua, [[vim.fn.mapset('n', false, {callback = function() end})]]))
+  end)
 end)