Skip to content

Commit 41fe061

Browse files
committed
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)
1 parent 087d2e1 commit 41fe061

File tree

3 files changed

+20
-2
lines changed

3 files changed

+20
-2
lines changed

src/eval.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1491,6 +1491,8 @@ next_for_item(void *fi_void, char_u *arg)
14911491
{
14921492
forinfo_T *fi = (forinfo_T *)fi_void;
14931493
int result;
1494+
int flag = current_sctx.sc_version == SCRIPT_VERSION_VIM9 ?
1495+
LET_NO_COMMAND : 0;
14941496
listitem_T *item;
14951497

14961498
if (fi->fi_blob != NULL)
@@ -1504,7 +1506,7 @@ next_for_item(void *fi_void, char_u *arg)
15041506
tv.vval.v_number = blob_get(fi->fi_blob, fi->fi_bi);
15051507
++fi->fi_bi;
15061508
return ex_let_vars(arg, &tv, TRUE, fi->fi_semicolon,
1507-
fi->fi_varcount, 0, NULL) == OK;
1509+
fi->fi_varcount, flag, NULL) == OK;
15081510
}
15091511

15101512
item = fi->fi_lw.lw_item;
@@ -1514,7 +1516,7 @@ next_for_item(void *fi_void, char_u *arg)
15141516
{
15151517
fi->fi_lw.lw_item = item->li_next;
15161518
result = (ex_let_vars(arg, &item->li_tv, TRUE, fi->fi_semicolon,
1517-
fi->fi_varcount, 0, NULL) == OK);
1519+
fi->fi_varcount, flag, NULL) == OK);
15181520
}
15191521
return result;
15201522
}

src/testdir/test_vim9_script.vim

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -775,5 +775,19 @@ def Test_echo_cmd()
775775
assert_match('^some more$', Screenline(&lines))
776776
enddef
777777

778+
def Test_for_outside_of_function()
779+
let lines =<< trim END
780+
vim9script
781+
new
782+
for var in range(0, 3)
783+
append(line('$'), var)
784+
endfor
785+
assert_equal(['', '0', '1', '2', '3'], getline(1, '$'))
786+
bwipe!
787+
END
788+
writefile(lines, 'Xvim9for.vim')
789+
source Xvim9for.vim
790+
delete('Xvim9for.vim')
791+
enddef
778792

779793
" vim: ts=8 sw=2 sts=2 expandtab tw=80 fdm=marker

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -738,6 +738,8 @@ static char *(features[]) =
738738

739739
static int included_patches[] =
740740
{ /* Add new patch number below this line */
741+
/**/
742+
341,
741743
/**/
742744
340,
743745
/**/

0 commit comments

Comments
 (0)