aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -04:00
Code Activity

patch 9.0.0437: no error when custom completion function returns wrong type

Browse Source 
Problem:    No error when a custom completion function returns something else
            than the expected list.
Solution:   Give an error. (closes #11100)
This commit is contained in:
Bram Moolenaar
2022-09-10 13:52:26 +01:00
parent 71b6d33976
commit 55e9366e32
4 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/errors.h
View File

@@ -3333,4 +3333,6 @@ EXTERN char e_string_number_list_or_blob_required_for_argument_nr[]
INIT(= N_("E1301: String, Number, List or Blob required for argument %d")); INIT(= N_("E1301: String, Number, List or Blob required for argument %d"));
EXTERN char e_script_variable_was_deleted[] EXTERN char e_script_variable_was_deleted[]
INIT(= N_("E1302: Script variable was deleted")); INIT(= N_("E1302: Script variable was deleted"));
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 #endif

3
src/eval.c
View File

@@ -842,6 +842,7 @@ call_func_retstr(
* Call Vim script function "func" and return the result as a List. * Call Vim script function "func" and return the result as a List.
* Uses "argv" and "argc" as call_func_retstr(). * Uses "argv" and "argc" as call_func_retstr().
* Returns NULL when there is something wrong. * Returns NULL when there is something wrong.
* Gives an error when the returned value is not a list.
*/ */
void * void *
call_func_retlist( call_func_retlist(
@@ -856,6 +857,8 @@ call_func_retlist(
if (rettv.v_type != VAR_LIST) 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); clear_tv(&rettv);
return NULL; return NULL;
} }

4
src/testdir/test_usercommands.vim
View File

@@ -666,7 +666,7 @@ func Test_usercmd_custom()
return "a\nb\n" return "a\nb\n"
endfunc endfunc
command -nargs=* -complete=customlist,T1 TCmd1 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 ', @:) call assert_equal('"TCmd1 ', @:)
delcommand TCmd1 delcommand TCmd1
delfunc T1 delfunc T1
@@ -675,7 +675,7 @@ func Test_usercmd_custom()
return {} return {}
endfunc endfunc
command -nargs=* -complete=customlist,T2 TCmd2 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 ', @:) call assert_equal('"TCmd2 ', @:)
delcommand TCmd2 delcommand TCmd2
delfunc T2 delfunc T2

2
src/version.c
View File

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