aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 8.2.4917: fuzzy expansion of option names is not right

Browse Source 
Problem:    Fuzzy expansion of option names is not right.
Solution:   Pass the fuzzy flag down the call chain. (Christian Brabandt,
            closes #10380, closes #10318)
This commit is contained in:
Christian Brabandt 2022-05-08 21:10:56 +01:00 committed by Bram Moolenaar
parent 8e8dc9b323
commit cb747899bd
5 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/cmdexpand.c
View File

@ -2787,7 +2787,7 @@ ExpandFromContext(
if (xp->xp_context == EXPAND_SETTINGS if (xp->xp_context == EXPAND_SETTINGS
|| xp->xp_context == EXPAND_BOOL_SETTINGS) || xp->xp_context == EXPAND_BOOL_SETTINGS)
ret = ExpandSettings(xp, &regmatch, pat, numMatches, matches); ret = ExpandSettings(xp, &regmatch, pat, numMatches, matches, fuzzy);
else if (xp->xp_context == EXPAND_MAPPINGS) else if (xp->xp_context == EXPAND_MAPPINGS)
ret = ExpandMappings(pat, &regmatch, numMatches, matches); ret = ExpandMappings(pat, &regmatch, numMatches, matches);
# if defined(FEAT_EVAL) # if defined(FEAT_EVAL)

5
src/option.c
View File

@ -6511,7 +6511,8 @@ ExpandSettings(
regmatch_T *regmatch, regmatch_T *regmatch,
char_u *fuzzystr, char_u *fuzzystr,
int *numMatches, int *numMatches,
char_u ***matches) char_u ***matches,
int can_fuzzy)
{ {
int num_normal = 0; // Nr of matching non-term-code settings int num_normal = 0; // Nr of matching non-term-code settings
int num_term = 0; // Nr of matching terminal code settings int num_term = 0; // Nr of matching terminal code settings
@ -6527,7 +6528,7 @@ ExpandSettings(
int fuzzy; int fuzzy;
fuzmatch_str_T *fuzmatch = NULL; fuzmatch_str_T *fuzmatch = NULL;
fuzzy = cmdline_fuzzy_complete(fuzzystr); fuzzy = can_fuzzy && cmdline_fuzzy_complete(fuzzystr);
// do this loop twice: // do this loop twice:
// loop == 0: count the number of matching options // loop == 0: count the number of matching options

2
src/proto/option.pro
View File

@ -64,7 +64,7 @@ void reset_modifiable(void);
void set_iminsert_global(void); void set_iminsert_global(void);
void set_imsearch_global(void); void set_imsearch_global(void);
void set_context_in_set_cmd(expand_T *xp, char_u *arg, int opt_flags); void set_context_in_set_cmd(expand_T *xp, char_u *arg, int opt_flags);
int ExpandSettings(expand_T *xp, regmatch_T *regmatch, char_u *fuzzystr, int *numMatches, char_u ***matches); int ExpandSettings(expand_T *xp, regmatch_T *regmatch, char_u *fuzzystr, int *numMatches, char_u ***matches, int do_fuzzy);
int ExpandOldSetting(int *num_file, char_u ***file); int ExpandOldSetting(int *num_file, char_u ***file);
int shortmess(int x); int shortmess(int x);
void vimrc_found(char_u *fname, char_u *envname); void vimrc_found(char_u *fname, char_u *envname);

22
src/testdir/test_options.vim
View File

@ -1257,4 +1257,26 @@ func Test_opt_cdhome()
set cdhome& set cdhome&
endfunc endfunc
func Test_set_completion_2()
CheckOption termguicolors
" Test default option completion
set wildoptions=
call feedkeys(":set termg\<C-A>\<C-B>\"\<CR>", 'tx')
call assert_equal('"set termguicolors', @:)
call feedkeys(":set notermg\<C-A>\<C-B>\"\<CR>", 'tx')
call assert_equal('"set notermguicolors', @:)
" Test fuzzy option completion
set wildoptions=fuzzy
call feedkeys(":set termg\<C-A>\<C-B>\"\<CR>", 'tx')
call assert_equal('"set termguicolors termencoding', @:)
call feedkeys(":set notermg\<C-A>\<C-B>\"\<CR>", 'tx')
call assert_equal('"set notermguicolors', @:)
set wildoptions=
endfunc
" vim: shiftwidth=2 sts=2 expandtab " vim: shiftwidth=2 sts=2 expandtab

2
src/version.c
View File

@ -746,6 +746,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 */
/**/
4917,
/**/ /**/
4916, 4916,
/**/ /**/