IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #19852 from zeertzjq/vim-8.2.3623

Browse Source 
vim-patch:8.2.{3623,4667}: expandcmd() fixes
This commit is contained in:
zeertzjq 2022-08-20 07:49:31 +08:00 committed by GitHub
commit 1a57cd3836
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 42 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
runtime/doc/builtin.txt
View File

@ -2074,10 +2074,13 @@ expandcmd({string}) *expandcmd()*
like with |expand()|, and environment variables, anywhere in
{string}. "~user" and "~/path" are only expanded at the
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')
< make /path/runtime/doc/builtin.o ~
< Can also be used as a |method|: >
Can also be used as a |method|: >
GetCommand()->expandcmd()
<
extend({expr1}, {expr2} [, {expr3}]) *extend()*

6
src/nvim/eval/funcs.c
View File

@ -2052,10 +2052,10 @@ static void f_expandcmd(typval_T *argvars, typval_T *rettv, FunPtr fptr)
};
eap.argt |= EX_NOSPC;
emsg_off++;
expand_filename(&eap, &cmdstr, &errormsg);
if (errormsg != NULL && *errormsg != NUL) {
emsg(errormsg);
}
emsg_off--;
rettv->vval.v_string = cmdstr;
}

14
src/nvim/os/shell.c
View File

@ -249,10 +249,16 @@ int os_expand_wildcards(int num_pat, char **pat, int *num_file, char ***file, in
}
STRCAT(command, ">");
} else {
if (flags & EW_NOTFOUND) {
STRCPY(command, "set nonomatch; ");
} else {
STRCPY(command, "unset nonomatch; ");
STRCPY(command, "");
if (shell_style == STYLE_GLOB) {
// Assume the nonomatch option is valid only for csh like shells,
// otherwise, this may set the positional parameters for the shell,
// e.g. "$*".
if (flags & EW_NOTFOUND) {
STRCAT(command, "set nonomatch; ");
} else {
STRCAT(command, "unset nonomatch; ");
}
}
if (shell_style == STYLE_GLOB) {
STRCAT(command, "glob >");

35
src/nvim/testdir/test_expand.vim
View File

@ -1,6 +1,7 @@
" Test for expanding file names
source shared.vim
source check.vim
func Test_with_directories()
call mkdir('Xdir1')
@ -77,10 +78,11 @@ func Test_expandcmd()
edit a1a2a3.rb
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_fails('call expandcmd("make <afile>")', 'E495:')
call assert_equal('make <afile>', expandcmd("make <afile>"))
call assert_equal('make <amatch>', expandcmd("make <amatch>"))
call assert_equal('make <abuf>', expandcmd("make <abuf>"))
enew
call assert_fails('call expandcmd("make %")', 'E499:')
call assert_equal('make %', expandcmd("make %"))
let $FOO="blue\tsky"
call setline(1, "$FOO")
call assert_equal("grep pat blue\tsky", expandcmd('grep pat <cfile>'))
@ -93,6 +95,11 @@ func Test_expandcmd()
let $FOO= "foo bar baz"
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
close!
endfunc
@ -100,14 +107,14 @@ endfunc
" Test for expanding <sfile>, <slnum> and <sflnum> outside of sourcing a script
func Test_source_sfile()
let lines =<< trim [SCRIPT]
:call assert_fails('echo expandcmd("<sfile>")', 'E498:')
:call assert_fails('echo expandcmd("<slnum>")', 'E842:')
:call assert_fails('echo expandcmd("<sflnum>")', 'E961:')
:call assert_fails('call expandcmd("edit <cfile>")', 'E446:')
:call assert_fails('call expandcmd("edit #")', 'E194:')
:call assert_fails('call expandcmd("edit #<2")', 'E684:')
:call assert_fails('call expandcmd("edit <cword>")', 'E348:')
:call assert_fails('call expandcmd("edit <cexpr>")', 'E348:')
:call assert_equal('<sfile>', expandcmd("<sfile>"))
:call assert_equal('<slnum>', expandcmd("<slnum>"))
:call assert_equal('<sflnum>', expandcmd("<sflnum>"))
:call assert_equal('edit <cfile>', expandcmd("edit <cfile>"))
:call assert_equal('edit #', expandcmd("edit #"))
:call assert_equal('edit #<2', expandcmd("edit #<2"))
:call assert_equal('edit <cword>', expandcmd("edit <cword>"))
:call assert_equal('edit <cexpr>', expandcmd("edit <cexpr>"))
:call assert_fails('autocmd User MyCmd echo "<sfile>"', 'E498:')
:call writefile(v:errors, 'Xresult')
:qall!
@ -131,7 +138,13 @@ func Test_expand_filename_multicmd()
call assert_equal(4, winnr('$'))
call assert_equal('foo!', bufname(winbufnr(1)))
call assert_equal('foo', bufname(winbufnr(2)))
call assert_fails('e %:s/.*//', 'E500:')
%bwipe!
endfunc
func Test_expandcmd_shell_nonomatch()
CheckNotMSWindows
call assert_equal('$*', expandcmd('$*'))
endfunc
" vim: shiftwidth=2 sts=2 expandtab