Mercurial > vim
changeset 21385:54a304e4dc57 v8.2.1243
patch 8.2.1243: Vim9: cannot have a comment line halfway a list
Commit: https://github.com/vim/vim/commit/75783bd84e42e8431e4a62dfbabc9be1a1e56901
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Jul 19 14:41:58 2020 +0200
patch 8.2.1243: Vim9: cannot have a comment line halfway a list
Problem: Vim9: cannot have a comment or empty line halfway a list at script
level.
Solution: Skip more than one line if needed.
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sun, 19 Jul 2020 14:45:03 +0200 |
| parents | 0c7e050ddcf4 |
| children | e29093c09d58 |
| files | src/eval.c src/proto/vim9compile.pro src/scriptfile.c src/version.c src/vim9compile.c |
| diffstat | 5 files changed, 13 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/eval.c +++ b/src/eval.c @@ -1913,7 +1913,7 @@ eval_next_non_blank(char_u *arg, evalarg && evalarg != NULL && (evalarg->eval_cookie != NULL || evalarg->eval_cctx != NULL) && (*arg == NUL || (VIM_ISWHITE(arg[-1]) - && *arg == '#' && arg[1] != '{'))) + && vim9_comment_start(arg)))) { char_u *p;
--- a/src/proto/vim9compile.pro +++ b/src/proto/vim9compile.pro @@ -11,6 +11,7 @@ char *vartype_name(vartype_T type); char *type_name(type_T *type, char **tofree); int get_script_item_idx(int sid, char_u *name, int check_writable); imported_T *find_imported(char_u *name, size_t len, cctx_T *cctx); +int vim9_comment_start(char_u *p); char_u *peek_next_line_from_context(cctx_T *cctx); char_u *next_line_from_context(cctx_T *cctx, int skip_comment); char_u *to_name_const_end(char_u *arg);
--- a/src/scriptfile.c +++ b/src/scriptfile.c @@ -1763,10 +1763,13 @@ getsourceline(int c UNUSED, void *cookie // backslash. We always need to read the next line, keep it in // sp->nextline. /* Also check for a comment in between continuation lines: "\ */ + // Also check for a Vim9 comment and empty line. sp->nextline = get_one_sourceline(sp); if (sp->nextline != NULL && (*(p = skipwhite(sp->nextline)) == '\\' - || (p[0] == '"' && p[1] == '\\' && p[2] == ' '))) + || (p[0] == '"' && p[1] == '\\' && p[2] == ' ') + || (in_vim9script() + && (*p == NUL || vim9_comment_start(p))))) { garray_T ga; @@ -1794,8 +1797,11 @@ getsourceline(int c UNUSED, void *cookie } ga_concat(&ga, p + 1); } - else if (p[0] != '"' || p[1] != '\\' || p[2] != ' ') + else if (!(p[0] == '"' && p[1] == '\\' && p[2] == ' ') + && !(in_vim9script() + && (*p == NUL || vim9_comment_start(p)))) break; + /* drop a # comment or "\ comment line */ } ga_append(&ga, NUL); vim_free(line);