aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-29 04:34:16 -04:00
Code Activity

patch 8.2.4927: return type of remove() incorrect when using three arguments

Browse Source 
Problem:    Return type of remove() incorrect when using three arguments.
Solution:   Use first argument type when there are three arguments.
            (closes #10387)
This commit is contained in:
Bram Moolenaar
2022-05-09 14:12:14 +01:00
parent 51f0bc31d3
commit 2ac037f54b
3 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/evalfunc.c
View File

@@ -1420,13 +1420,18 @@ ret_argv(int argcount,
static type_T *
ret_remove(int argcount,
type2_T *argtypes,
type_T **decl_type UNUSED)
type_T **decl_type)
{
if (argcount > 0)
{
if (argtypes[0].type_curr->tt_type == VAR_LIST
|| argtypes[0].type_curr->tt_type == VAR_DICT)
{
if (argcount == 3)
{
*decl_type = argtypes[0].type_decl;
return argtypes[0].type_curr;
}
if (argtypes[0].type_curr->tt_type
== argtypes[0].type_decl->tt_type)
*decl_type = argtypes[0].type_decl->tt_member;

11
src/testdir/test_vim9_builtin.vim
View File

@@ -3208,12 +3208,11 @@ def Test_remove()
enddef
def Test_remove_return_type()
var l = remove({one: [1, 2], two: [3, 4]}, 'one')
var res = 0
for n in l
res += n
endfor
res->assert_equal(3)
var l: list<number> = remove({one: [1, 2], two: [3, 4]}, 'one')
l->assert_equal([1, 2])
var ll: list<number> = remove(range(3), 0, 1)
ll->assert_equal([0, 1])
enddef
def Test_rename()

2
src/version.c
View File

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