thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.2.2266: Vim9: it can be hard to see where white space is missing

Browse Source 
Problem:    Vim9: it can be hard to see where white space is missing.
Solution:   Mention the text where the error was seen. (closes #7580)
This commit is contained in:
Bram Moolenaar
2021-01-01 19:17:55 +01:00
parent b8ba9b9197
commit e7a73e0762
7 changed files with 35 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/vim9compile.c
View File

@@ -3656,7 +3656,8 @@ compile_subscript(
return FAIL;
if (**arg == ':')
{
semsg(_(e_white_space_required_before_and_after_str), ":");
semsg(_(e_white_space_required_before_and_after_str_at_str),
":", *arg);
return FAIL;
}
if (may_get_next_line_error(p, arg, cctx) == FAIL)
@@ -3669,7 +3670,8 @@ compile_subscript(
++*arg;
if (!IS_WHITE_OR_NUL(**arg) && **arg != ']')
{
semsg(_(e_white_space_required_before_and_after_str), ":");
semsg(_(e_white_space_required_before_and_after_str_at_str),
":", *arg);
return FAIL;
}
*arg = skipwhite(*arg);
@@ -4067,7 +4069,7 @@ error_white_both(char_u *op, int len)
char_u buf[10];
vim_strncpy(buf, op, len);
semsg(_(e_white_space_required_before_and_after_str), buf);
semsg(_(e_white_space_required_before_and_after_str_at_str), buf, op);
}
/*
@@ -4434,7 +4436,8 @@ compile_and_or(
if (!IS_WHITE_OR_NUL(**arg) || !IS_WHITE_OR_NUL(p[2]))
{
semsg(_(e_white_space_required_before_and_after_str), op);
semsg(_(e_white_space_required_before_and_after_str_at_str),
op, *arg);
return FAIL;
}
@@ -4608,8 +4611,8 @@ compile_expr1(char_u **arg, cctx_T *cctx, ppconst_T *ppconst)
if (!IS_WHITE_OR_NUL(**arg) || !IS_WHITE_OR_NUL(p[1 + op_falsy]))
{
semsg(_(e_white_space_required_before_and_after_str),
op_falsy ? "??" : "?");
semsg(_(e_white_space_required_before_and_after_str_at_str),
op_falsy ? "??" : "?", *arg);
return FAIL;
}
@@ -4695,7 +4698,8 @@ compile_expr1(char_u **arg, cctx_T *cctx, ppconst_T *ppconst)
if (!IS_WHITE_OR_NUL(**arg) || !IS_WHITE_OR_NUL(p[1]))
{
semsg(_(e_white_space_required_before_and_after_str), ":");
semsg(_(e_white_space_required_before_and_after_str_at_str),
":", p);
return FAIL;
}