Mercurial > vim
changeset 29619:842690841d50 v9.0.0150
patch 9.0.0150: error for using #{ in an expression is a bit confusing
Commit: https://github.com/vim/vim/commit/25f40af9d2f04d18c8a276249f2794e83aa5c290
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Aug 6 11:35:28 2022 +0100
patch 9.0.0150: error for using #{ in an expression is a bit confusing
Problem: Error for using #{ in an expression is a bit confusing.
Solution: Mention that this error is only given for an expression.
Avoid giving the error more than once. (closes #10855)
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Sat, 06 Aug 2022 12:45:03 +0200 |
parents | ad8fa115e062 |
children | 1e975951ffb7 |
files | src/errors.h src/eval.c src/testdir/test_vim9_expr.vim src/version.c src/vim9script.c |
diffstat | 5 files changed, 13 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/errors.h +++ b/src/errors.h @@ -2984,8 +2984,8 @@ EXTERN char e_argument_already_declared_ INIT(= N_("E1168: Argument already declared in the script: %s")); EXTERN char e_expression_too_recursive_str[] INIT(= N_("E1169: Expression too recursive: %s")); -EXTERN char e_cannot_use_hash_curly_to_start_comment[] - INIT(= N_("E1170: Cannot use #{ to start a comment")); +EXTERN char e_cannot_use_hash_curly_to_start_comment_in_an_expression[] + INIT(= N_("E1170: Cannot use #{ to start a comment in an expression")); EXTERN char e_missing_end_block[] INIT(= N_("E1171: Missing } after inline function")); EXTERN char e_cannot_use_default_values_in_lambda[]
--- a/src/eval.c +++ b/src/eval.c @@ -2157,6 +2157,8 @@ newline_skip_comments(char_u *arg) break; p = nl; } + else if (vim9_bad_comment(p)) + break; if (*p != NL) break; ++p; // skip another NL @@ -2182,7 +2184,10 @@ getline_peek_skip_comments(evalarg_T *ev break; p = skipwhite(next); if (*p != NUL && !vim9_comment_start(p)) + { + (void)vim9_bad_comment(p); return next; + } if (eval_next_line(NULL, evalarg) == NULL) break; }
--- a/src/testdir/test_vim9_expr.vim +++ b/src/testdir/test_vim9_expr.vim @@ -2823,6 +2823,8 @@ def Test_expr9_dict() v9.CheckDefAndScriptFailure(["var x = 'a' .. #{a: 1}"], 'E1170:', 1) v9.CheckDefAndScriptFailure(["var x = true ? #{a: 1}"], 'E1170:', 1) + v9.CheckDefAndScriptFailure(["var x = 'a'", " #{a: 1}"], 'E1170:', 1) + v9.CheckDefAndScriptFailure(["var x = {a:8}"], 'E1069:', 1) v9.CheckDefAndScriptFailure(["var x = {a : 8}"], 'E1068:', 1) v9.CheckDefAndScriptFailure(["var x = {a :8}"], 'E1068:', 1)
--- a/src/version.c +++ b/src/version.c @@ -736,6 +736,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 150, +/**/ 149, /**/ 148,
--- a/src/vim9script.c +++ b/src/vim9script.c @@ -183,9 +183,9 @@ not_in_vim9(exarg_T *eap) int vim9_bad_comment(char_u *p) { - if (p[0] == '#' && p[1] == '{' && p[2] != '{') + if (!did_emsg && p[0] == '#' && p[1] == '{' && p[2] != '{') { - emsg(_(e_cannot_use_hash_curly_to_start_comment)); + emsg(_(e_cannot_use_hash_curly_to_start_comment_in_an_expression)); return TRUE; } return FALSE;