mirror of
https://github.com/vim/vim.git
synced 2025-09-24 03:44:06 -04:00
patch 8.2.2525: Vim9: only local variables checked for a name
Problem: Vim9: only local variables checked for a name. Solution: Also check arguments and script variables. (closes #7838)
This commit is contained in:
@@ -3307,7 +3307,7 @@ skip_option_env_lead(char_u *start)
|
|||||||
find_ex_command(
|
find_ex_command(
|
||||||
exarg_T *eap,
|
exarg_T *eap,
|
||||||
int *full UNUSED,
|
int *full UNUSED,
|
||||||
int (*lookup)(char_u *, size_t, void *, cctx_T *) UNUSED,
|
int (*lookup)(char_u *, size_t, cctx_T *) UNUSED,
|
||||||
cctx_T *cctx UNUSED)
|
cctx_T *cctx UNUSED)
|
||||||
{
|
{
|
||||||
int len;
|
int len;
|
||||||
@@ -3416,7 +3416,7 @@ find_ex_command(
|
|||||||
|
|
||||||
// Recognize an assignment if we recognize the variable name:
|
// Recognize an assignment if we recognize the variable name:
|
||||||
// "g:var = expr"
|
// "g:var = expr"
|
||||||
// "var = expr" where "var" is a local var name.
|
// "var = expr" where "var" is a variable name.
|
||||||
if (*eap->cmd == '@')
|
if (*eap->cmd == '@')
|
||||||
p = eap->cmd + 2;
|
p = eap->cmd + 2;
|
||||||
oplen = assignment_len(skipwhite(p), &heredoc);
|
oplen = assignment_len(skipwhite(p), &heredoc);
|
||||||
@@ -3426,7 +3426,7 @@ find_ex_command(
|
|||||||
|| *eap->cmd == '&'
|
|| *eap->cmd == '&'
|
||||||
|| *eap->cmd == '$'
|
|| *eap->cmd == '$'
|
||||||
|| *eap->cmd == '@'
|
|| *eap->cmd == '@'
|
||||||
|| lookup(eap->cmd, p - eap->cmd, NULL, cctx) == OK)
|
|| lookup(eap->cmd, p - eap->cmd, cctx) == OK)
|
||||||
{
|
{
|
||||||
eap->cmdidx = CMD_var;
|
eap->cmdidx = CMD_var;
|
||||||
return eap->cmd;
|
return eap->cmd;
|
||||||
@@ -3445,7 +3445,7 @@ find_ex_command(
|
|||||||
// If it is an ID it might be a variable with an operator on the next
|
// If it is an ID it might be a variable with an operator on the next
|
||||||
// line, if the variable exists it can't be an Ex command.
|
// line, if the variable exists it can't be an Ex command.
|
||||||
if (p > eap->cmd && ends_excmd(*skipwhite(p))
|
if (p > eap->cmd && ends_excmd(*skipwhite(p))
|
||||||
&& (lookup(eap->cmd, p - eap->cmd, NULL, cctx) == OK
|
&& (lookup(eap->cmd, p - eap->cmd, cctx) == OK
|
||||||
|| (ASCII_ISALPHA(eap->cmd[0]) && eap->cmd[1] == ':')))
|
|| (ASCII_ISALPHA(eap->cmd[0]) && eap->cmd[1] == ':')))
|
||||||
{
|
{
|
||||||
eap->cmdidx = CMD_eval;
|
eap->cmdidx = CMD_eval;
|
||||||
|
@@ -13,9 +13,10 @@ void undo_cmdmod(cmdmod_T *cmod);
|
|||||||
int parse_cmd_address(exarg_T *eap, char **errormsg, int silent);
|
int parse_cmd_address(exarg_T *eap, char **errormsg, int silent);
|
||||||
int checkforcmd(char_u **pp, char *cmd, int len);
|
int checkforcmd(char_u **pp, char *cmd, int len);
|
||||||
char_u *skip_option_env_lead(char_u *start);
|
char_u *skip_option_env_lead(char_u *start);
|
||||||
char_u *find_ex_command(exarg_T *eap, int *full, int (*lookup)(char_u *, size_t, void *, cctx_T *), cctx_T *cctx);
|
char_u *find_ex_command(exarg_T *eap, int *full, int (*lookup)(char_u *, size_t, cctx_T *), cctx_T *cctx);
|
||||||
int modifier_len(char_u *cmd);
|
int modifier_len(char_u *cmd);
|
||||||
int cmd_exists(char_u *name);
|
int cmd_exists(char_u *name);
|
||||||
|
void f_fullcommand(typval_T *argvars, typval_T *rettv);
|
||||||
cmdidx_T excmd_get_cmdidx(char_u *cmd, int len);
|
cmdidx_T excmd_get_cmdidx(char_u *cmd, int len);
|
||||||
long excmd_get_argt(cmdidx_T idx);
|
long excmd_get_argt(cmdidx_T idx);
|
||||||
char_u *skip_range(char_u *cmd, int skip_star, int *ctx);
|
char_u *skip_range(char_u *cmd, int skip_star, int *ctx);
|
||||||
|
@@ -323,6 +323,11 @@ def Test_for_linebreak()
|
|||||||
CheckScriptSuccess(lines)
|
CheckScriptSuccess(lines)
|
||||||
enddef
|
enddef
|
||||||
|
|
||||||
|
def MethodAfterLinebreak(arg: string)
|
||||||
|
arg
|
||||||
|
->setline(1)
|
||||||
|
enddef
|
||||||
|
|
||||||
def Test_method_call_linebreak()
|
def Test_method_call_linebreak()
|
||||||
var lines =<< trim END
|
var lines =<< trim END
|
||||||
vim9script
|
vim9script
|
||||||
@@ -361,6 +366,11 @@ def Test_method_call_linebreak()
|
|||||||
g:shortlist = [1, 2]
|
g:shortlist = [1, 2]
|
||||||
CheckDefAndScriptSuccess(lines)
|
CheckDefAndScriptSuccess(lines)
|
||||||
unlet g:shortlist
|
unlet g:shortlist
|
||||||
|
|
||||||
|
new
|
||||||
|
MethodAfterLinebreak('foobar')
|
||||||
|
assert_equal('foobar', getline(1))
|
||||||
|
bwipe!
|
||||||
enddef
|
enddef
|
||||||
|
|
||||||
def Test_method_call_whitespace()
|
def Test_method_call_whitespace()
|
||||||
|
@@ -750,6 +750,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
2525,
|
||||||
/**/
|
/**/
|
||||||
2524,
|
2524,
|
||||||
/**/
|
/**/
|
||||||
|
@@ -372,6 +372,19 @@ script_var_exists(char_u *name, size_t len, int vim9script, cctx_T *cctx)
|
|||||||
return FAIL;
|
return FAIL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Return TRUE if "name" is a local variable, argument, script variable or
|
||||||
|
* imported.
|
||||||
|
*/
|
||||||
|
static int
|
||||||
|
variable_exists(char_u *name, size_t len, cctx_T *cctx)
|
||||||
|
{
|
||||||
|
return lookup_local(name, len, NULL, cctx) == OK
|
||||||
|
|| arg_exists(name, len, NULL, NULL, NULL, cctx) == OK
|
||||||
|
|| script_var_exists(name, len, FALSE, cctx) == OK
|
||||||
|
|| find_imported(name, len, cctx) != NULL;
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Check if "p[len]" is already defined, either in script "import_sid" or in
|
* Check if "p[len]" is already defined, either in script "import_sid" or in
|
||||||
* compilation context "cctx". "cctx" is NULL at the script level.
|
* compilation context "cctx". "cctx" is NULL at the script level.
|
||||||
@@ -6444,10 +6457,7 @@ may_compile_assignment(exarg_T *eap, char_u **line, cctx_T *cctx)
|
|||||||
|| *eap->cmd == '$'
|
|| *eap->cmd == '$'
|
||||||
|| *eap->cmd == '@'
|
|| *eap->cmd == '@'
|
||||||
|| ((len) > 2 && eap->cmd[1] == ':')
|
|| ((len) > 2 && eap->cmd[1] == ':')
|
||||||
|| lookup_local(eap->cmd, len, NULL, cctx) == OK
|
|| variable_exists(eap->cmd, len, cctx))
|
||||||
|| arg_exists(eap->cmd, len, NULL, NULL, NULL, cctx) == OK
|
|
||||||
|| script_var_exists(eap->cmd, len, FALSE, cctx) == OK
|
|
||||||
|| find_imported(eap->cmd, len, cctx) != NULL)
|
|
||||||
{
|
{
|
||||||
*line = compile_assignment(eap->cmd, eap, CMD_SIZE, cctx);
|
*line = compile_assignment(eap->cmd, eap, CMD_SIZE, cctx);
|
||||||
if (*line == NULL || *line == eap->cmd)
|
if (*line == NULL || *line == eap->cmd)
|
||||||
@@ -8332,7 +8342,7 @@ compile_def_function(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
p = find_ex_command(&ea, NULL, starts_with_colon ? NULL
|
p = find_ex_command(&ea, NULL, starts_with_colon ? NULL
|
||||||
: (int (*)(char_u *, size_t, void *, cctx_T *))lookup_local,
|
: (int (*)(char_u *, size_t, cctx_T *))variable_exists,
|
||||||
&cctx);
|
&cctx);
|
||||||
|
|
||||||
if (p == NULL)
|
if (p == NULL)
|
||||||
|
Reference in New Issue
Block a user