diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/path.c | 27 | ||||
| -rw-r--r-- | src/nvim/testdir/test_find_complete.vim | 6 |
2 files changed, 22 insertions, 11 deletions
diff --git a/src/nvim/path.c b/src/nvim/path.c index b1e1bf3b2f..d5c636ff08 100644 --- a/src/nvim/path.c +++ b/src/nvim/path.c @@ -1051,30 +1051,35 @@ const char *gettail_dir(const char *const fname) * result in "gap". * Returns the total number of matches. */ -static int -expand_in_path ( - garray_T *gap, - char_u *pattern, - int flags /* EW_* flags */ +static int expand_in_path( + garray_T *const gap, + char_u *const pattern, + const int flags // EW_* flags ) { - char_u *curdir; garray_T path_ga; - char_u *paths = NULL; - curdir = xmalloc(MAXPATHL); + char_u *const curdir = xmalloc(MAXPATHL); os_dirname(curdir, MAXPATHL); ga_init(&path_ga, (int)sizeof(char_u *), 1); expand_path_option(curdir, &path_ga); xfree(curdir); - if (GA_EMPTY(&path_ga)) + if (GA_EMPTY(&path_ga)) { return 0; + } - paths = ga_concat_strings(&path_ga); + char_u *const paths = ga_concat_strings(&path_ga); ga_clear_strings(&path_ga); - globpath(paths, pattern, gap, (flags & EW_ICASE) ? WILD_ICASE : 0); + int glob_flags = 0; + if (flags & EW_ICASE) { + glob_flags |= WILD_ICASE; + } + if (flags & EW_ADDSLASH) { + glob_flags |= WILD_ADD_SLASH; + } + globpath(paths, pattern, gap, glob_flags); xfree(paths); return gap->ga_len; diff --git a/src/nvim/testdir/test_find_complete.vim b/src/nvim/testdir/test_find_complete.vim index 1019246404..7592b16192 100644 --- a/src/nvim/testdir/test_find_complete.vim +++ b/src/nvim/testdir/test_find_complete.vim @@ -88,6 +88,12 @@ func Test_find_complete() call feedkeys(":find f\t\n", "xt") call assert_equal('Holy Grail', getline(1)) + " Test that find completion on directory appends a slash + call feedkeys(":find in/pa\tfile.txt\n", "xt") + call assert_equal('E.T.', getline(1)) + call feedkeys(":find ./i\tstuff.txt\n", "xt") + call assert_equal('Another Holy Grail', getline(1)) + " Test shortening of " " foo/x/bar/voyager.txt |