aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorzeertzjq <zeertzjq@outlook.com>2022-08-01 14:04:55 +0800
committerzeertzjq <zeertzjq@outlook.com>2022-08-01 21:54:18 +0800
commit6963c2bdcd3cc2a2f0466b23152e80fc0d037a2c (patch)
tree6f59c3dbb1e255f1727257bd46cf945a2976f200 /test
parent5c72640bc2b60a018ccfcf18bca809b635f250f6 (diff)
downloadrneovim-6963c2bdcd3cc2a2f0466b23152e80fc0d037a2c.tar.gz
rneovim-6963c2bdcd3cc2a2f0466b23152e80fc0d037a2c.tar.bz2
rneovim-6963c2bdcd3cc2a2f0466b23152e80fc0d037a2c.zip
vim-patch:8.2.0815: maparg() does not provide enough information for mapset()
Problem: maparg() does not provide enough information for mapset(). Solution: Add "lhsraw" and "lhsrawalt" items. Drop "simplified" https://github.com/vim/vim/commit/9c65253fe702ea010afec11aa971acd542c35de2 vim-patch:9.0.0127: unused variable Problem: Unused variable. Solution: Remove the variable. (closes vim/vim#10829) https://github.com/vim/vim/commit/e95f22f63a1871b91e5508088e5ae4905ce28cd7
Diffstat (limited to 'test')
-rw-r--r--test/functional/legacy/075_maparg_spec.lua59
-rw-r--r--test/functional/vimscript/map_functions_spec.lua2
2 files changed, 2 insertions, 59 deletions
diff --git a/test/functional/legacy/075_maparg_spec.lua b/test/functional/legacy/075_maparg_spec.lua
deleted file mode 100644
index ad6c190104..0000000000
--- a/test/functional/legacy/075_maparg_spec.lua
+++ /dev/null
@@ -1,59 +0,0 @@
--- Tests for maparg().
--- Also test utf8 map with a 0x80 byte.
-
-local helpers = require('test.functional.helpers')(after_each)
-local clear, feed = helpers.clear, helpers.feed
-local command, expect = helpers.command, helpers.expect
-local poke_eventloop = helpers.poke_eventloop
-
-describe('maparg()', function()
- setup(clear)
-
- it('is working', function()
- command('set cpo-=<')
-
- -- Test maparg() with a string result
- command('map foo<C-V> is<F4>foo')
- command('vnoremap <script> <buffer> <expr> <silent> bar isbar')
- command([[call append('$', maparg('foo<C-V>'))]])
- command([[call append('$', string(maparg('foo<C-V>', '', 0, 1)))]])
- command([[call append('$', string(maparg('bar', '', 0, 1)))]])
- command('map <buffer> <nowait> foo bar')
- command([[call append('$', string(maparg('foo', '', 0, 1)))]])
- command('map abc x<char-114>x')
- command([[call append('$', maparg('abc'))]])
- command('map abc y<S-char-114>y')
- command([[call append('$', maparg('abc'))]])
- feed('Go<esc>:<cr>')
- poke_eventloop()
-
- -- Outside of the range, minimum
- command('inoremap <Char-0x1040> a')
- command([[execute "normal a\u1040\<Esc>"]])
-
- -- Inside of the range, minimum
- command('inoremap <Char-0x103f> b')
- command([[execute "normal a\u103f\<Esc>"]])
-
- -- Inside of the range, maximum
- command('inoremap <Char-0xf03f> c')
- command([[execute "normal a\uf03f\<Esc>"]])
-
- -- Outside of the range, maximum
- command('inoremap <Char-0xf040> d')
- command([[execute "normal a\uf040\<Esc>"]])
-
- -- Remove empty line
- command('1d')
-
- -- Assert buffer contents.
- expect([[
- is<F4>foo
- {'lnum': 0, 'script': 0, 'silent': 0, 'noremap': 0, 'lhs': 'foo<C-V>', 'mode': ' ', 'nowait': 0, 'expr': 0, 'sid': 0, 'rhs': 'is<F4>foo', 'buffer': 0}
- {'lnum': 0, 'script': 1, 'silent': 1, 'noremap': 1, 'lhs': 'bar', 'mode': 'v', 'nowait': 0, 'expr': 1, 'sid': 0, 'rhs': 'isbar', 'buffer': 1}
- {'lnum': 0, 'script': 0, 'silent': 0, 'noremap': 0, 'lhs': 'foo', 'mode': ' ', 'nowait': 1, 'expr': 0, 'sid': 0, 'rhs': 'bar', 'buffer': 1}
- xrx
- yRy
- abcd]])
- end)
-end)
diff --git a/test/functional/vimscript/map_functions_spec.lua b/test/functional/vimscript/map_functions_spec.lua
index 275c72d212..15d4d41ac1 100644
--- a/test/functional/vimscript/map_functions_spec.lua
+++ b/test/functional/vimscript/map_functions_spec.lua
@@ -13,6 +13,7 @@ describe('maparg()', function()
local foo_bar_map_table = {
lhs='foo',
+ lhsraw='foo',
script=0,
silent=0,
rhs='bar',
@@ -141,6 +142,7 @@ describe('maparg()', function()
local function acmap(lhs, rhs)
return {
lhs = ac(lhs),
+ lhsraw = ac(lhs),
rhs = ac(rhs),
buffer = 0,