Mercurial > vim
changeset 26572:9f7568104726 v8.2.3815
patch 8.2.3815: Vim9: cannot have a multi-line dict inside a block
Commit: https://github.com/vim/vim/commit/ce7eada12ea16c830332042f0021a9564bbb25af
Author: Bram Moolenaar <Bram@vim.org>
Date: Wed Dec 15 15:41:44 2021 +0000
patch 8.2.3815: Vim9: cannot have a multi-line dict inside a block
Problem: Vim9: cannot have a multi-line dict inside a block.
Solution: Do not split the command at a line break, handle NL characters
as white space.
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Wed, 15 Dec 2021 16:45:03 +0100 |
| parents | 696b10f0898a |
| children | 09e19d3d78e3 |
| files | src/charset.c src/eval.c src/ex_docmd.c src/proto/charset.pro src/testdir/test_vim9_expr.vim src/version.c |
| diffstat | 6 files changed, 34 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/charset.c +++ b/src/charset.c @@ -1459,14 +1459,27 @@ getvcols( } /* - * skipwhite: skip over ' ' and '\t'. + * Skip over ' ' and '\t'. */ char_u * skipwhite(char_u *q) { char_u *p = q; - while (VIM_ISWHITE(*p)) // skip to next non-white + while (VIM_ISWHITE(*p)) + ++p; + return p; +} + +/* + * skip over ' ', '\t' and '\n'. + */ + char_u * +skipwhite_and_nl(char_u *q) +{ + char_u *p = q; + + while (VIM_ISWHITE(*p) || *p == NL) ++p; return p; }
--- a/src/eval.c +++ b/src/eval.c @@ -2150,7 +2150,7 @@ eval_next_line(evalarg_T *evalarg) skipwhite_and_linebreak(char_u *arg, evalarg_T *evalarg) { int getnext; - char_u *p = skipwhite(arg); + char_u *p = skipwhite_and_nl(arg); if (evalarg == NULL) return skipwhite(arg);
--- a/src/ex_docmd.c +++ b/src/ex_docmd.c @@ -2305,7 +2305,7 @@ do_one_cmd( // versions. if (*p == '\\' && p[1] == '\n') STRMOVE(p, p + 1); - else if (*p == '\n') + else if (*p == '\n' && (ea.argt & EX_TRLBAR)) { ea.nextcmd = p + 1; *p = NUL;
--- a/src/proto/charset.pro +++ b/src/proto/charset.pro @@ -36,6 +36,7 @@ colnr_T getvcol_nolist(pos_T *posp); void getvvcol(win_T *wp, pos_T *pos, colnr_T *start, colnr_T *cursor, colnr_T *end); void getvcols(win_T *wp, pos_T *pos1, pos_T *pos2, colnr_T *left, colnr_T *right); char_u *skipwhite(char_u *q); +char_u *skipwhite_and_nl(char_u *q); int getwhitecols_curline(void); int getwhitecols(char_u *p); char_u *skipdigits(char_u *q);
--- a/src/testdir/test_vim9_expr.vim +++ b/src/testdir/test_vim9_expr.vim @@ -2549,6 +2549,20 @@ def Test_expr7_dict_vim9script() CheckScriptSuccess(lines) enddef +def Test_expr7_dict_in_block() + var lines =<< trim END + vim9script + command MyCommand { + echo { + k: 0, } + } + MyCommand + END + CheckScriptSuccess(lines) + + delcommand MyCommand +enddef + def Test_expr7_call_2bool() var lines =<< trim END vim9script