diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-08-08 17:55:49 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-08-08 17:55:49 +0200 |
| commit | 4a6d1b660fcea67931202527ad2852da55d26d49 (patch) | |
| tree | ced3a872aaf412cdde1a6b7669f55e0bdc3901a9 /src | |
| parent | 5a849da57c5fb54ffcffd436a9e00ef40fdf094c (diff) | |
patch 8.2.1397: Vim9: return type of maparg() not adjusted for fourth argv8.2.1397
Problem: Vim9: return type of maparg() not adjusted for fourth argument.
Solution: Check if fourth argument is present. (closes #6645)
Diffstat (limited to 'src')
| -rw-r--r-- | src/evalfunc.c | 11 | ||||
| -rw-r--r-- | src/testdir/test_maparg.vim | 13 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 25 insertions, 1 deletions
diff --git a/src/evalfunc.c b/src/evalfunc.c index a421690e49..5607ef9e5b 100644 --- a/src/evalfunc.c +++ b/src/evalfunc.c @@ -402,6 +402,15 @@ ret_getreg(int argcount, type_T **argtypes UNUSED) return &t_string; } + static type_T * +ret_maparg(int argcount, type_T **argtypes UNUSED) +{ + // Assume that if the fourth argument is passed it's non-zero + if (argcount == 4) + return &t_dict_any; + return &t_string; +} + static type_T *ret_f_function(int argcount, type_T **argtypes); /* @@ -729,7 +738,7 @@ static funcentry_T global_functions[] = #endif }, {"map", 2, 2, FEARG_1, ret_any, f_map}, - {"maparg", 1, 4, FEARG_1, ret_string, f_maparg}, + {"maparg", 1, 4, FEARG_1, ret_maparg, f_maparg}, {"mapcheck", 1, 3, FEARG_1, ret_string, f_mapcheck}, {"mapset", 3, 3, FEARG_1, ret_void, f_mapset}, {"match", 2, 4, FEARG_1, ret_any, f_match}, diff --git a/src/testdir/test_maparg.vim b/src/testdir/test_maparg.vim index 81e057adca..3b61ff6cf7 100644 --- a/src/testdir/test_maparg.vim +++ b/src/testdir/test_maparg.vim @@ -81,6 +81,19 @@ func Test_maparg() abclear endfunc +def Test_vim9_maparg() + nmap { w + let one: string = maparg('{') + assert_equal('w', one) + let two: string = maparg('{', 'n') + assert_equal('w', two) + let three: string = maparg('{', 'n', 0) + assert_equal('w', three) + let four: dict<any> = maparg('{', 'n', 0, 1) + call assert_equal(['{', 'w', 'n'], [four.lhs, four.rhs, four.mode]) + nunmap { +enddef + func Test_mapcheck() call assert_equal('', mapcheck('a')) call assert_equal('', mapcheck('abc')) diff --git a/src/version.c b/src/version.c index 8649ca8965..b67d3c3dac 100644 --- a/src/version.c +++ b/src/version.c @@ -755,6 +755,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1397, +/**/ 1396, /**/ 1395, |