diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-07-05 20:47:18 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-07-05 20:47:18 +0200 |
| commit | 252e88a78535d239ec4b764d8e3f04aad5a94a76 (patch) | |
| tree | 4f86fde849b019a7a2747451b99a036d54065960 | |
| parent | 0d94ad69586972e7522ec6ca1441a517af2ade7a (diff) | |
patch 8.2.1142: Vim9: return type of insert() is anyv8.2.1142
Problem: Vim9: return type of insert() is any.
Solution: Use type of the first argument.
| -rw-r--r-- | src/evalfunc.c | 2 | ||||
| -rw-r--r-- | src/testdir/test_vim9_func.vim | 9 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 12 insertions, 1 deletions
diff --git a/src/evalfunc.c b/src/evalfunc.c index b015f6dad1..65c34cd6a0 100644 --- a/src/evalfunc.c +++ b/src/evalfunc.c @@ -667,7 +667,7 @@ static funcentry_T global_functions[] = {"inputrestore", 0, 0, 0, ret_number, f_inputrestore}, {"inputsave", 0, 0, 0, ret_number, f_inputsave}, {"inputsecret", 1, 2, FEARG_1, ret_string, f_inputsecret}, - {"insert", 2, 3, FEARG_1, ret_any, f_insert}, + {"insert", 2, 3, FEARG_1, ret_first_arg, f_insert}, {"interrupt", 0, 0, 0, ret_void, f_interrupt}, {"invert", 1, 1, FEARG_1, ret_number, f_invert}, {"isdirectory", 1, 1, FEARG_1, ret_number, f_isdirectory}, diff --git a/src/testdir/test_vim9_func.vim b/src/testdir/test_vim9_func.vim index 8b83d77095..65b525706a 100644 --- a/src/testdir/test_vim9_func.vim +++ b/src/testdir/test_vim9_func.vim @@ -918,6 +918,15 @@ def Test_extend_return_type() assert_equal(6, res) enddef +def Test_insert_return_type() + let l = insert([2, 1], 3) + let res = 0 + for n in l + res += n + endfor + assert_equal(6, res) +enddef + def Test_filter_return_type() let l = filter([1, 2, 3], {-> 1}) let res = 0 diff --git a/src/version.c b/src/version.c index 47d4bccd51..6d4d6e93bb 100644 --- a/src/version.c +++ b/src/version.c @@ -755,6 +755,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1142, +/**/ 1141, /**/ 1140, |