aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00
Code Activity

patch 8.2.4509: Vim9: can declare a variable with ":va"

Browse Source 
Problem:    Vim9: can declare a variable with ":va".
Solution:   Disallow using ":va", require using ":var".
This commit is contained in:
Bram Moolenaar
2022-03-05 11:37:48 +00:00
parent 330a388e18
commit e1d1211799
5 changed files with 25 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/errors.h
View File

@@ -2762,7 +2762,8 @@ EXTERN char e_type_mismatch_for_v_variable[]
EXTERN char e_yank_register_changed_while_using_it[]
INIT(= N_("E1064: Yank register changed while using it"));
#ifdef FEAT_EVAL
// E1065 unused
EXTERN char e_must_use_var_instead_of_va[]
INIT(= N_("E1065: Must use :var instead of :va"));
EXTERN char e_cannot_declare_a_register_str[]
INIT(= N_("E1066: Cannot declare a register: %s"));
EXTERN char e_separator_mismatch_str[]

9
src/evalvars.c
View File

@@ -755,17 +755,24 @@ heredoc_get(exarg_T *eap, char_u *cmd, int script_get)
ex_var(exarg_T *eap)
{
char_u *p = eap->cmd;
int has_var;
if (!in_vim9script())
{
semsg(_(e_str_cannot_be_used_in_legacy_vim_script), ":var");
return;
}
if (current_sctx.sc_sid == 0 && checkforcmd_noparen(&p, "var", 3))
has_var = checkforcmd_noparen(&p, "var", 3);
if (current_sctx.sc_sid == 0 && has_var)
{
emsg(_(e_cannot_declare_variable_on_command_line));
return;
}
if (eap->arg > eap->cmd && !has_var)
{
emsg(_(e_must_use_var_instead_of_va));
return;
}
ex_let(eap);
}

5
src/testdir/test_vim9_assign.vim
View File

@@ -1965,6 +1965,11 @@ def Test_var_declaration_fails()
v9.CheckDefFailure(['var foo.bar = 2'], 'E1087:')
v9.CheckDefFailure(['var foo[3] = 2'], 'E1087:')
v9.CheckDefFailure(['const foo: number'], 'E1021:')
lines =<< trim END
va foo = 123
END
v9.CheckDefAndScriptFailure(lines, 'E1065:', 1)
enddef
def Test_var_declaration_inferred()

2
src/version.c
View File

@@ -754,6 +754,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
4509,
/**/
4508,
/**/

9
src/vim9compile.c
View File

@@ -1883,7 +1883,14 @@ compile_assignment(char_u *arg, exarg_T *eap, cmdidx_T cmdidx, cctx_T *cctx)
lhs_T lhs;
long start_lnum = SOURCING_LNUM;
// Skip over the "var" or "[var, var]" to get to any "=".
p = eap->cmd;
if (eap->cmdidx == CMD_var && arg > p && !checkforcmd_noparen(&p, "var", 3))
{
emsg(_(e_must_use_var_instead_of_va));
return NULL;
}
// Skip over the "varname" or "[varname, varname]" to get to any "=".
p = skip_var_list(arg, TRUE, &var_count, &semicolon, TRUE);
if (p == NULL)
return *arg == '[' ? arg : NULL;