patch 8.2.0341: using ":for" in Vim9 script gives an error

Problem:    Using ":for" in Vim9 script gives an error.
Solution:   Pass the LET_NO_COMMAND flag. (closes #5715)

diff --git a/src/eval.c b/src/eval.c
index c81ece14942792ff65b6bcfd322bf674f0dcc393..415ed5a9d34eeac65acfed45b66e552ac149107b 100644 (file)
--- a/src/eval.c
+++ b/src/eval.c
@@ -1491,6 +1491,8 @@ next_for_item(void *fi_void, char_u *arg)
 {
     forinfo_T  *fi = (forinfo_T *)fi_void;
     int                result;
+    int                flag = current_sctx.sc_version == SCRIPT_VERSION_VIM9 ?
+                                                       LET_NO_COMMAND : 0;
     listitem_T *item;
 
     if (fi->fi_blob != NULL)
@@ -1504,7 +1506,7 @@ next_for_item(void *fi_void, char_u *arg)
        tv.vval.v_number = blob_get(fi->fi_blob, fi->fi_bi);
        ++fi->fi_bi;
        return ex_let_vars(arg, &tv, TRUE, fi->fi_semicolon,
-                                              fi->fi_varcount, 0, NULL) == OK;
+                                      fi->fi_varcount, flag, NULL) == OK;
     }
 
     item = fi->fi_lw.lw_item;
@@ -1514,7 +1516,7 @@ next_for_item(void *fi_void, char_u *arg)
     {
        fi->fi_lw.lw_item = item->li_next;
        result = (ex_let_vars(arg, &item->li_tv, TRUE, fi->fi_semicolon,
-                                         fi->fi_varcount, 0, NULL) == OK);
+                                     fi->fi_varcount, flag, NULL) == OK);
     }
     return result;
 }

diff --git a/src/testdir/test_vim9_script.vim b/src/testdir/test_vim9_script.vim
index aace2397872e64a5335ab71e33eaf60a6511cfd4..c1865e37f78c4b7e210936e901a559d0ca5bd94d 100644 (file)
--- a/src/testdir/test_vim9_script.vim
+++ b/src/testdir/test_vim9_script.vim
@@ -775,5 +775,19 @@ def Test_echo_cmd()
   assert_match('^some more$', Screenline(&lines))
 enddef
 
+def Test_for_outside_of_function()
+  let lines =<< trim END
+    vim9script
+    new
+    for var in range(0, 3)
+      append(line('$'), var)
+    endfor
+    assert_equal(['', '0', '1', '2', '3'], getline(1, '$'))
+    bwipe!
+  END
+  writefile(lines, 'Xvim9for.vim')
+  source Xvim9for.vim
+  delete('Xvim9for.vim')
+enddef
 
 " vim: ts=8 sw=2 sts=2 expandtab tw=80 fdm=marker

diff --git a/src/version.c b/src/version.c
index 3d126b068f4c81bf8ea49a91aef9bf6db8cd47d0..d927b4e8c1397c1f686e6889ce0aee45274bf94f 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -738,6 +738,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    341,
 /**/
     340,
 /**/