mirror of
https://github.com/vim/vim.git
synced 2025-07-26 11:04:33 -04:00
patch 9.1.0045: --remote-* does not ignore wilidignore
Problem: --remote-silent applies the wildignore option to each argument, which may result in "E479: No match" (hebaronson) Solution: temporarily reset 'wildignore' setting when building the :drop command closes: #13835 Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
parent
e13b665a6e
commit
cc979b49dc
@ -566,6 +566,10 @@ build_drop_cmd(
|
|||||||
char_u *p;
|
char_u *p;
|
||||||
char_u *cdp;
|
char_u *cdp;
|
||||||
char_u *cwd;
|
char_u *cwd;
|
||||||
|
// reset wildignore temporarily
|
||||||
|
const char *wig[] =
|
||||||
|
{ "<CR><C-\\><C-N>:let g:_wig=&wig|set wig=",
|
||||||
|
"<C-\\><C-N>:let &wig=g:_wig|unlet g:_wig<CR>"};
|
||||||
|
|
||||||
if (filec > 0 && filev[0][0] == '+')
|
if (filec > 0 && filev[0][0] == '+')
|
||||||
{
|
{
|
||||||
@ -599,6 +603,8 @@ build_drop_cmd(
|
|||||||
ga_init2(&ga, 1, 100);
|
ga_init2(&ga, 1, 100);
|
||||||
ga_concat(&ga, (char_u *)"<C-\\><C-N>:cd ");
|
ga_concat(&ga, (char_u *)"<C-\\><C-N>:cd ");
|
||||||
ga_concat(&ga, cdp);
|
ga_concat(&ga, cdp);
|
||||||
|
// reset wildignorecase temporarily
|
||||||
|
ga_concat(&ga, (char_u *)wig[0]);
|
||||||
|
|
||||||
// Call inputsave() so that a prompt for an encryption key works.
|
// Call inputsave() so that a prompt for an encryption key works.
|
||||||
ga_concat(&ga, (char_u *)
|
ga_concat(&ga, (char_u *)
|
||||||
@ -650,6 +656,8 @@ build_drop_cmd(
|
|||||||
ga_concat(&ga, cdp);
|
ga_concat(&ga, cdp);
|
||||||
ga_concat(&ga, (char_u *)"'|cd -|endif|endif<CR>");
|
ga_concat(&ga, (char_u *)"'|cd -|endif|endif<CR>");
|
||||||
vim_free(cdp);
|
vim_free(cdp);
|
||||||
|
// reset wildignorecase
|
||||||
|
ga_concat(&ga, (char_u *)wig[1]);
|
||||||
|
|
||||||
if (sendReply)
|
if (sendReply)
|
||||||
ga_concat(&ga, (char_u *)":call SetupRemoteReplies()<CR>");
|
ga_concat(&ga, (char_u *)":call SetupRemoteReplies()<CR>");
|
||||||
|
@ -248,6 +248,7 @@ NEW_TESTS = \
|
|||||||
test_regexp_utf8 \
|
test_regexp_utf8 \
|
||||||
test_registers \
|
test_registers \
|
||||||
test_reltime \
|
test_reltime \
|
||||||
|
test_remote \
|
||||||
test_rename \
|
test_rename \
|
||||||
test_restricted \
|
test_restricted \
|
||||||
test_retab \
|
test_retab \
|
||||||
@ -492,6 +493,7 @@ NEW_TESTS_RES = \
|
|||||||
test_recover.res \
|
test_recover.res \
|
||||||
test_regex_char_classes.res \
|
test_regex_char_classes.res \
|
||||||
test_registers.res \
|
test_registers.res \
|
||||||
|
test_remote.res \
|
||||||
test_rename.res \
|
test_rename.res \
|
||||||
test_restricted.res \
|
test_restricted.res \
|
||||||
test_retab.res \
|
test_retab.res \
|
||||||
|
79
src/testdir/test_remote.vim
Normal file
79
src/testdir/test_remote.vim
Normal file
@ -0,0 +1,79 @@
|
|||||||
|
" Test for the --remote functionality
|
||||||
|
|
||||||
|
source check.vim
|
||||||
|
CheckFeature clientserver
|
||||||
|
CheckFeature terminal
|
||||||
|
|
||||||
|
source shared.vim
|
||||||
|
source screendump.vim
|
||||||
|
source mouse.vim
|
||||||
|
source term_util.vim
|
||||||
|
|
||||||
|
let s:remote_works = 0
|
||||||
|
let s:skip = 'Skipped: --remote feature is not possible'
|
||||||
|
|
||||||
|
" nees to be run as first test to verify, that vim --servername works
|
||||||
|
func Verify_remote_feature_works()
|
||||||
|
CheckRunVimInTerminal
|
||||||
|
enew
|
||||||
|
let buf = RunVimInTerminal('--servername XVIMTEST', {'rows': 8})
|
||||||
|
call TermWait(buf)
|
||||||
|
let cmd = GetVimCommandCleanTerm() .. '--serverlist'
|
||||||
|
call term_sendkeys(buf, ":r! " .. cmd .. "\<CR>")
|
||||||
|
call TermWait(buf)
|
||||||
|
call term_sendkeys(buf, ":w! XVimRemoteTest.txt\<CR>")
|
||||||
|
call TermWait(buf)
|
||||||
|
call term_sendkeys(buf, ":q\<CR>")
|
||||||
|
call StopVimInTerminal(buf)
|
||||||
|
bw!
|
||||||
|
let result = readfile('XVimRemoteTest.txt')
|
||||||
|
call delete('XVimRemoteTest.txt')
|
||||||
|
if empty(result)
|
||||||
|
throw s:skip
|
||||||
|
endif
|
||||||
|
let s:remote = 1
|
||||||
|
endfunc
|
||||||
|
|
||||||
|
call Verify_remote_feature_works()
|
||||||
|
|
||||||
|
if !s:remote
|
||||||
|
finish
|
||||||
|
endif
|
||||||
|
|
||||||
|
func Test_remote_servername()
|
||||||
|
CheckRunVimInTerminal
|
||||||
|
|
||||||
|
" That is the file we want the server to open,
|
||||||
|
" despite the wildignore setting
|
||||||
|
call writefile(range(1, 20), 'XTEST.txt', 'D')
|
||||||
|
" just a dummy file, so that the ':wq' further down is successful
|
||||||
|
call writefile(range(1, 20), 'Xdummy.log', 'D')
|
||||||
|
|
||||||
|
" Run Vim in a terminal and open a terminal window to run Vim in.
|
||||||
|
let lines =<< trim END
|
||||||
|
set wildignore=*.txt
|
||||||
|
END
|
||||||
|
call writefile(lines, 'XRemoteEditing.vim', 'D')
|
||||||
|
let buf = RunVimInTerminal('--servername XVIMTEST -S XRemoteEditing.vim Xdummy.log', {'rows': 8})
|
||||||
|
call TermWait(buf)
|
||||||
|
botright new
|
||||||
|
" wildignore setting should be ignored and the XVIMTEST server should now
|
||||||
|
" open XTEST.txt, if wildignore setting is not ignored, the server
|
||||||
|
" will continue with the Xdummy.log file
|
||||||
|
let buf2 = RunVimInTerminal('--servername XVIMTEST --remote-silent XTEST.txt', {'rows': 5, 'wait_for_ruler': 0})
|
||||||
|
" job should be no-longer running, so we can just close it
|
||||||
|
exe buf2 .. 'bw!'
|
||||||
|
call term_sendkeys(buf, ":sil :3,$d\<CR>")
|
||||||
|
call TermWait(buf)
|
||||||
|
call term_sendkeys(buf, ":wq!\<CR>")
|
||||||
|
call TermWait(buf)
|
||||||
|
if term_getstatus(buf) == 'running'
|
||||||
|
call StopVimInTerminal(buf)
|
||||||
|
endif
|
||||||
|
let buf_contents = readfile('XTEST.txt')
|
||||||
|
call assert_equal(2, len(buf_contents))
|
||||||
|
bw!
|
||||||
|
close
|
||||||
|
endfunc
|
||||||
|
|
||||||
|
" vim: shiftwidth=2 sts=2 expandtab
|
@ -704,6 +704,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 */
|
||||||
|
/**/
|
||||||
|
45,
|
||||||
/**/
|
/**/
|
||||||
44,
|
44,
|
||||||
/**/
|
/**/
|
||||||
|
Loading…
x
Reference in New Issue
Block a user