Mercurial > vim
changeset 30203:a3016780f346 v9.0.0437
patch 9.0.0437: no error when custom completion function returns wrong type
Commit: https://github.com/vim/vim/commit/55e9366e32bc0e1056478d1d0ae935f9cf039d6a
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Sep 10 13:52:26 2022 +0100
patch 9.0.0437: no error when custom completion function returns wrong type
Problem: No error when a custom completion function returns something else
than the expected list.
Solution: Give an error. (closes #11100)
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Sat, 10 Sep 2022 15:00:03 +0200 |
parents | fee9eccee266 |
children | b6c11bb32c89 |
files | src/errors.h src/eval.c src/testdir/test_usercommands.vim src/version.c |
diffstat | 4 files changed, 10 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/errors.h +++ b/src/errors.h @@ -3333,4 +3333,6 @@ EXTERN char e_string_number_list_or_blob INIT(= N_("E1301: String, Number, List or Blob required for argument %d")); EXTERN char e_script_variable_was_deleted[] INIT(= N_("E1302: Script variable was deleted")); -#endif +EXTERN char e_custom_list_completion_function_does_not_return_list_but_str[] + INIT(= N_("E1303: Custom list completion function does not return a List but a %s")); +#endif
--- a/src/eval.c +++ b/src/eval.c @@ -842,6 +842,7 @@ call_func_retstr( * Call Vim script function "func" and return the result as a List. * Uses "argv" and "argc" as call_func_retstr(). * Returns NULL when there is something wrong. + * Gives an error when the returned value is not a list. */ void * call_func_retlist( @@ -856,6 +857,8 @@ call_func_retlist( if (rettv.v_type != VAR_LIST) { + semsg(_(e_custom_list_completion_function_does_not_return_list_but_str), + vartype_name(rettv.v_type)); clear_tv(&rettv); return NULL; }
--- a/src/testdir/test_usercommands.vim +++ b/src/testdir/test_usercommands.vim @@ -666,7 +666,7 @@ func Test_usercmd_custom() return "a\nb\n" endfunc command -nargs=* -complete=customlist,T1 TCmd1 - call feedkeys(":TCmd1 \<C-A>\<C-B>\"\<CR>", 'xt') + call assert_fails('call feedkeys(":TCmd1 \<C-A>\<C-B>\"\<CR>", "xt")', 'E1303: Custom list completion function does not return a List but a string') call assert_equal('"TCmd1 ', @:) delcommand TCmd1 delfunc T1 @@ -675,7 +675,7 @@ func Test_usercmd_custom() return {} endfunc command -nargs=* -complete=customlist,T2 TCmd2 - call feedkeys(":TCmd2 \<C-A>\<C-B>\"\<CR>", 'xt') + call assert_fails('call feedkeys(":TCmd2 \<C-A>\<C-B>\"\<CR>", "xt")', 'E1303: Custom list completion function does not return a List but a dict') call assert_equal('"TCmd2 ', @:) delcommand TCmd2 delfunc T2