Mercurial > vim
changeset 22055:88bedbb4ba75 v8.2.1577
patch 8.2.1577: Vim9: hasmapto()/mapcheck()/maparg() do nottake "true" arg
Commit: https://github.com/vim/vim/commit/04d594b9c14299ed50da0774fb8d3a10fbc4076f
Author: Bram Moolenaar <Bram@vim.org>
Date: Wed Sep 2 22:25:35 2020 +0200
patch 8.2.1577: Vim9: hasmapto()/mapcheck()/maparg() do nottake "true" arg
Problem: Vim9: hasmapto(), mapcheck() and maparg() do not take "true" as
argument.
Solution: Use tv_get_bool(). (closes #6822, closes #6824)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Wed, 02 Sep 2020 22:30:03 +0200 |
| parents | a7d9a93a4d80 |
| children | de723418d015 |
| files | src/evalfunc.c src/map.c src/testdir/test_vim9_func.vim src/version.c |
| diffstat | 4 files changed, 44 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/evalfunc.c +++ b/src/evalfunc.c @@ -4808,7 +4808,7 @@ f_hasmapto(typval_T *argvars, typval_T * { mode = tv_get_string_buf(&argvars[1], buf); if (argvars[2].v_type != VAR_UNKNOWN) - abbr = (int)tv_get_number(&argvars[2]); + abbr = (int)tv_get_bool(&argvars[2]); } if (map_to_exists(name, mode, abbr))
--- a/src/map.c +++ b/src/map.c @@ -2204,9 +2204,9 @@ get_maparg(typval_T *argvars, typval_T * which = tv_get_string_buf_chk(&argvars[1], buf); if (argvars[2].v_type != VAR_UNKNOWN) { - abbr = (int)tv_get_number(&argvars[2]); + abbr = (int)tv_get_bool(&argvars[2]); if (argvars[3].v_type != VAR_UNKNOWN) - get_dict = (int)tv_get_number(&argvars[3]); + get_dict = (int)tv_get_bool(&argvars[3]); } } else
--- a/src/testdir/test_vim9_func.vim +++ b/src/testdir/test_vim9_func.vim @@ -1521,6 +1521,45 @@ def Test_globpath() assert_equal(['./runtest.vim'], globpath('.', 'runtest.vim', true, true, true)) enddef +def Test_hasmapto() + assert_equal(0, hasmapto('foobar', 'i', true)) + iabbrev foo foobar + assert_equal(1, hasmapto('foobar', 'i', true)) + iunabbrev foo +enddef + +def SID(): number + return expand('<SID>') + ->matchstr('<SNR>\zs\d\+\ze_$') + ->str2nr() +enddef + +def Test_maparg() + let lnum = str2nr(expand('<sflnum>')) + map foo bar + assert_equal(#{ + lnum: lnum + 1, + script: 0, + mode: ' ', + silent: 0, + noremap: 0, + lhs: 'foo', + lhsraw: 'foo', + nowait: 0, + expr: 0, + sid: SID(), + rhs: 'bar', + buffer: 0}, + maparg('foo', '', false, true)) + unmap foo +enddef + +def Test_mapcheck() + iabbrev foo foobar + assert_equal('foobar', mapcheck('foo', 'i', true)) + iunabbrev foo +enddef + def Test_recursive_call() assert_equal(6765, Fibonacci(20)) enddef