commit 5c7a299c1652b28977c30e3e3a5ab93c65e7f7ed
author Bram Moolenaar <Bram@vim.org> Sat Mar 20 13:29:38 2021 +0100
committer Bram Moolenaar <Bram@vim.org> Sat Mar 20 13:29:38 2021 +0100
tree c14eaf648415c5eeccb3e9feb4cfda533c4cde73
parent 4355894869355c185e7810e67d52802453576e81

patch 8.2.2628: Vim9: #{ can still be used at the script level

Problem:    Vim9: #{ can still be used at the script level.
Solution:   Give an error for #{ like in a :def function.

src/eval.c

diff --git a/src/eval.c b/src/eval.c
index 8e964de..aa5f5b8 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -2228,7 +2228,8 @@
 	if (!aborting()
 		&& did_emsg == did_emsg_before
 		&& called_emsg == called_emsg_before
-		&& (flags & EVAL_CONSTANT) == 0)
+		&& (flags & EVAL_CONSTANT) == 0
+		&& (!in_vim9script() || !vim9_bad_comment(p)))
 	    semsg(_(e_invexpr2), arg);
 
 	// Some of the expression may not have been consumed.  Do not check for
@@ -3362,7 +3363,11 @@
     /*
      * Dictionary: #{key: val, key: val}
      */
-    case '#':	if (!in_vim9script() && (*arg)[1] == '{')
+    case '#':	if (in_vim9script())
+		{
+		    ret = vim9_bad_comment(*arg) ? FAIL : NOTDONE;
+		}
+		else if ((*arg)[1] == '{')
 		{
 		    ++*arg;
 		    ret = eval_dict(arg, rettv, evalarg, TRUE);

src/ex_docmd.c

diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index 477d140..67bcc73 100644
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -5234,7 +5234,8 @@
 	return TRUE;
 #ifdef FEAT_EVAL
     if (in_vim9script())
-	return c == '#' && (cmd == cmd_start || VIM_ISWHITE(cmd[-1]));
+	return c == '#' && cmd[1] != '{'
+				 && (cmd == cmd_start || VIM_ISWHITE(cmd[-1]));
 #endif
     return c == '"';
 }

src/testdir/test_vim9_expr.vim

diff --git a/src/testdir/test_vim9_expr.vim b/src/testdir/test_vim9_expr.vim
index 1046841..de6eabd 100644
--- a/src/testdir/test_vim9_expr.vim
+++ b/src/testdir/test_vim9_expr.vim
@@ -2159,10 +2159,10 @@
   CheckDefAndScriptSuccess(lines)
  
   # legacy syntax doesn't work
-  CheckDefFailure(["var x = #{key: 8}"], 'E1170:', 1)
-  CheckDefFailure(["var x = 'a' #{a: 1}"], 'E1170:', 1)
-  CheckDefFailure(["var x = 'a' .. #{a: 1}"], 'E1170:', 1)
-  CheckDefFailure(["var x = true ? #{a: 1}"], 'E1170:', 1)
+  CheckDefAndScriptFailure(["var x = #{key: 8}"], 'E1170:', 1)
+  CheckDefAndScriptFailure(["var x = 'a' #{a: 1}"], 'E1170:', 1)
+  CheckDefAndScriptFailure(["var x = 'a' .. #{a: 1}"], 'E1170:', 1)
+  CheckDefAndScriptFailure(["var x = true ? #{a: 1}"], 'E1170:', 1)
 
   CheckDefFailure(["var x = {a:8}"], 'E1069:', 1)
   CheckDefFailure(["var x = {a : 8}"], 'E1068:', 1)

src/version.c

diff --git a/src/version.c b/src/version.c
index 7c4db55..bcf8b6d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2628,
+/**/
     2627,
 /**/
     2626,