# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1653840903 -7200
# Node ID f3c014fe5c16875e1bd94541ad49af3d9ad3f7d3
# Parent  0059a17d7a2a02517b566015ae41e42158fd4f86
patch 8.2.5039: confusing error if first argument of popup_create() is wrong

Commit: https://github.com/vim/vim/commit/83bd7a974056fd61e142c791e79d9dd89acd5ba4
Author: Bram Moolenaar <Bram@vim.org>
Date:   Sun May 29 17:13:24 2022 +0100

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

    Problem:    Confusing error if first argument of popup_create() is wrong.
    Solution:   Give a more informative error.

diff --git a/src/errors.h b/src/errors.h
--- a/src/errors.h
+++ b/src/errors.h
@@ -3284,3 +3284,7 @@ EXTERN char e_bitshift_ops_must_be_numbe
 EXTERN char e_bitshift_ops_must_be_postive[]
 	INIT(= N_("E1283: Bitshift amount must be a positive number"));
 #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
diff --git a/src/popupwin.c b/src/popupwin.c
--- a/src/popupwin.c
+++ b/src/popupwin.c
@@ -1047,7 +1047,7 @@ add_popup_dicts(buf_T *buf, list_T *l)
     {
 	if (li->li_tv.v_type != VAR_DICT)
 	{
-	    emsg(_(e_dictionary_required));
+	    semsg(_(e_argument_1_list_item_nr_dictionary_required), lnum + 1);
 	    return;
 	}
 	dict = li->li_tv.vval.v_dict;
@@ -1685,7 +1685,9 @@ popup_set_buffer_text(buf_T *buf, typval
 
 	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
 		add_popup_strings(buf, l);
 	    else
diff --git a/src/testdir/dumps/Test_popup_settext_07.dump b/src/testdir/dumps/Test_popup_settext_07.dump
--- a/src/testdir/dumps/Test_popup_settext_07.dump
+++ b/src/testdir/dumps/Test_popup_settext_07.dump
@@ -7,4 +7,4 @@
 |~| @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| 
diff --git a/src/testdir/test_popupwin.vim b/src/testdir/test_popupwin.vim
--- a/src/testdir/test_popupwin.vim
+++ b/src/testdir/test_popupwin.vim
@@ -1072,7 +1072,7 @@ func Test_popup_invalid_arguments()
   call assert_fails('call popup_create("text", #{borderchars: "none"})', 'E714:')
   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 assert_fails('call popup_create([#{text: "text", props: "none"}], {})', 'E714:')
   call popup_clear()
@@ -1091,6 +1091,11 @@ func Test_popup_invalid_arguments()
   call popup_clear()
   call assert_fails('call popup_create("text", #{tabpage : 4})', 'E997:')
   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
 
 func Test_win_execute_closing_curwin()
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -735,6 +735,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    5039,
+/**/
     5038,
 /**/
     5037,