patch 8.1.1683: dictionary with string keys is longer than neededv8.1.1683

Problem:    Dictionary with string keys is longer than needed.
Solution:   Use *{key: val} for literaly keys.

15 files changed, 396 insertions, 344 deletions

diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index dc25d4a21c..1944fdd869 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -58,7 +58,9 @@ List		An ordered sequence of items, see |List| for details.
 
 Dictionary	An associative, unordered array: Each entry has a key and a
 		value. |Dictionary|
-		Example: {'blue': "#0000ff", 'red': "#ff0000"}
+		Examples:
+			{'blue': "#0000ff", 'red': "#ff0000"}
+			*{blue: "#0000ff", red: "#ff0000"}
 
 Funcref		A reference to a function |Funcref|.
 		Example: function("strlen")
@@ -477,8 +479,14 @@ only appear once.  Examples: >
 A key is always a String.  You can use a Number, it will be converted to a
 String automatically.  Thus the String '4' and the number 4 will find the same
 entry.  Note that the String '04' and the Number 04 are different, since the
-Number will be converted to the String '4'.  The empty string can be used as a
-key.
+Number will be converted to the String '4'.  The empty string can also be used
+as a key.
+						*literal-Dict*
+To avoid having to put quotes around every key the *{} form can be used.  This
+does require the key to consist only of ASCII letters, digits, '-' and '_'.
+Example: >
+	let mydict = *{zero: 0, one_key: 1, two-key: 2, 333: 3}
+Note that 333 here is the string "333".  Empty keys are not possible here.
 
 A value can be any expression.  Using a Dictionary for a value creates a
 nested Dictionary: >
diff --git a/src/dict.c b/src/dict.c
index 96c58c1f2a..a80fb352d9 100644
--- a/src/dict.c
+++ b/src/dict.c
@@ -709,11 +709,33 @@ dict2string(typval_T *tv, int copyID, int restore_copyID)
 }
 
 /*
+ * Get the key for *{key: val} into "tv" and advance "arg".
+ * Return FAIL when there is no valid key.
+ */
+    static int
+get_literal_key(char_u **arg, typval_T *tv)
+{
+    char_u *p;
+
+    if (!ASCII_ISALNUM(**arg) && **arg != '_' && **arg != '-')
+	return FAIL;
+
+    for (p = *arg; ASCII_ISALNUM(*p) || *p == '_' || *p == '-'; ++p)
+	;
+    tv->v_type = VAR_STRING;
+    tv->vval.v_string = vim_strnsave(*arg, (int)(p - *arg));
+
+    *arg = skipwhite(p);
+    return OK;
+}
+
+/*
  * Allocate a variable for a Dictionary and fill it from "*arg".
+ * "literal" is TRUE for *{key: val}
  * Return OK or FAIL.  Returns NOTDONE for {expr}.
  */
     int
-dict_get_tv(char_u **arg, typval_T *rettv, int evaluate)
+dict_get_tv(char_u **arg, typval_T *rettv, int evaluate, int literal)
 {
     dict_T	*d = NULL;
     typval_T	tvkey;
@@ -750,8 +772,11 @@ dict_get_tv(char_u **arg, typval_T *rettv, int evaluate)
     *arg = skipwhite(*arg + 1);
     while (**arg != '}' && **arg != NUL)
     {
-	if (eval1(arg, &tvkey, evaluate) == FAIL)	/* recursive! */
+	if ((literal
+		? get_literal_key(arg, &tvkey)
+		: eval1(arg, &tvkey, evaluate)) == FAIL)	// recursive!
 	    goto failret;
+
 	if (**arg != ':')
 	{
 	    semsg(_("E720: Missing colon in Dictionary: %s"), *arg);
diff --git a/src/eval.c b/src/eval.c
index d89093cb33..20cec169bf 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -4391,7 +4391,8 @@ eval6(
  *  $VAR		environment variable
  *  (expression)	nested expression
  *  [expr, expr]	List
- *  {key: val, key: val}  Dictionary
+ *  {key: val, key: val}   Dictionary
+ *  *{key: val, key: val}  Dictionary with literal keys
  *
  *  Also handle:
  *  ! in front		logical NOT
@@ -4576,12 +4577,24 @@ eval7(
 		break;
 
     /*
+     * Dictionary: *{key: val, key: val}
+     */
+    case '*':	if ((*arg)[1] == '{')
+		{
+		    ++*arg;
+		    ret = dict_get_tv(arg, rettv, evaluate, TRUE);
+		}
+		else
+		    ret = NOTDONE;
+		break;
+
+    /*
      * Lambda: {arg, arg -> expr}
-     * Dictionary: {key: val, key: val}
+     * Dictionary: {'key': val, 'key': val}
      */
     case '{':	ret = get_lambda_tv(arg, rettv, evaluate);
 		if (ret == NOTDONE)
-		    ret = dict_get_tv(arg, rettv, evaluate);
+		    ret = dict_get_tv(arg, rettv, evaluate, FALSE);
 		break;
 
     /*
diff --git a/src/proto/dict.pro b/src/proto/dict.pro
index 3d31347a48..c133523731 100644
--- a/src/proto/dict.pro
+++ b/src/proto/dict.pro
@@ -28,7 +28,7 @@ char_u *dict_get_string(dict_T *d, char_u *key, int save);
 varnumber_T dict_get_number(dict_T *d, char_u *key);
 varnumber_T dict_get_number_check(dict_T *d, char_u *key);
 char_u *dict2string(typval_T *tv, int copyID, int restore_copyID);
-int dict_get_tv(char_u **arg, typval_T *rettv, int evaluate);
+int dict_get_tv(char_u **arg, typval_T *rettv, int evaluate, int literal);
 void dict_extend(dict_T *d1, dict_T *d2, char_u *action);
 dictitem_T *dict_lookup(hashitem_T *hi);
 int dict_equal(dict_T *d1, dict_T *d2, int ic, int recursive);
diff --git a/src/testdir/dumps/Test_popupwin_07.dump b/src/testdir/dumps/Test_popupwin_07.dump
index 5c44ad3a74..28c13cb7f0 100644
--- a/src/testdir/dumps/Test_popupwin_07.dump
+++ b/src/testdir/dumps/Test_popupwin_07.dump
@@ -6,5 +6,5 @@
 |~| @73
 |~| @52|o+0#0000001#ffd7ff255|t|h|e|r| |t|a|b| @11
 |~+0#4040ff13#ffffff0| @52|a+0#0000001#ffd7ff255| |c+0#ff404010&|o|m@1|e|n|t| +0#0000001&|l|i|n|e| @6
-|:+0#0000000#ffffff0|c|a|l@1| |p|o|p|u|p|_|m|o|v|e|(|p|o|p|u|p|w|i|n|,| |{|'|l|i|n|e|'|:| |7|,| |'|c|o|l|'|:| |5@1|}|)| @3|t+0#0000001#ffd7ff255|h|i|s| |l|i|n|e| |w|i|l@1| |n|o|t| |f|i
+|:+0#0000000#ffffff0|c|a|l@1| |p|o|p|u|p|_|m|o|v|e|(|p|o|p|u|p|w|i|n|,| |*|{|l|i|n|e|:| |7|,| |c|o|l|:| |5@1|}|)| @6|t+0#0000001#ffd7ff255|h|i|s| |l|i|n|e| |w|i|l@1| |n|o|t| |f|i
 | +0#0000000#ffffff0@53|t+0#0000001#ffd7ff255| |h|e|r|e| @14
diff --git a/src/testdir/dumps/Test_popupwin_mask_2.dump b/src/testdir/dumps/Test_popupwin_mask_2.dump
index ac1c834633..3ae3c9decb 100644
--- a/src/testdir/dumps/Test_popupwin_mask_2.dump
+++ b/src/testdir/dumps/Test_popupwin_mask_2.dump
@@ -10,4 +10,4 @@
 |1|2|3|4|5|6|7|8|9|1|0|║+0#0000001#ffd7ff255| @10|1+0#0000000#ffffff0|7|1|8|1|9|2|0|2|1|2@2|3|2|4|2|5|2|6|2|7|2|8|2|9|3|0|3|1|3|2|3@2|4|3|5|3|6|3|7|3|8|3|9|4|0|4|1|4|2
 |1|2|3|4|5|6|7|8|9|1|0|╚+0#0000001#ffd7ff255|═|1+0#0000000#ffffff0|2|1|═+0#0000001#ffd7ff255@4|1+0#0000000#ffffff0|6|1|7|═+0#0000001#ffd7ff255@1|╝|9+0#0000000#ffffff0|2|0|2|1|2@2|3|2|4|2|5|2|6|2|7|2|8|2|9|3|0|3|1|3|2|3@2|4|3|5|3|6|3|7|3|8|3|9|4|0|4|1|4|2
 |1|2|3|4|5|6|7|8|9|1|0|1@2|2|1|3|1|4|1|5|1|6|1|7|1|8|1|9|2|0|2|1|2@2|3|2|4|2|5|2|6|2|7|2|8|2|9|3|0|3|1|3|2|3@2|4|3|5|3|6|3|7|3|8|3|9|4|0|4|1|4|2
-|:|c|a|l@1| |p|o|p|u|p|_|m|o|v|e|(|w|i|n|i|d|b|,| |{|'|c|o|l|'|:| |1|2|}|)| @19|1|,|1| @10|T|o|p| 
+|:|c|a|l@1| |p|o|p|u|p|_|m|o|v|e|(|w|i|n|i|d|b|,| |*|{|c|o|l|:| |1|2|}|)| @20|1|,|1| @10|T|o|p| 
diff --git a/src/testdir/dumps/Test_popupwin_mask_3.dump b/src/testdir/dumps/Test_popupwin_mask_3.dump
index b7913743c5..7bbcafc272 100644
--- a/src/testdir/dumps/Test_popupwin_mask_3.dump
+++ b/src/testdir/dumps/Test_popupwin_mask_3.dump
@@ -10,4 +10,4 @@
 |1+0#0000000#ffffff0|2|3|4|5|6|7|8|9|1|0|1@2|2|1|3|1|4|1|5|1|6|1|7|1|8|1|9|2|0|2|1|2@2|3|2|4|2|5|2|6|2|7|2|8|2|9|3|0|3|1|3|2|3@2|4|3|5|3|║+0#0000001#ffd7ff255| @10|2+0#0000000#ffffff0
 |1|2|3|4|5|6|7|8|9|1|0|1@2|2|1|3|1|4|1|5|1|6|1|7|1|8|1|9|2|0|2|1|2@2|3|2|4|2|5|2|6|2|7|2|8|2|9|3|0|3|1|3|2|3@2|4|3|5|3|╚+0#0000001#ffd7ff255|═|7+0#0000000#ffffff0|3|8|═+0#0000001#ffd7ff255@4|1+0#0000000#ffffff0|4|2
 |1|2|3|4|5|6|7|8|9|1|0|1@2|2|1|3|1|4|1|5|1|6|1|7|1|8|1|9|2|0|2|1|2@2|3|2|4|2|5|2|6|2|7|2|8|2|9|3|0|3|1|3|2|3@2|4|3|5|3|6|3|7|3|8|3|9|4|0|4|1|4|2
-|:|c|a|l@1| |p|o|p|u|p|_|m|o|v|e|(|w|i|n|i|d|b|,| |{|'|c|o|l|'|:| |6|3|}|)| @19|1|,|1| @10|T|o|p| 
+|:|c|a|l@1| |p|o|p|u|p|_|m|o|v|e|(|w|i|n|i|d|b|,| |*|{|c|o|l|:| |6|3|}|)| @20|1|,|1| @10|T|o|p| 
diff --git a/src/testdir/dumps/Test_popupwin_mask_4.dump b/src/testdir/dumps/Test_popupwin_mask_4.dump
index de0a841fa6..9552b40072 100644
--- a/src/testdir/dumps/Test_popupwin_mask_4.dump
+++ b/src/testdir/dumps/Test_popupwin_mask_4.dump
@@ -10,4 +10,4 @@
 | +0#0000001#ffd7ff255@6|8+0#0000000#ffffff0|9|1|0|1@2|2|1|3|1|4|1|5|1|6|1|7|1|8|1|9|2|0|2|1|2@2|3|2|4|2|5|2|6|2|7|2|8|2|9|3|0|3|1|3|2|3@2|4|3|5|3|6|3|7|3|8|3|9|4|0|4|1|4|2
 |═+0#0000001#ffd7ff255@4|6+0#0000000#ffffff0|7|8|9|═+0#0000001#ffd7ff255@1|╝|1+0#0000000#ffffff0@1|2|1|3|1|4|1|5|1|6|1|7|1|8|1|9|2|0|2|1|2@2|3|2|4|2|5|2|6|2|7|2|8|2|9|3|0|3|1|3|2|3@2|4|3|5|3|6|3|7|3|8|3|9|4|0|4|1|4|2
 |1|2|3|4|5|6|7|8|9|1|0|1@2|2|1|3|1|4|1|5|1|6|1|7|1|8|1|9|2|0|2|1|2@2|3|2|4|2|5|2|6|2|7|2|8|2|9|3|0|3|1|3|2|3@2|4|3|5|3|6|3|7|3|8|3|9|4|0|4|1|4|2
-|:|c|a|l@1| |p|o|p|u|p|_|m|o|v|e|(|w|i|n|i|d|b|,| |{|'|p|o|s|'|:| |'|t|o|p|r|i|g|h|t|'|,| |'|c|o|l|'|:| |1|2|}|)| |1|,|1| @10|T|o|p| 
+|:|c|a|l@1| |p|o|p|u|p|_|m|o|v|e|(|w|i|n|i|d|b|,| |*|{|p|o|s|:| |'|t|o|p|r|i|g|h|t|'|,| |c|o|l|:| |1|2|}|)| @3|1|,|1| @10|T|o|p| 
diff --git a/src/testdir/dumps/Test_popupwin_mask_5.dump b/src/testdir/dumps/Test_popupwin_mask_5.dump
index 4da3ded06e..06334e1d32 100644
--- a/src/testdir/dumps/Test_popupwin_mask_5.dump
+++ b/src/testdir/dumps/Test_popupwin_mask_5.dump
@@ -10,4 +10,4 @@
 |1|2|3|4|5|6|7|8|9|1|0|1@2|2|1|3|1|4|1|5|1|6|1|7|1|8|1|9|2|0|2|1|2@2|3|2|4|2|5|2|6|2|7|2|8|2|9|3|0|3|1|3|2|3@2|4|3|5|3|6|3|7|3|8|3|9|4|0|4|1|4|2
 | +0&#e0e0e08@11|1+0&#ffffff0@1|2|1|3|1|4|1|5|1|6|1|7|1|8|1|9|2|0|2|1|2@2|3|2|4|2|5|2|6|═+0#0000001#ffd7ff255@13|X|4+0#0000000#ffffff0|3|5|3|6|3|7|3|8|3|9|4|0|4|1|4|2
 |o+0&#e0e0e08|m|e| |5+0&#ffffff0|6|7|t+0&#e0e0e08| @3|1+0&#ffffff0@1|2|1|3|1|4|1|5|1|6|1|7|1|8|1|9|2|0|2|1|2@2|3|2|4|2|5|║+0#0000001#ffd7ff255| @4|2+0#0000000#ffffff0|9|3| +0#0000001#ffd7ff255@6|║|4+0#0000000#ffffff0|3|5|3|6|3|7|3|8|3|9|4|0|4|1|4|2
-|:|c|t+0&#e0e0e08|h|l+0&#ffffff0| |p|l+0&#e0e0e08|i|n|e| |m+0&#ffffff0|o|v|e|(|w|i|n|i|d|b|,| |{|'|p|o|s|'|:| |'|t|o|p|l|e|f|t|║+0#0000001#ffd7ff255| |j|u|s|t|l+0#0000000#ffffff0|'|:|e+0#0000001#ffd7ff255| |l|i|n|e| |║|,+0#0000000#ffffff0|1| @10|T|o|p| 
+|:|c|t+0&#e0e0e08|h|l+0&#ffffff0| |p|l+0&#e0e0e08|i|n|e| |m+0&#ffffff0|o|v|e|(|w|i|n|i|d|b|,| |*|{|p|o|s|:| |'|t|o|p|l|e|f|t|'|║+0#0000001#ffd7ff255| |j|u|s|t| +0#0000000#ffffff0|4|2|e+0#0000001#ffd7ff255| |l|i|n|e| |║|,+0#0000000#ffffff0|1| @10|T|o|p| 
diff --git a/src/testdir/dumps/Test_popupwin_scroll_2.dump b/src/testdir/dumps/Test_popupwin_scroll_2.dump
index f081d6a475..e02fe78408 100644
--- a/src/testdir/dumps/Test_popupwin_scroll_2.dump
+++ b/src/testdir/dumps/Test_popupwin_scroll_2.dump
@@ -7,4 +7,4 @@
 |7| @31|f+0#0000001#ffd7ff255|i|v|e| @3| +0#0000000#a8a8a8255| +0&#ffffff0@32
 |8| @73
 |9| @73
-|:|c|a|l@1| |p|o|p|u|p|_|s|e|t|o|p|t|i|o|n|s|(|w|i|n|i|d|,| |{|'|f|i|r|s|t|l|i|n|e|'|:| |2|}|)| @9|1|,|1| @10|T|o|p| 
+|:|c|a|l@1| |p|o|p|u|p|_|s|e|t|o|p|t|i|o|n|s|(|w|i|n|i|d|,| |*|{|f|i|r|s|t|l|i|n|e|:| |2|}|)| @10|1|,|1| @10|T|o|p| 
diff --git a/src/testdir/dumps/Test_popupwin_scroll_3.dump b/src/testdir/dumps/Test_popupwin_scroll_3.dump
index 4a4489677b..ca7a425497 100644
--- a/src/testdir/dumps/Test_popupwin_scroll_3.dump
+++ b/src/testdir/dumps/Test_popupwin_scroll_3.dump
@@ -7,4 +7,4 @@
 |7| @31|n+0#0000001#ffd7ff255|i|n|e| @3| +0#0000000#0000001| +0&#ffffff0@32
 |8| @73
 |9| @73
-|:|c|a|l@1| |p|o|p|u|p|_|s|e|t|o|p|t|i|o|n|s|(|w|i|n|i|d|,| |{|'|f|i|r|s|t|l|i|n|e|'|:| |6|}|)| @9|1|,|1| @10|T|o|p| 
+|:|c|a|l@1| |p|o|p|u|p|_|s|e|t|o|p|t|i|o|n|s|(|w|i|n|i|d|,| |*|{|f|i|r|s|t|l|i|n|e|:| |6|}|)| @10|1|,|1| @10|T|o|p| 
diff --git a/src/testdir/dumps/Test_popupwin_scroll_4.dump b/src/testdir/dumps/Test_popupwin_scroll_4.dump
index 5f35a1f9f5..c243c4ca26 100644
--- a/src/testdir/dumps/Test_popupwin_scroll_4.dump
+++ b/src/testdir/dumps/Test_popupwin_scroll_4.dump
@@ -7,4 +7,4 @@
 |7| @73
 |8| @73
 |9| @73
-|:|c|a|l@1| |p|o|p|u|p|_|s|e|t|o|p|t|i|o|n|s|(|w|i|n|i|d|,| |{|'|f|i|r|s|t|l|i|n|e|'|:| |9|}|)| @9|1|,|1| @10|T|o|p| 
+|:|c|a|l@1| |p|o|p|u|p|_|s|e|t|o|p|t|i|o|n|s|(|w|i|n|i|d|,| |*|{|f|i|r|s|t|l|i|n|e|:| |9|}|)| @10|1|,|1| @10|T|o|p| 
diff --git a/src/testdir/test_listdict.vim b/src/testdir/test_listdict.vim
index 9064245219..574beb51da 100644
--- a/src/testdir/test_listdict.vim
+++ b/src/testdir/test_listdict.vim
@@ -280,6 +280,10 @@ func Test_dict_func_remove_in_use()
   call assert_equal(expected, d.func(string(remove(d, 'func'))))
 endfunc
 
+func Test_dict_literal_keys()
+  call assert_equal({'one': 1, 'two2': 2, '3three': 3, '44': 4}, *{one: 1, two2: 2, 3three: 3, 44: 4},)
+endfunc
+
 " Nasty: deepcopy() dict that refers to itself (fails when noref used)
 func Test_dict_deepcopy()
   let d = {1:1, 2:2}
diff --git a/src/testdir/test_popupwin.vim b/src/testdir/test_popupwin.vim
index 3844a05a3a..93302e8e67 100644
--- a/src/testdir/test_popupwin.vim
+++ b/src/testdir/test_popupwin.vim
@@ -14,23 +14,23 @@ func Test_simple_popup()
 	hi PopupColor1 ctermbg=lightblue
 	hi PopupColor2 ctermbg=lightcyan
 	hi Comment ctermfg=red
-	call prop_type_add('comment', {'highlight': 'Comment'})
-	let winid = popup_create('hello there', {'line': 3, 'col': 11, 'minwidth': 20, 'highlight': 'PopupColor1'})
-	let winid2 = popup_create(['another one', 'another two', 'another three'], {'line': 3, 'col': 25, 'minwidth': 20})
+	call prop_type_add('comment', *{highlight: 'Comment'})
+	let winid = popup_create('hello there', *{line: 3, col: 11, minwidth: 20, highlight: 'PopupColor1'})
+	let winid2 = popup_create(['another one', 'another two', 'another three'], *{line: 3, col: 25, minwidth: 20})
 	call setwinvar(winid2, '&wincolor', 'PopupColor2')
   END
   call writefile(lines, 'XtestPopup')
-  let buf = RunVimInTerminal('-S XtestPopup', {'rows': 10})
+  let buf = RunVimInTerminal('-S XtestPopup', *{rows: 10})
   call VerifyScreenDump(buf, 'Test_popupwin_01', {})
 
   " Add a tabpage
   call term_sendkeys(buf, ":tabnew\<CR>")
   call term_sendkeys(buf, ":let popupwin = popup_create(["
-	\ .. "{'text': 'other tab'},"
-	\ .. "{'text': 'a comment line', 'props': [{"
-	\ .. "'col': 3, 'length': 7, 'minwidth': 20, 'type': 'comment'"
+	\ .. "*{text: 'other tab'},"
+	\ .. "*{text: 'a comment line', props: [*{"
+	\ .. "col: 3, length: 7, minwidth: 20, type: 'comment'"
 	\ .. "}]},"
-	\ .. "], {'line': 4, 'col': 9, 'minwidth': 20})\<CR>")
+	\ .. "], *{line: 4, col: 9, minwidth: 20})\<CR>")
   call VerifyScreenDump(buf, 'Test_popupwin_02', {})
 
   " switch back to first tabpage
@@ -48,7 +48,7 @@ func Test_simple_popup()
   call term_sendkeys(buf, ":let &columns = cols\<CR>")
 
   " resize popup, show empty line at bottom
-  call term_sendkeys(buf, ":call popup_move(popupwin, {'minwidth': 15, 'maxwidth': 25, 'minheight': 3, 'maxheight': 5})\<CR>")
+  call term_sendkeys(buf, ":call popup_move(popupwin, *{minwidth: 15, maxwidth: 25, minheight: 3, maxheight: 5})\<CR>")
   call term_sendkeys(buf, ":redraw\<CR>")
   call VerifyScreenDump(buf, 'Test_popupwin_05', {})
 
@@ -59,7 +59,7 @@ func Test_simple_popup()
 
   " move popup over ruler
   call term_sendkeys(buf, ":set cmdheight=2\<CR>")
-  call term_sendkeys(buf, ":call popup_move(popupwin, {'line': 7, 'col': 55})\<CR>")
+  call term_sendkeys(buf, ":call popup_move(popupwin, *{line: 7, col: 55})\<CR>")
   call VerifyScreenDump(buf, 'Test_popupwin_07', {})
 
   " clear all popups after moving the cursor a bit, so that ruler is updated
@@ -83,17 +83,17 @@ func Test_popup_with_border_and_padding()
   for iter in range(0, 1)
     let lines =<< trim END
 	  call setline(1, range(1, 100))
-	  call popup_create('hello border', {'line': 2, 'col': 3, 'border': []})
-	  call popup_create('hello padding', {'line': 2, 'col': 23, 'padding': []})
-	  call popup_create('hello both', {'line': 2, 'col': 43, 'border': [], 'padding': []})
-	  call popup_create('border TL', {'line': 6, 'col': 3, 'border': [1, 0, 0, 4]})
-	  call popup_create('paddings', {'line': 6, 'col': 23, 'padding': [1, 3, 2, 4]})
-	  call popup_create('wrapped longer text', {'line': 8, 'col': 55, 'padding': [0, 3, 0, 3], 'border': [0, 1, 0, 1]})
-	  call popup_create('right aligned text', {'line': 11, 'col': 56, 'wrap': 0, 'padding': [0, 3, 0, 3], 'border': [0, 1, 0, 1]})
+	  call popup_create('hello border', *{line: 2, col: 3, border: []})
+	  call popup_create('hello padding', *{line: 2, col: 23, padding: []})
+	  call popup_create('hello both', *{line: 2, col: 43, border: [], padding: []})
+	  call popup_create('border TL', *{line: 6, col: 3, border: [1, 0, 0, 4]})
+	  call popup_create('paddings', *{line: 6, col: 23, padding: [1, 3, 2, 4]})
+	  call popup_create('wrapped longer text', *{line: 8, col: 55, padding: [0, 3, 0, 3], border: [0, 1, 0, 1]})
+	  call popup_create('right aligned text', *{line: 11, col: 56, wrap: 0, padding: [0, 3, 0, 3], border: [0, 1, 0, 1]})
     END
     call insert(lines, iter == 1 ? '' : 'set enc=latin1')
     call writefile(lines, 'XtestPopupBorder')
-    let buf = RunVimInTerminal('-S XtestPopupBorder', {'rows': 15})
+    let buf = RunVimInTerminal('-S XtestPopupBorder', *{rows: 15})
     call VerifyScreenDump(buf, 'Test_popupwin_2' .. iter, {})
 
     call StopVimInTerminal(buf)
@@ -107,22 +107,22 @@ func Test_popup_with_border_and_padding()
 	hi RightColor ctermbg=245
 	hi BottomColor ctermbg=240
 	hi LeftColor ctermbg=248
-	call popup_create('hello border', {'line': 2, 'col': 3, 'border': [], 'borderhighlight': ['BlueColor']})
-	call popup_create(['hello border', 'and more'], {'line': 2, 'col': 23, 'border': [], 'borderhighlight': ['TopColor', 'RightColor', 'BottomColor', 'LeftColor']})
-	call popup_create(['hello border', 'lines only'], {'line': 2, 'col': 43, 'border': [], 'borderhighlight': ['BlueColor'], 'borderchars': ['x']})
-	call popup_create(['hello border', 'with corners'], {'line': 2, 'col': 60, 'border': [], 'borderhighlight': ['BlueColor'], 'borderchars': ['x', '#']})
-	let winid = popup_create(['hello border', 'with numbers'], {'line': 6, 'col': 3, 'border': [], 'borderhighlight': ['BlueColor'], 'borderchars': ['0', '1', '2', '3', '4', '5', '6', '7']})
-	call popup_create(['hello border', 'just blanks'], {'line': 7, 'col': 23, 'border': [], 'borderhighlight': ['BlueColor'], 'borderchars': [' ']})
+	call popup_create('hello border', *{line: 2, col: 3, border: [], borderhighlight: ['BlueColor']})
+	call popup_create(['hello border', 'and more'], *{line: 2, col: 23, border: [], borderhighlight: ['TopColor', 'RightColor', 'BottomColor', 'LeftColor']})
+	call popup_create(['hello border', 'lines only'], *{line: 2, col: 43, border: [], borderhighlight: ['BlueColor'], borderchars: ['x']})
+	call popup_create(['hello border', 'with corners'], *{line: 2, col: 60, border: [], borderhighlight: ['BlueColor'], borderchars: ['x', '#']})
+	let winid = popup_create(['hello border', 'with numbers'], *{line: 6, col: 3, border: [], borderhighlight: ['BlueColor'], borderchars: ['0', '1', '2', '3', '4', '5', '6', '7']})
+	call popup_create(['hello border', 'just blanks'], *{line: 7, col: 23, border: [], borderhighlight: ['BlueColor'], borderchars: [' ']})
 	func MultiByte()
-	  call popup_create(['hello'], {'line': 8, 'col': 43, 'border': [], 'borderchars': ['─', '│', '─', '│', '┌', '┐', '┘', '└']})
+	  call popup_create(['hello'], *{line: 8, col: 43, border: [], borderchars: ['─', '│', '─', '│', '┌', '┐', '┘', '└']})
 	endfunc
   END
   call writefile(lines, 'XtestPopupBorder')
-  let buf = RunVimInTerminal('-S XtestPopupBorder', {'rows': 12})
+  let buf = RunVimInTerminal('-S XtestPopupBorder', *{rows: 12})
   call VerifyScreenDump(buf, 'Test_popupwin_22', {})
 
   " check that changing borderchars triggers a redraw
-  call term_sendkeys(buf, ":call popup_setoptions(winid, {'borderchars': ['a', 'b', 'c', 'd', 'e', 'f', 'g', 'h']})\<CR>")
+  call term_sendkeys(buf, ":call popup_setoptions(winid, *{borderchars: ['a', 'b', 'c', 'd', 'e', 'f', 'g', 'h']})\<CR>")
   call VerifyScreenDump(buf, 'Test_popupwin_23', {})
 
   " check multi-byte border only with 'ambiwidth' single
@@ -134,25 +134,25 @@ func Test_popup_with_border_and_padding()
   call StopVimInTerminal(buf)
   call delete('XtestPopupBorder')
 
-  let with_border_or_padding = {
-	\ 'line': 2,
-	\ 'core_line': 3,
-	\ 'col': 3,
-	\ 'core_col': 4,
-	\ 'width': 14,
-	\ 'core_width': 12,
-	\ 'height': 3,
-	\ 'core_height': 1,
-	\ 'firstline': 1,
-	\ 'scrollbar': 0,
-	\ 'visible': 1}
-  let winid = popup_create('hello border', {'line': 2, 'col': 3, 'border': []})",
+  let with_border_or_padding = *{
+	\ line: 2,
+	\ core_line: 3,
+	\ col: 3,
+	\ core_col: 4,
+	\ width: 14,
+	\ core_width: 12,
+	\ height: 3,
+	\ core_height: 1,
+	\ firstline: 1,
+	\ scrollbar: 0,
+	\ visible: 1}
+  let winid = popup_create('hello border', *{line: 2, col: 3, border: []})",
   call assert_equal(with_border_or_padding, popup_getpos(winid))
   let options = popup_getoptions(winid)
   call assert_equal([], options.border)
   call assert_false(has_key(options, "padding"))
 
-  let winid = popup_create('hello padding', {'line': 2, 'col': 3, 'padding': []})
+  let winid = popup_create('hello padding', *{line: 2, col: 3, padding: []})
   let with_border_or_padding.width = 15
   let with_border_or_padding.core_width = 13
   call assert_equal(with_border_or_padding, popup_getpos(winid))
@@ -160,11 +160,11 @@ func Test_popup_with_border_and_padding()
   call assert_false(has_key(options, "border"))
   call assert_equal([], options.padding)
 
-  call popup_setoptions(winid, {
-	\ 'padding': [1, 2, 3, 4],
-	\ 'border': [4, 0, 7, 8],
-	\ 'borderhighlight': ['Top', 'Right', 'Bottom', 'Left'],
-	\ 'borderchars': ['1', '^', '2', '>', '3', 'v', '4', '<'],
+  call popup_setoptions(winid, *{
+	\ padding: [1, 2, 3, 4],
+	\ border: [4, 0, 7, 8],
+	\ borderhighlight: ['Top', 'Right', 'Bottom', 'Left'],
+	\ borderchars: ['1', '^', '2', '>', '3', 'v', '4', '<'],
 	\ })
   let options = popup_getoptions(winid)
   call assert_equal([1, 0, 1, 1], options.border)
@@ -172,19 +172,19 @@ func Test_popup_with_border_and_padding()
   call assert_equal(['Top', 'Right', 'Bottom', 'Left'], options.borderhighlight)
   call assert_equal(['1', '^', '2', '>', '3', 'v', '4', '<'], options.borderchars)
 
-  let winid = popup_create('hello both', {'line': 3, 'col': 8, 'border': [], 'padding': []})
-  call assert_equal({
-	\ 'line': 3,
-	\ 'core_line': 5,
-	\ 'col': 8,
-	\ 'core_col': 10,
-	\ 'width': 14,
-	\ 'core_width': 10,
-	\ 'height': 5,
-	\ 'scrollbar': 0,
-	\ 'core_height': 1,
-	\ 'firstline': 1,
-	\ 'visible': 1}, popup_getpos(winid))
+  let winid = popup_create('hello both', *{line: 3, col: 8, border: [], padding: []})
+  call assert_equal(*{
+	\ line: 3,
+	\ core_line: 5,
+	\ col: 8,
+	\ core_col: 10,
+	\ width: 14,
+	\ core_width: 10,
+	\ height: 5,
+	\ scrollbar: 0,
+	\ core_height: 1,
+	\ firstline: 1,
+	\ visible: 1}, popup_getpos(winid))
 
   call popup_clear()
 endfunc
@@ -202,11 +202,11 @@ func Test_popup_with_syntax_win_execute()
 	    \ '{',
 	    \ '    printf(123);',
 	    \ '}',
-	    \], {'line': 3, 'col': 25, 'highlight': 'PopupColor'})
+	    \], *{line: 3, col: 25, highlight: 'PopupColor'})
 	call win_execute(winid, 'set syntax=cpp')
   END
   call writefile(lines, 'XtestPopup')
-  let buf = RunVimInTerminal('-S XtestPopup', {'rows': 10})
+  let buf = RunVimInTerminal('-S XtestPopup', *{rows: 10})
   call VerifyScreenDump(buf, 'Test_popupwin_10', {})
 
   " clean up
@@ -227,11 +227,11 @@ func Test_popup_with_syntax_setbufvar()
 	    \ '{',
 	    \ "\tprintf(567);",
 	    \ '}',
-	    \], {'line': 3, 'col': 21, 'highlight': 'PopupColor'})
+	    \], *{line: 3, col: 21, highlight: 'PopupColor'})
 	call setbufvar(winbufnr(winid), '&syntax', 'cpp')
   END
   call writefile(lines, 'XtestPopup')
-  let buf = RunVimInTerminal('-S XtestPopup', {'rows': 10})
+  let buf = RunVimInTerminal('-S XtestPopup', *{rows: 10})
   call VerifyScreenDump(buf, 'Test_popupwin_11', {})
 
   " clean up
@@ -248,7 +248,7 @@ func Test_popup_with_matches()
 	let winid = popup_create([
 	    \ '111 222 333',
 	    \ '444 555 666',
-	    \], {'line': 3, 'col': 10, 'border': []})
+	    \], *{line: 3, col: 10, border: []})
 	set hlsearch
 	/666
 	call matchadd('ErrorMsg', '111')
@@ -257,7 +257,7 @@ func Test_popup_with_matches()
 	call win_execute(winid, "call matchadd('ErrorMsg', '555')")
   END
   call writefile(lines, 'XtestPopupMatches')
-  let buf = RunVimInTerminal('-S XtestPopupMatches', {'rows': 10})
+  let buf = RunVimInTerminal('-S XtestPopupMatches', *{rows: 10})
   call VerifyScreenDump(buf, 'Test_popupwin_matches', {})
 
   " clean up
@@ -273,40 +273,40 @@ func Test_popup_all_corners()
 	call setline(1, repeat([repeat('-', 60)], 15))
 	set so=0
 	normal 2G3|r#
-	let winid1 = popup_create(['first', 'second'], {
-	      \ 'line': 'cursor+1',
-	      \ 'col': 'cursor',
-	      \ 'pos': 'topleft',
-	      \ 'border': [],
-	      \ 'padding': [],
+	let winid1 = popup_create(['first', 'second'], *{
+	      \ line: 'cursor+1',
+	      \ col: 'cursor',
+	      \ pos: 'topleft',
+	      \ border: [],
+	      \ padding: [],
 	      \ })
 	normal 25|r@
-	let winid1 = popup_create(['First', 'SeconD'], {
-	      \ 'line': 'cursor+1',
-	      \ 'col': 'cursor',
-	      \ 'pos': 'topright',
-	      \ 'border': [],
-	      \ 'padding': [],
+	let winid1 = popup_create(['First', 'SeconD'], *{
+	      \ line: 'cursor+1',
+	      \ col: 'cursor',
+	      \ pos: 'topright',
+	      \ border: [],
+	      \ padding: [],
 	      \ })
 	normal 9G29|r%
-	let winid1 = popup_create(['fiRSt', 'seCOnd'], {
-	      \ 'line': 'cursor-1',
-	      \ 'col': 'cursor',
-	      \ 'pos': 'botleft',
-	      \ 'border': [],
-	      \ 'padding': [],
+	let winid1 = popup_create(['fiRSt', 'seCOnd'], *{
+	      \ line: 'cursor-1',
+	      \ col: 'cursor',
+	      \ pos: 'botleft',
+	      \ border: [],
+	      \ padding: [],
 	      \ })
 	normal 51|r&
-	let winid1 = popup_create(['FIrsT', 'SEcoND'], {
-	      \ 'line': 'cursor-1',
-	      \ 'col': 'cursor',
-	      \ 'pos': 'botright',
-	      \ 'border': [],
-	      \ 'padding': [],
+	let winid1 = popup_create(['FIrsT', 'SEcoND'], *{
+	      \ line: 'cursor-1',
+	      \ col: 'cursor',
+	      \ pos: 'botright',
+	      \ border: [],
+	      \ padding: [],
 	      \ })
   END
   call writefile(lines, 'XtestPopupCorners')
-  let buf = RunVimInTerminal('-S XtestPopupCorners', {'rows': 12})
+  let buf = RunVimInTerminal('-S XtestPopupCorners', *{rows: 12})
   call VerifyScreenDump(buf, 'Test_popupwin_corners', {})
 
   " clean up
@@ -320,25 +320,25 @@ func Test_popup_firstline()
   endif
   let lines =<< trim END
 	call setline(1, range(1, 20))
-	call popup_create(['1111', '222222', '33333', '44', '5', '666666', '77777', '888', '9999999999999999'], {
-	      \ 'maxheight': 4,
-	      \ 'firstline': 3,
+	call popup_create(['1111', '222222', '33333', '44', '5', '666666', '77777', '888', '9999999999999999'], *{
+	      \ maxheight: 4,
+	      \ firstline: 3,
 	      \ })
   END
   call writefile(lines, 'XtestPopupFirstline')
-  let buf = RunVimInTerminal('-S XtestPopupFirstline', {'rows': 10})
+  let buf = RunVimInTerminal('-S XtestPopupFirstline', *{rows: 10})
   call VerifyScreenDump(buf, 'Test_popupwin_firstline', {})
 
   " clean up
   call StopVimInTerminal(buf)
   call delete('XtestPopupFirstline')
 
-  let winid = popup_create(['1111', '222222', '33333', '44444'], {
-	\ 'maxheight': 2,
-	\ 'firstline': 3,
+  let winid = popup_create(['1111', '222222', '33333', '44444'], *{
+	\ maxheight: 2,
+	\ firstline: 3,
 	\ })
   call assert_equal(3, popup_getoptions(winid).firstline)
-  call popup_setoptions(winid, {'firstline': 1})
+  call popup_setoptions(winid, *{firstline: 1})
   call assert_equal(1, popup_getoptions(winid).firstline)
 
   call popup_close(winid)
@@ -351,10 +351,10 @@ func Test_popup_drag()
   " create a popup that covers the command line
   let lines =<< trim END
 	call setline(1, range(1, 20))
-	let winid = popup_create(['1111', '222222', '33333'], {
-	      \ 'drag': 1,
-	      \ 'border': [],
-	      \ 'line': &lines - 4,
+	let winid = popup_create(['1111', '222222', '33333'], *{
+	      \ drag: 1,
+	      \ border: [],
+	      \ line: &lines - 4,
 	      \ })
 	func Dragit()
 	  call feedkeys("\<F3>\<LeftMouse>\<F4>\<LeftDrag>\<LeftRelease>", "xt")
@@ -363,7 +363,7 @@ func Test_popup_drag()
 	map <silent> <F4> :call test_setmouse(&lines - 8, &columns / 2)<CR>
   END
   call writefile(lines, 'XtestPopupDrag')
-  let buf = RunVimInTerminal('-S XtestPopupDrag', {'rows': 10})
+  let buf = RunVimInTerminal('-S XtestPopupDrag', *{rows: 10})
   call VerifyScreenDump(buf, 'Test_popupwin_drag_01', {})
 
   call term_sendkeys(buf, ":call Dragit()\<CR>")
@@ -381,31 +381,31 @@ func Test_popup_close_with_mouse()
   let lines =<< trim END
 	call setline(1, range(1, 20))
 	" With border, can click on X
-	let winid = popup_create('foobar', {
-	      \ 'close': 'button',
-	      \ 'border': [],
-	      \ 'line': 1,
-	      \ 'col': 1,
+	let winid = popup_create('foobar', *{
+	      \ close: 'button',
+	      \ border: [],
+	      \ line: 1,
+	      \ col: 1,
 	      \ })
 	func CloseMsg(id, result)
 	  echomsg 'Popup closed with ' .. a:result
 	endfunc
-	let winid = popup_create('notification', {
-	      \ 'close': 'click',
-	      \ 'line': 3,
-	      \ 'col': 15,
-	      \ 'callback': 'CloseMsg',
+	let winid = popup_create('notification', *{
+	      \ close: 'click',
+	      \ line: 3,
+	      \ col: 15,
+	      \ callback: 'CloseMsg',
 	      \ })
-	let winid = popup_create('no border here', {
-	      \ 'close': 'button',
-	      \ 'line': 5,
-	      \ 'col': 3,
+	let winid = popup_create('no border here', *{
+	      \ close: 'button',
+	      \ line: 5,
+	      \ col: 3,
 	      \ })
-	let winid = popup_create('only padding', {
-	      \ 'close': 'button',
-	      \ 'padding': [],
-	      \ 'line': 5,
-	      \ 'col': 23,
+	let winid = popup_create('only padding', *{
+	      \ close: 'button',
+	      \ padding: [],
+	      \ line: 5,
+	      \ col: 23,
 	      \ })
 	func CloseWithX()
 	  call feedkeys("\<F3>\<LeftMouse>\<LeftRelease>", "xt")
@@ -417,7 +417,7 @@ func Test_popup_close_with_mouse()
 	map <silent> <F4> :call test_setmouse(3, 17)<CR>
   END
   call writefile(lines, 'XtestPopupClose')
-  let buf = RunVimInTerminal('-S XtestPopupClose', {'rows': 10})
+  let buf = RunVimInTerminal('-S XtestPopupClose', *{rows: 10})
   call VerifyScreenDump(buf, 'Test_popupwin_close_01', {})
 
   call term_sendkeys(buf, ":call CloseWithX()\<CR>")
@@ -441,53 +441,53 @@ func Test_popup_with_mask()
 	let winid = popup_create([
 	    \ 'some text',
 	    \ 'another line',
-	    \], {
-	    \ 'line': 1,
-	    \ 'col': 10,
-	    \ 'wrap': 0,
-	    \ 'fixed': 1,
-	    \ 'zindex': 90,
-	    \ 'padding': [],
-	    \ 'highlight': 'PopupColor',
-	    \ 'mask': [[1,1,1,1], [-5,-1,4,4], [7,9,2,3], [2,4,3,3]]})
+	    \], *{
+	    \ line: 1,
+	    \ col: 10,
+	    \ wrap: 0,
+	    \ fixed: 1,
+	    \ zindex: 90,
+	    \ padding: [],
+	    \ highlight: 'PopupColor',
+	    \ mask: [[1,1,1,1], [-5,-1,4,4], [7,9,2,3], [2,4,3,3]]})
 	call popup_create([
 	    \ 'xxxxxxxxx',
 	    \ 'yyyyyyyyy',
-	    \], {
-	    \ 'line': 3,
-	    \ 'col': 18,
-	    \ 'zindex': 20})
+	    \], *{
+	    \ line: 3,
+	    \ col: 18,
+	    \ zindex: 20})
 	let winidb = popup_create([
 	    \ 'just one line',
-	    \], {
-	    \ 'line': 7,
-	    \ 'col': 10,
-	    \ 'wrap': 0,
-	    \ 'fixed': 1,
-	    \ 'close': 'button',
-	    \ 'zindex': 90,
-	    \ 'padding': [],
-	    \ 'border': [],
-	    \ 'mask': [[1,2,1,1], [-5,-1,4,4], [7,9,2,3], [3,5,5,5],[-7,-4,5,5]]})
+	    \], *{
+	    \ line: 7,
+	    \ col: 10,
+	    \ wrap: 0,
+	    \ fixed: 1,
+	    \ close: 'button',
+	    \ zindex: 90,
+	    \ padding: [],
+	    \ border: [],
+	    \ mask: [[1,2,1,1], [-5,-1,4,4], [7,9,2,3], [3,5,5,5],[-7,-4,5,5]]})
   END
   call writefile(lines, 'XtestPopupMask')
-  let buf = RunVimInTerminal('-S XtestPopupMask', {'rows': 13})
+  let buf = RunVimInTerminal('-S XtestPopupMask', *{rows: 13})
   call VerifyScreenDump(buf, 'Test_popupwin_mask_1', {})
 
-  call term_sendkeys(buf, ":call popup_move(winid, {'col': 11, 'line': 2})\<CR>")
-  call term_sendkeys(buf, ":call popup_move(winidb, {'col': 12})\<CR>")
+  call term_sendkeys(buf, ":call popup_move(winid, *{col: 11, line: 2})\<CR>")
+  call term_sendkeys(buf, ":call popup_move(winidb, *{col: 12})\<CR>")
   call VerifyScreenDump(buf, 'Test_popupwin_mask_2', {})
 
-  call term_sendkeys(buf, ":call popup_move(winid, {'col': 65, 'line': 2})\<CR>")
-  call term_sendkeys(buf, ":call popup_move(winidb, {'col': 63})\<CR>")
+  call term_sendkeys(buf, ":call popup_move(winid, *{col: 65, line: 2})\<CR>")
+  call term_sendkeys(buf, ":call popup_move(winidb, *{col: 63})\<CR>")
   call VerifyScreenDump(buf, 'Test_popupwin_mask_3', {})
 
-  call term_sendkeys(buf, ":call popup_move(winid, {'pos': 'topright', 'col': 12, 'line': 2})\<CR>")
-  call term_sendkeys(buf, ":call popup_move(winidb, {'pos': 'topright', 'col': 12})\<CR>")
+  call term_sendkeys(buf, ":call popup_move(winid, *{pos: 'topright', col: 12, line: 2})\<CR>")
+  call term_sendkeys(buf, ":call popup_move(winidb, *{pos: 'topright', col: 12})\<CR>")
   call VerifyScreenDump(buf, 'Test_popupwin_mask_4', {})
 
-  call term_sendkeys(buf, ":call popup_move(winid, {'pos': 'topright', 'col': 12, 'line': 11})\<CR>")
-  call term_sendkeys(buf, ":call popup_move(winidb, {'pos': 'topleft', 'col': 42, 'line': 11})\<CR>")
+  call term_sendkeys(buf, ":call popup_move(winid, *{pos: 'topright', col: 12, line: 11})\<CR>")
+  call term_sendkeys(buf, ":call popup_move(winidb, *{pos: 'topleft', col: 42, line: 11})\<CR>")
   call VerifyScreenDump(buf, 'Test_popupwin_mask_5', {})
 
   " clean up
@@ -506,11 +506,11 @@ func Test_popup_select()
   let lines =<< trim END
     set clipboard=autoselect
     call setline(1, range(1, 20))
-    let winid = popup_create(['the word', 'some more', 'several words here'], {
-	  \ 'drag': 1,
-	  \ 'border': [],
-	  \ 'line': 3,
-	  \ 'col': 10,
+    let winid = popup_create(['the word', 'some more', 'several words here'], *{
+	  \ drag: 1,
+	  \ border: [],
+	  \ line: 3,
+	  \ col: 10,
 	  \ })
     func Select1()
       call feedkeys("\<F3>\<LeftMouse>\<F4>\<LeftDrag>\<LeftRelease>", "xt")
@@ -519,7 +519,7 @@ func Test_popup_select()
     map <silent> <F4> :call test_setmouse(6, 23)<CR>
   END
   call writefile(lines, 'XtestPopupSelect')
-  let buf = RunVimInTerminal('-S XtestPopupSelect', {'rows': 10})
+  let buf = RunVimInTerminal('-S XtestPopupSelec