# HG changeset patch # User Bram Moolenaar # Date 1652102103 -7200 # Node ID 3754393e05bc9d178dc907414e679a7240d37275 # Parent 2a1287ec767feed43a0c185f4d1a8dc47c91b306 patch 8.2.4927: return type of remove() incorrect when using three arguments Commit: https://github.com/vim/vim/commit/2ac037f54bb2588b7a86e61c9c6e9504884edbec Author: Bram Moolenaar Date: Mon May 9 14:12:14 2022 +0100 patch 8.2.4927: return type of remove() incorrect when using three arguments Problem: Return type of remove() incorrect when using three arguments. Solution: Use first argument type when there are three arguments. (closes #10387) diff --git a/src/evalfunc.c b/src/evalfunc.c --- a/src/evalfunc.c +++ b/src/evalfunc.c @@ -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; diff --git a/src/testdir/test_vim9_builtin.vim b/src/testdir/test_vim9_builtin.vim --- a/src/testdir/test_vim9_builtin.vim +++ b/src/testdir/test_vim9_builtin.vim @@ -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 = remove({one: [1, 2], two: [3, 4]}, 'one') + l->assert_equal([1, 2]) + + var ll: list = remove(range(3), 0, 1) + ll->assert_equal([0, 1]) enddef def Test_rename() diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -747,6 +747,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 4927, +/**/ 4926, /**/ 4925,