aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-10-04 05:25:06 -04:00
Code Activity

patch 8.2.4667: expandcmd() fails on an error

Browse Source 
Problem:    expandcmd() fails on an error.
Solution:   On failure return the command unmodified. (yegappan Lakshmanan,
            closes #10063)
This commit is contained in:
Yegappan Lakshmanan
2022-04-02 21:12:21 +01:00
committed by Bram Moolenaar
parent 97f8c1081e
commit 5018a836c0
4 changed files with 27 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
runtime/doc/builtin.txt
View File

@@ -2299,10 +2299,13 @@ expandcmd({string}) *expandcmd()*
like with |expand()|, and environment variables, anywhere in like with |expand()|, and environment variables, anywhere in
{string}. "~user" and "~/path" are only expanded at the {string}. "~user" and "~/path" are only expanded at the
start. start.
Returns the expanded string. Example: > Returns the expanded string. If an error is encountered
during expansion, the unmodified {string} is returned.
Example: >
:echo expandcmd('make %<.o') :echo expandcmd('make %<.o')
< make /path/runtime/doc/builtin.o ~
< Can also be used as a |method|: > Can also be used as a |method|: >
GetCommand()->expandcmd() GetCommand()->expandcmd()
< <
extend({expr1}, {expr2} [, {expr3}]) *extend()* extend({expr1}, {expr2} [, {expr3}]) *extend()*

7
src/evalfunc.c
View File

@@ -4168,9 +4168,9 @@ f_expandcmd(typval_T *argvars, typval_T *rettv)
eap.nextcmd = NULL; eap.nextcmd = NULL;
eap.cmdidx = CMD_USER; eap.cmdidx = CMD_USER;
++emsg_off;
expand_filename(&eap, &cmdstr, &errormsg); expand_filename(&eap, &cmdstr, &errormsg);
if (errormsg != NULL && *errormsg != NUL) --emsg_off;
emsg(errormsg);
rettv->vval.v_string = cmdstr; rettv->vval.v_string = cmdstr;
} }
@@ -4444,8 +4444,7 @@ common_function(typval_T *argvars, typval_T *rettv, int is_funcref)
arg_idx = 0; arg_idx = 0;
else if (list->lv_len > MAX_FUNC_ARGS) else if (list->lv_len > MAX_FUNC_ARGS)
{ {
emsg_funcname((char *)e_too_many_arguments_for_function_str, emsg_funcname(e_too_many_arguments_for_function_str, s);
s);
vim_free(name); vim_free(name);
goto theend; goto theend;
} }

28
src/testdir/test_expand.vim
View File

@@ -78,10 +78,11 @@ func Test_expandcmd()
edit a1a2a3.rb edit a1a2a3.rb
call assert_equal('make b1b2b3.rb a1a2a3 Xfile.o', expandcmd('make %:gs?a?b? %< #<.o')) call assert_equal('make b1b2b3.rb a1a2a3 Xfile.o', expandcmd('make %:gs?a?b? %< #<.o'))
call assert_fails('call expandcmd("make <afile>")', 'E495:') call assert_equal('make <afile>', expandcmd("make <afile>"))
call assert_fails('call expandcmd("make <afile>")', 'E495:') call assert_equal('make <amatch>', expandcmd("make <amatch>"))
call assert_equal('make <abuf>', expandcmd("make <abuf>"))
enew enew
call assert_fails('call expandcmd("make %")', 'E499:') call assert_equal('make %', expandcmd("make %"))
let $FOO="blue\tsky" let $FOO="blue\tsky"
call setline(1, "$FOO") call setline(1, "$FOO")
call assert_equal("grep pat blue\tsky", expandcmd('grep pat <cfile>')) call assert_equal("grep pat blue\tsky", expandcmd('grep pat <cfile>'))
@@ -94,6 +95,11 @@ func Test_expandcmd()
let $FOO= "foo bar baz" let $FOO= "foo bar baz"
call assert_equal("e foo bar baz", expandcmd("e $FOO")) call assert_equal("e foo bar baz", expandcmd("e $FOO"))
if has('unix')
" test for using the shell to expand a command argument
call assert_equal('{1..4}', expandcmd('{1..4}'))
endif
unlet $FOO unlet $FOO
close! close!
endfunc endfunc
@@ -101,14 +107,14 @@ endfunc
" Test for expanding <sfile>, <slnum> and <sflnum> outside of sourcing a script " Test for expanding <sfile>, <slnum> and <sflnum> outside of sourcing a script
func Test_source_sfile() func Test_source_sfile()
let lines =<< trim [SCRIPT] let lines =<< trim [SCRIPT]
:call assert_fails('echo expandcmd("<sfile>")', 'E498:') :call assert_equal('<sfile>', expandcmd("<sfile>"))
:call assert_fails('echo expandcmd("<slnum>")', 'E842:') :call assert_equal('<slnum>', expandcmd("<slnum>"))
:call assert_fails('echo expandcmd("<sflnum>")', 'E961:') :call assert_equal('<sflnum>', expandcmd("<sflnum>"))
:call assert_fails('call expandcmd("edit <cfile>")', 'E446:') :call assert_equal('edit <cfile>', expandcmd("edit <cfile>"))
:call assert_fails('call expandcmd("edit #")', 'E194:') :call assert_equal('edit #', expandcmd("edit #"))
:call assert_fails('call expandcmd("edit #<2")', 'E684:') :call assert_equal('edit #<2', expandcmd("edit #<2"))
:call assert_fails('call expandcmd("edit <cword>")', 'E348:') :call assert_equal('edit <cword>', expandcmd("edit <cword>"))
:call assert_fails('call expandcmd("edit <cexpr>")', 'E348:') :call assert_equal('edit <cexpr>', expandcmd("edit <cexpr>"))
:call assert_fails('autocmd User MyCmd echo "<sfile>"', 'E498:') :call assert_fails('autocmd User MyCmd echo "<sfile>"', 'E498:')
:call writefile(v:errors, 'Xresult') :call writefile(v:errors, 'Xresult')
:qall! :qall!

2
src/version.c
View File

@@ -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 */
/**/
4667,
/**/ /**/
4666, 4666,
/**/ /**/