mirror of
https://github.com/vim/vim.git
synced 2025-09-25 03:54:15 -04:00
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)
This commit is contained in:
@@ -4808,7 +4808,7 @@ f_hasmapto(typval_T *argvars, typval_T *rettv)
|
||||
{
|
||||
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))
|
||||
|
@@ -2204,9 +2204,9 @@ get_maparg(typval_T *argvars, typval_T *rettv, int exact)
|
||||
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
|
||||
|
@@ -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
|
||||
|
@@ -754,6 +754,8 @@ static char *(features[]) =
|
||||
|
||||
static int included_patches[] =
|
||||
{ /* Add new patch number below this line */
|
||||
/**/
|
||||
1577,
|
||||
/**/
|
||||
1576,
|
||||
/**/
|
||||
|
Reference in New Issue
Block a user