1
0
forked from aniani/vim

patch 8.2.1504: Vim9: white space checks are only done for a :def function

Problem:    Vim9: white space checks are only done for a :def function.
Solution:   Also do checks at the script level.  Adjust the name of a few
            error messages.
This commit is contained in:
Bram Moolenaar
2020-08-21 22:36:47 +02:00
parent 81e17fbe00
commit 7cb6fc29d0
11 changed files with 65 additions and 39 deletions

View File

@@ -862,7 +862,7 @@ eval_dict(char_u **arg, typval_T *rettv, evalarg_T *evalarg, int literal)
if (evaluate)
{
if (*skipwhite(*arg) == ':')
semsg(_(e_no_white_space_allowed_before), ":");
semsg(_(e_no_white_space_allowed_before_str), ":");
else
semsg(_(e_missing_dict_colon), *arg);
}
@@ -881,7 +881,7 @@ eval_dict(char_u **arg, typval_T *rettv, evalarg_T *evalarg, int literal)
}
if (vim9script && (*arg)[1] != NUL && !VIM_ISWHITE((*arg)[1]))
{
semsg(_(e_white_space_required_after), ":");
semsg(_(e_white_space_required_after_str), ":");
clear_tv(&tvkey);
goto failret;
}
@@ -924,7 +924,7 @@ eval_dict(char_u **arg, typval_T *rettv, evalarg_T *evalarg, int literal)
{
if (vim9script && (*arg)[1] != NUL && !VIM_ISWHITE((*arg)[1]))
{
semsg(_(e_white_space_required_after), ",");
semsg(_(e_white_space_required_after_str), ",");
goto failret;
}
*arg = skipwhite(*arg + 1);
@@ -939,7 +939,7 @@ eval_dict(char_u **arg, typval_T *rettv, evalarg_T *evalarg, int literal)
if (evaluate)
{
if (**arg == ',')
semsg(_(e_no_white_space_allowed_before), ",");
semsg(_(e_no_white_space_allowed_before_str), ",");
else
semsg(_(e_missing_dict_comma), *arg);
}