kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-12-19 10:45:16 -07:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:9.1.0761: :cd completion fails on Windows with backslash in path (#30703)

Browse Source 
Problem:  :cd completion fails on Windows with backslash in path
Solution: switch no_bslash argument to FALSE in file_pat_to_reg_pat()

Note: only fixes the problem on Windows. For Unix, we still need to
escape backslashes since those are taken as regex atoms (and could be
invalid regex atoms).

fixes: vim/vim#15643
closes: vim/vim#15808

1a31c430bb

Co-authored-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
zeertzjq 2024-10-07 10:16:47 +08:00 committed by GitHub
parent d0dc2920e1
commit 40ec3d7bc0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/nvim/fileio.c
View File

@ -3618,6 +3618,7 @@ bool match_file_list(char *list, char *sfname, char *ffname)
/// @param pat_end first char after pattern or NULL
/// @param allow_dirs Result passed back out in here
/// @param no_bslash Don't use a backward slash as pathsep
/// (only makes a difference when BACKSLASH_IN_FILENAME in defined)
///
/// @return NULL on failure.
char *file_pat_to_reg_pat(const char *pat, const char *pat_end, char *allow_dirs, int no_bslash)

2
src/nvim/path.c
View File

@ -959,7 +959,7 @@ static void uniquefy_paths(garray_T *gap, char *pattern, char *path_option)
file_pattern[0] = '*';
file_pattern[1] = NUL;
strcat(file_pattern, pattern);
char *pat = file_pat_to_reg_pat(file_pattern, NULL, NULL, true);
char *pat = file_pat_to_reg_pat(file_pattern, NULL, NULL, false);
xfree(file_pattern);
if (pat == NULL) {
return;

11
test/old/testdir/test_cmdline.vim
View File

@ -4070,4 +4070,15 @@ func Test_term_option()
let &cpo = _cpo
endfunc
func Test_cd_bslsh_completion_windows()
CheckMSWindows
let save_shellslash = &shellslash
set noshellslash
call system('mkdir XXXa\_b')
defer delete('XXXa', 'rf')
call feedkeys(":cd XXXa\\_b\<C-A>\<C-B>\"\<CR>", 'tx')
call assert_equal('"cd XXXa\_b\', @:)
let &shellslash = save_shellslash
endfunc
" vim: shiftwidth=2 sts=2 expandtab