GitHub/vim
1
0
Fork 0
mirror of https://github.com/vim/vim synced 2025-09-14 07:59:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

patch 9.1.0900: Vim9: digraph_getlist() does not accept bool arg

Browse Source 
Problem:  Vim9: digraph_getlist() does not accept bool argument
          (Maxim Kim)
Solution: accept boolean as first argument (Yegappan Lakshmanan)

fixes: #16154
closes: #16159

Signed-off-by: Yegappan Lakshmanan <yegappan@yahoo.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
Yegappan Lakshmanan
2024-12-02 19:58:51 +01:00
committed by Christian Brabandt
parent 9a39483adb
commit 6a14b4e981
4 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/digraph.c
View File

@@ -2115,18 +2115,15 @@ f_digraph_getlist(typval_T *argvars, typval_T *rettv)
# ifdef FEAT_DIGRAPHS
int flag_list_all;
if (in_vim9script() && check_for_opt_bool_arg(argvars, 0) == FAIL)
if (check_for_opt_bool_arg(argvars, 0) == FAIL)
return;
if (argvars[0].v_type == VAR_UNKNOWN)
flag_list_all = FALSE;
else
{
int error = FALSE;
varnumber_T flag = tv_get_number_chk(&argvars[0], &error);
varnumber_T flag = tv_get_bool(&argvars[0]);
if (error)
return;
flag_list_all = flag ? TRUE : FALSE;
}

4
src/testdir/test_digraph.vim
View File

@@ -605,8 +605,10 @@ func Test_digraph_getlist_function()
" of digraphs returned.
call assert_equal(digraph_getlist()->len(), digraph_getlist(0)->len())
call assert_notequal(digraph_getlist()->len(), digraph_getlist(1)->len())
call assert_equal(digraph_getlist()->len(), digraph_getlist(v:false)->len())
call assert_notequal(digraph_getlist()->len(), digraph_getlist(v:true)->len())
call assert_fails('call digraph_getlist(0z12)', 'E974: Using a Blob as a Number')
call assert_fails('call digraph_getlist(0z12)', 'E1212: Bool required for argument 1')
endfunc

12
src/testdir/test_vim9_builtin.vim
View File

@@ -963,6 +963,18 @@ enddef
def Test_digraph_getlist()
v9.CheckSourceDefAndScriptFailure(['digraph_getlist(10)'], ['E1013: Argument 1: type mismatch, expected bool but got number', 'E1212: Bool required for argument 1'])
v9.CheckSourceDefAndScriptFailure(['digraph_getlist("")'], ['E1013: Argument 1: type mismatch, expected bool but got string', 'E1212: Bool required for argument 1'])
var lines =<< trim END
var l = digraph_getlist(true)
assert_notequal([], l)
l = digraph_getlist(false)
assert_equal([], l)
l = digraph_getlist(1)
assert_notequal([], l)
l = digraph_getlist(0)
assert_equal([], l)
END
v9.CheckSourceDefAndScriptSuccess(lines)
enddef
def Test_digraph_set()

2
src/version.c
View File

@@ -704,6 +704,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
900,
/**/
899,
/**/