diff options
| -rw-r--r-- | src/nvim/mbyte.c | 2 | ||||
| -rw-r--r-- | test/functional/eval/map_functions_spec.lua | 41 |
2 files changed, 41 insertions, 2 deletions
diff --git a/src/nvim/mbyte.c b/src/nvim/mbyte.c index 5b00a4b9a8..2acfb896d8 100644 --- a/src/nvim/mbyte.c +++ b/src/nvim/mbyte.c @@ -1780,7 +1780,7 @@ const char *mb_unescape(const char **const pp) // Return a multi-byte character if it's found. An illegal sequence // will result in a 1 here. if (utf_ptr2len((const char_u *)buf) > 1) { - *pp = (const char *)str + buf_idx + 1; + *pp = (const char *)str + str_idx + 1; return buf; } diff --git a/test/functional/eval/map_functions_spec.lua b/test/functional/eval/map_functions_spec.lua index a260522aa3..e914f674aa 100644 --- a/test/functional/eval/map_functions_spec.lua +++ b/test/functional/eval/map_functions_spec.lua @@ -1,11 +1,12 @@ - local helpers = require('test.functional.helpers')(after_each) + local clear = helpers.clear local eq = helpers.eq local eval = helpers.eval local funcs = helpers.funcs local nvim = helpers.nvim local source = helpers.source +local command = helpers.command describe('maparg()', function() before_each(clear) @@ -117,4 +118,42 @@ describe('maparg()', function() eq(1, map_dict['expr']) eq('i', map_dict['mode']) end) + + it('works with combining characters', function() + -- Using addacutes to make combining character better visible + local function ac(s) + local acute = '\204\129' -- U+0301 COMBINING ACUTE ACCENT + local ret = s:gsub('`', acute) + return ret + end + command(ac([[ + nnoremap a b` + nnoremap c` d + nnoremap e` f` + ]])) + eq(ac('b`'), funcs.maparg(ac('a'))) + eq(ac(''), funcs.maparg(ac('c'))) + eq(ac('d'), funcs.maparg(ac('c`'))) + eq(ac('f`'), funcs.maparg(ac('e`'))) + + local function acmap(lhs, rhs) + return { + lhs = ac(lhs), + rhs = ac(rhs), + + buffer = 0, + expr = 0, + mode = 'n', + noremap = 1, + nowait = 0, + sid = 0, + silent = 0, + } + end + + eq({}, funcs.maparg(ac('c'), 'n', 0, 1)) + eq(acmap('a', 'b`'), funcs.maparg(ac('a'), 'n', 0, 1)) + eq(acmap('c`', 'd'), funcs.maparg(ac('c`'), 'n', 0, 1)) + eq(acmap('e`', 'f`'), funcs.maparg(ac('e`'), 'n', 0, 1)) + end) end) |