Mercurial > vim
changeset 19568:c0749ad6c699 v8.2.0341
patch 8.2.0341: using ":for" in Vim9 script gives an error
Commit: https://github.com/vim/vim/commit/41fe061753923986e6676424132960d970bb2a76
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Mar 1 16:22:40 2020 +0100
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 https://github.com/vim/vim/issues/5715)
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Sun, 01 Mar 2020 16:30:03 +0100 |
parents | b8c9eb5e8c2d |
children | be76a82ee030 |
files | src/eval.c src/testdir/test_vim9_script.vim src/version.c |
diffstat | 3 files changed, 20 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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; }
--- 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