Mercurial > vim
changeset 24553:cb0d344bd381 v8.2.2816
patch 8.2.2816: Vim9: comment below expression in lambda causes problems
Commit: https://github.com/vim/vim/commit/03717bf6a27d753fe8f9d713d66594fb1940515f
Author: Bram Moolenaar <Bram@vim.org>
Date: Wed Apr 28 20:00:40 2021 +0200
patch 8.2.2816: Vim9: comment below expression in lambda causes problems
Problem: Vim9: comment below expression in lambda causes problems.
Solution: Use a single space for empty and comment lines. (closes https://github.com/vim/vim/issues/8156)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Wed, 28 Apr 2021 20:15:04 +0200 |
| parents | b243f528702a |
| children | 75f45e1281be |
| files | src/eval.c src/testdir/test_vim9_expr.vim src/version.c |
| diffstat | 3 files changed, 23 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/eval.c +++ b/src/eval.c @@ -393,7 +393,7 @@ skip_expr(char_u **pp, evalarg_T *evalar } /* - * Skip over an expression at "*pp". + * Skip over an expression at "*arg". * If in Vim9 script and line breaks are encountered, the lines are * concatenated. "evalarg->eval_tofree" will be set accordingly. * "arg" is advanced to just after the expression. @@ -451,7 +451,7 @@ skip_expr_concatenate( // Line breaks encountered, concatenate all the lines. *((char_u **)gap->ga_data) = *start; - p = ga_concat_strings(gap, ""); + p = ga_concat_strings(gap, " "); // free the lines only when using getsourceline() if (evalarg->eval_cookie != NULL) @@ -2059,6 +2059,7 @@ eval_func( /* * Get the next line source line without advancing. But do skip over comment * lines. + * Only called for Vim9 script. */ static char_u * getline_peek_skip_comments(evalarg_T *evalarg) @@ -2116,6 +2117,7 @@ eval_next_non_blank(char_u *arg, evalarg /* * To be called after eval_next_non_blank() sets "getnext" to TRUE. + * Only called for Vim9 script. */ char_u * eval_next_line(evalarg_T *evalarg) @@ -2131,7 +2133,16 @@ eval_next_line(evalarg_T *evalarg) ++evalarg->eval_break_count; if (gap->ga_itemsize > 0 && ga_grow(gap, 1) == OK) { - // Going to concatenate the lines after parsing. + char_u *p = skipwhite(line); + + // Going to concatenate the lines after parsing. For an empty or + // comment line use an empty string. + if (*p == NUL || vim9_comment_start(p)) + { + vim_free(line); + line = vim_strsave((char_u *)""); + } + ((char_u **)gap->ga_data)[gap->ga_len] = line; ++gap->ga_len; }
--- a/src/testdir/test_vim9_expr.vim +++ b/src/testdir/test_vim9_expr.vim @@ -1887,6 +1887,7 @@ enddef def Test_expr7_lambda() var lines =<< trim END var La = () => 'result' + # comment assert_equal('result', La()) assert_equal([1, 3, 5], [1, 2, 3]->map((key, val) => key + val)) @@ -1897,6 +1898,12 @@ def Test_expr7_lambda() ) assert_equal([{}, {111: 111}, {}], dll) + # comment halfway an expression + var Ref = () => 4 + # comment + + 6 + assert_equal(10, Ref()) + ll = range(3) map(ll, (k, v) => v == 8 || v == 9