aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-25 03:54:15 -04:00
Code Activity

patch 8.2.3709: Vim9: backtick expression expanded when not desired

Browse Source 
Problem:    Vim9: backtick expression expanded when not desired.
Solution:   Only expand a backtick expression for commands that expand their
            argument.  Remove a few outdated TODO comments.
This commit is contained in:
Bram Moolenaar
2021-11-30 21:58:19 +00:00
parent 69535d8a0a
commit fad2742d53
3 changed files with 27 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/testdir/test_vim9_cmd.vim
View File

@@ -206,6 +206,15 @@ def Test_folddo_backtick_expansion()
folddoclose edit `=name` folddoclose edit `=name`
assert_equal('xxx', bufname()) assert_equal('xxx', bufname())
bwipe! bwipe!
var lines =<< trim END
g:val = 'value'
def Test()
folddoopen echo `=g:val`
enddef
call Test()
END
CheckScriptFailure(lines, 'E15: Invalid expression: "`=g:val`"')
enddef enddef
def Test_hardcopy_wildcards() def Test_hardcopy_wildcards()

2
src/version.c
View File

@@ -753,6 +753,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 */
/**/
3709,
/**/ /**/
3708, 3708,
/**/ /**/

20
src/vim9compile.c
View File

@@ -7898,8 +7898,7 @@ compile_elseif(char_u *arg, cctx_T *cctx)
int error = FALSE; int error = FALSE;
int v; int v;
// The expression results in a constant. // The expression result is a constant.
// TODO: how about nesting?
v = tv_get_bool_chk(&ppconst.pp_tv[0], &error); v = tv_get_bool_chk(&ppconst.pp_tv[0], &error);
if (error) if (error)
return NULL; return NULL;
@@ -8171,7 +8170,6 @@ compile_for(char_u *arg_start, cctx_T *cctx)
item_type = vartype->tt_member; item_type = vartype->tt_member;
else if (vartype->tt_member->tt_type == VAR_LIST else if (vartype->tt_member->tt_type == VAR_LIST
&& vartype->tt_member->tt_member->tt_type != VAR_ANY) && vartype->tt_member->tt_member->tt_type != VAR_ANY)
// TODO: should get the type for each lhs
item_type = vartype->tt_member->tt_member; item_type = vartype->tt_member->tt_member;
} }
@@ -8224,7 +8222,7 @@ compile_for(char_u *arg_start, cctx_T *cctx)
lhs_type = parse_type(&p, cctx->ctx_type_list, TRUE); lhs_type = parse_type(&p, cctx->ctx_type_list, TRUE);
} }
// TODO: script var not supported? // Script var is not supported.
if (get_var_dest(name, &dest, CMD_for, &opt_flags, if (get_var_dest(name, &dest, CMD_for, &opt_flags,
&vimvaridx, &type, cctx) == FAIL) &vimvaridx, &type, cctx) == FAIL)
goto failed; goto failed;
@@ -8800,8 +8798,6 @@ compile_finally(char_u *arg, cctx_T *cctx)
} }
if (generate_instr(cctx, ISN_FINALLY) == NULL) if (generate_instr(cctx, ISN_FINALLY) == NULL)
return NULL; return NULL;
// TODO: set index in ts_finally_label jumps
} }
return arg; return arg;
@@ -9184,9 +9180,17 @@ compile_exec(char_u *line_arg, exarg_T *eap, cctx_T *cctx)
if (eap->cmdidx == CMD_folddoopen || eap->cmdidx == CMD_folddoclosed) if (eap->cmdidx == CMD_folddoopen || eap->cmdidx == CMD_folddoclosed)
{ {
// TODO: should only expand when appropriate for the command exarg_T nea;
CLEAR_FIELD(nea);
nea.cmd = eap->arg;
p = find_ex_command(&nea, NULL, lookup_scriptitem, NULL);
if (nea.cmdidx <= CMD_SIZE)
{
has_expr = excmd_get_argt(nea.cmdidx) & (EX_XFILE | EX_EXPAND);
if (has_expr)
eap->arg = skiptowhite(eap->arg); eap->arg = skiptowhite(eap->arg);
has_expr = TRUE; }
} }
if (has_expr && (p = (char_u *)strstr((char *)eap->arg, "`=")) != NULL) if (has_expr && (p = (char_u *)strstr((char *)eap->arg, "`=")) != NULL)