thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.2.5039: confusing error if first argument of popup_create() is wrong

Browse Source 
Problem:    Confusing error if first argument of popup_create() is wrong.
Solution:   Give a more informative error.
This commit is contained in:
Bram Moolenaar
2022-05-29 17:13:24 +01:00
parent d28950f954
commit 83bd7a9740
5 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/errors.h
View File

@@ -3284,3 +3284,7 @@ EXTERN char e_bitshift_ops_must_be_number[]
EXTERN char e_bitshift_ops_must_be_postive[] EXTERN char e_bitshift_ops_must_be_postive[]
INIT(= N_("E1283: Bitshift amount must be a positive number")); INIT(= N_("E1283: Bitshift amount must be a positive number"));
#endif #endif
#if defined(FEAT_PROP_POPUP)
EXTERN char e_argument_1_list_item_nr_dictionary_required[]
INIT(= N_("E1284: Argument 1, list item %d: Dictionary required"));
#endif

6
src/popupwin.c
View File

@@ -1047,7 +1047,7 @@ add_popup_dicts(buf_T *buf, list_T *l)
{ {
if (li->li_tv.v_type != VAR_DICT) if (li->li_tv.v_type != VAR_DICT)
{ {
emsg(_(e_dictionary_required)); semsg(_(e_argument_1_list_item_nr_dictionary_required), lnum + 1);
return; return;
} }
dict = li->li_tv.vval.v_dict; dict = li->li_tv.vval.v_dict;
@@ -1685,7 +1685,9 @@ popup_set_buffer_text(buf_T *buf, typval_T text)
if (l != NULL && l->lv_len > 0) if (l != NULL && l->lv_len > 0)
{ {
if (l->lv_first->li_tv.v_type == VAR_STRING) if (l->lv_first == &range_list_item)
emsg(_(e_using_number_as_string));
else if (l->lv_first->li_tv.v_type == VAR_STRING)
// list of strings // list of strings
add_popup_strings(buf, l); add_popup_strings(buf, l);
else else

2
src/testdir/dumps/Test_popup_settext_07.dump
View File

@@ -7,4 +7,4 @@
|~| @73 |~| @73
|~| @73 |~| @73
|~| @73 |~| @73
|E+0#ffffff16#e000002|7|1|5|:| |D|i|c|t|i|o|n|a|r|y| |r|e|q|u|i|r|e|d| +0#0000000#ffffff0@31|0|,|0|-|1| @8|A|l@1| |E+0#ffffff16#e000002|1|0|2|4|:| |U|s|i|n|g| |a| |N|u|m|b|e|r| |a|s| |a| |S|t|r|i|n|g| +0#0000000#ffffff0@23|0|,|0|-|1| @8|A|l@1|

7
src/testdir/test_popupwin.vim
View File

@@ -1072,7 +1072,7 @@ func Test_popup_invalid_arguments()
call assert_fails('call popup_create("text", #{borderchars: "none"})', 'E714:') call assert_fails('call popup_create("text", #{borderchars: "none"})', 'E714:')
call popup_clear() call popup_clear()
call assert_fails('call popup_create([#{text: "text"}, 666], {})', 'E715:') call assert_fails('call popup_create([#{text: "text"}, 666], {})', 'E1284: Argument 1, list item 2: Dictionary required')
call popup_clear() call popup_clear()
call assert_fails('call popup_create([#{text: "text", props: "none"}], {})', 'E714:') call assert_fails('call popup_create([#{text: "text", props: "none"}], {})', 'E714:')
call popup_clear() call popup_clear()
@@ -1091,6 +1091,11 @@ func Test_popup_invalid_arguments()
call popup_clear() call popup_clear()
call assert_fails('call popup_create("text", #{tabpage : 4})', 'E997:') call assert_fails('call popup_create("text", #{tabpage : 4})', 'E997:')
call popup_clear() call popup_clear()
call assert_fails('call popup_create(range(10), {})', 'E1024:')
call popup_clear()
call assert_fails('call popup_create([1, 2], {})', 'E1284: Argument 1, list item 1: Dictionary required')
call popup_clear()
endfunc endfunc
func Test_win_execute_closing_curwin() func Test_win_execute_closing_curwin()

2
src/version.c
View File

@@ -734,6 +734,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 */
/**/
5039,
/**/ /**/
5038, 5038,
/**/ /**/