diff options
| author | Yegappan Lakshmanan <yegappan@yahoo.com> | 2022-03-22 16:06:31 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2022-03-22 16:06:31 +0000 |
| commit | e7dd0fa2c61fe71f12c72b0dcb7bb6415eb048fb (patch) | |
| tree | 5f9d0bb515c76a3bd9b3939b59fa10f024e2faa5 | |
| parent | 35dc17634dd6da5b90bd1b0160c4ed9e394f4b87 (diff) | |
| download | vim-git-e7dd0fa2c61fe71f12c72b0dcb7bb6415eb048fb.tar.gz | |
patch 8.2.4608: getcompletion() does not work when 'wildoptions' has "fuzzy"v8.2.4608
Problem: getcompletion() does not work properly when 'wildoptions
contains "fuzzy".
Solution: Do not use addstar(). (Yegappan Lakshmanan, closes #9992,
closes #9986)
| -rw-r--r-- | runtime/doc/builtin.txt | 4 | ||||
| -rw-r--r-- | src/cmdexpand.c | 7 | ||||
| -rw-r--r-- | src/testdir/test_cmdline.vim | 16 | ||||
| -rw-r--r-- | src/version.c | 2 |
4 files changed, 28 insertions, 1 deletions
diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt index 062ccc345..602d9098e 100644 --- a/runtime/doc/builtin.txt +++ b/runtime/doc/builtin.txt @@ -3273,6 +3273,10 @@ getcompletion({pat}, {type} [, {filtered}]) *getcompletion()* is applied to filter the results. Otherwise all the matches are returned. The 'wildignorecase' option always applies. + If the 'wildoptions' option contains 'fuzzy', then fuzzy + matching is used to get the completion matches. Otherwise + regular expression matching is used. + If {type} is "cmdline", then the |cmdline-completion| result is returned. For example, to complete the possible values after a ":call" command: > diff --git a/src/cmdexpand.c b/src/cmdexpand.c index 5ba6b084d..defc282db 100644 --- a/src/cmdexpand.c +++ b/src/cmdexpand.c @@ -3707,7 +3707,12 @@ f_getcompletion(typval_T *argvars, typval_T *rettv) # endif } - pat = addstar(xpc.xp_pattern, xpc.xp_pattern_len, xpc.xp_context); + if (cmdline_fuzzy_completion_supported(&xpc)) + // when fuzzy matching, don't modify the search string + pat = vim_strsave(xpc.xp_pattern); + else + pat = addstar(xpc.xp_pattern, xpc.xp_pattern_len, xpc.xp_context); + if ((rettv_list_alloc(rettv) != FAIL) && (pat != NULL)) { int i; diff --git a/src/testdir/test_cmdline.vim b/src/testdir/test_cmdline.vim index dc781f8e1..299210b87 100644 --- a/src/testdir/test_cmdline.vim +++ b/src/testdir/test_cmdline.vim @@ -552,6 +552,22 @@ func Test_getcompletion() call assert_fails('call getcompletion("abc", [])', 'E475:') endfunc +" Test for getcompletion() with "fuzzy" in 'wildoptions' +func Test_getcompletion_wildoptions() + let save_wildoptions = &wildoptions + set wildoptions& + let l = getcompletion('space', 'option') + call assert_equal([], l) + let l = getcompletion('ier', 'command') + call assert_equal([], l) + set wildoptions=fuzzy + let l = getcompletion('space', 'option') + call assert_true(index(l, 'backspace') >= 0) + let l = getcompletion('ier', 'command') + call assert_true(index(l, 'compiler') >= 0) + let &wildoptions = save_wildoptions +endfunc + func Test_complete_autoload_error() let save_rtp = &rtp let lines =<< trim END diff --git a/src/version.c b/src/version.c index 2c2ac28bf..2180ebf26 100644 --- a/src/version.c +++ b/src/version.c @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 4608, +/**/ 4607, /**/ 4606, |