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.4482: no fuzzy cmdline completion for user defined completion

Browse Source 
Problem:    No fuzzy cmdline completion for user defined completion.
Solution:   Add fuzzy completion for user defined completion. (Yegappan
            Lakshmanan, closes #9858)
This commit is contained in:
Yegappan Lakshmanan 2022-02-27 21:03:21 +00:00 committed by Bram Moolenaar
parent 5c52be40fb
commit afd4ae35d6
3 changed files with 306 additions and 134 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

93
src/cmdexpand.c
View File

@ -16,15 +16,14 @@
static int cmd_showtail; // Only show path tail in lists ? static int cmd_showtail; // Only show path tail in lists ?
static void set_expand_context(expand_T *xp); static void set_expand_context(expand_T *xp);
static int ExpandGeneric(expand_T *xp, regmatch_T *regmatch, static int ExpandGeneric(char_u *pat, expand_T *xp, regmatch_T *regmatch,
char_u ***matches, int *numMatches, char_u ***matches, int *numMatches,
char_u *((*func)(expand_T *, int)), int escaped, char_u *((*func)(expand_T *, int)), int escaped);
char_u *fuzzystr);
static int ExpandFromContext(expand_T *xp, char_u *, char_u ***, int *, int); static int ExpandFromContext(expand_T *xp, char_u *, char_u ***, int *, int);
static int expand_showtail(expand_T *xp); static int expand_showtail(expand_T *xp);
static int expand_shellcmd(char_u *filepat, char_u ***matches, int *numMatches, int flagsarg); static int expand_shellcmd(char_u *filepat, char_u ***matches, int *numMatches, int flagsarg);
#if defined(FEAT_EVAL) #if defined(FEAT_EVAL)
static int ExpandUserDefined(expand_T *xp, regmatch_T *regmatch, char_u ***matches, int *numMatches); static int ExpandUserDefined(char_u *pat, expand_T *xp, regmatch_T *regmatch, char_u ***matches, int *numMatches);
static int ExpandUserList(expand_T *xp, char_u ***matches, int *numMatches); static int ExpandUserList(expand_T *xp, char_u ***matches, int *numMatches);
#endif #endif
@ -62,13 +61,13 @@ cmdline_fuzzy_completion_supported(expand_T *xp)
&& xp->xp_context != EXPAND_SHELLCMD && xp->xp_context != EXPAND_SHELLCMD
&& xp->xp_context != EXPAND_TAGS && xp->xp_context != EXPAND_TAGS
&& xp->xp_context != EXPAND_TAGS_LISTFILES && xp->xp_context != EXPAND_TAGS_LISTFILES
&& xp->xp_context != EXPAND_USER_DEFINED
&& xp->xp_context != EXPAND_USER_LIST); && xp->xp_context != EXPAND_USER_LIST);
} }
/* /*
* Returns TRUE if fuzzy completion for cmdline completion is enabled and * Returns TRUE if fuzzy completion for cmdline completion is enabled and
* 'fuzzystr' is not empty. * 'fuzzystr' is not empty. If search pattern is empty, then don't use fuzzy
* matching.
*/ */
int int
cmdline_fuzzy_complete(char_u *fuzzystr) cmdline_fuzzy_complete(char_u *fuzzystr)
@ -2444,16 +2443,10 @@ ExpandOther(
{ {
if (xp->xp_context == tab[i].context) if (xp->xp_context == tab[i].context)
{ {
// Use fuzzy matching if 'wildoptions' has 'fuzzy'.
// If no search pattern is supplied, then don't use fuzzy
// matching and return all the found items.
int fuzzy = cmdline_fuzzy_complete(pat);
if (tab[i].ic) if (tab[i].ic)
rmp->rm_ic = TRUE; rmp->rm_ic = TRUE;
ret = ExpandGeneric(xp, rmp, matches, numMatches, ret = ExpandGeneric(pat, xp, rmp, matches, numMatches,
tab[i].func, tab[i].escaped, tab[i].func, tab[i].escaped);
fuzzy ? pat : NULL);
break; break;
} }
} }
@ -2604,7 +2597,7 @@ ExpandFromContext(
ret = ExpandMappings(pat, &regmatch, numMatches, matches); ret = ExpandMappings(pat, &regmatch, numMatches, matches);
# if defined(FEAT_EVAL) # if defined(FEAT_EVAL)
else if (xp->xp_context == EXPAND_USER_DEFINED) else if (xp->xp_context == EXPAND_USER_DEFINED)
ret = ExpandUserDefined(xp, &regmatch, matches, numMatches); ret = ExpandUserDefined(pat, xp, &regmatch, matches, numMatches);
# endif # endif
else else
ret = ExpandOther(pat, xp, &regmatch, matches, numMatches); ret = ExpandOther(pat, xp, &regmatch, matches, numMatches);
@ -2630,14 +2623,14 @@ ExpandFromContext(
*/ */
static int static int
ExpandGeneric( ExpandGeneric(
char_u *pat,
expand_T *xp, expand_T *xp,
regmatch_T *regmatch, regmatch_T *regmatch,
char_u ***matches, char_u ***matches,
int *numMatches, int *numMatches,
char_u *((*func)(expand_T *, int)), char_u *((*func)(expand_T *, int)),
// returns a string from the list // returns a string from the list
int escaped, int escaped)
char_u *fuzzystr)
{ {
int i; int i;
int count = 0; int count = 0;
@ -2645,10 +2638,12 @@ ExpandGeneric(
char_u *str; char_u *str;
fuzmatch_str_T *fuzmatch = NULL; fuzmatch_str_T *fuzmatch = NULL;
int score = 0; int score = 0;
int fuzzy = (fuzzystr != NULL); int fuzzy;
int funcsort = FALSE; int funcsort = FALSE;
int match; int match;
fuzzy = cmdline_fuzzy_complete(pat);
// do this loop twice: // do this loop twice:
// round == 0: count the number of matching names // round == 0: count the number of matching names
// round == 1: copy the matching names into allocated memory // round == 1: copy the matching names into allocated memory
@ -2666,7 +2661,7 @@ ExpandGeneric(
match = vim_regexec(regmatch, str, (colnr_T)0); match = vim_regexec(regmatch, str, (colnr_T)0);
else else
{ {
score = fuzzy_match_str(str, fuzzystr); score = fuzzy_match_str(str, pat);
match = (score != 0); match = (score != 0);
} }
@ -2976,10 +2971,12 @@ call_user_expand_func(
} }
/* /*
* Expand names with a function defined by the user. * Expand names with a function defined by the user (EXPAND_USER_DEFINED and
* EXPAND_USER_LIST).
*/ */
static int static int
ExpandUserDefined( ExpandUserDefined(
char_u *pat,
expand_T *xp, expand_T *xp,
regmatch_T *regmatch, regmatch_T *regmatch,
char_u ***matches, char_u ***matches,
@ -2990,7 +2987,12 @@ ExpandUserDefined(
char_u *e; char_u *e;
int keep; int keep;
garray_T ga; garray_T ga;
int skip; int fuzzy;
int match;
int score;
int count = 0;
fuzzy = cmdline_fuzzy_complete(pat);
*matches = NULL; *matches = NULL;
*numMatches = 0; *numMatches = 0;
@ -2998,7 +3000,11 @@ ExpandUserDefined(
if (retstr == NULL) if (retstr == NULL)
return FAIL; return FAIL;
ga_init2(&ga, sizeof(char *), 3); if (!fuzzy)
ga_init2(&ga, sizeof(char *), 3);
else
ga_init2(&ga, sizeof(fuzmatch_str_T), 3);
for (s = retstr; *s != NUL; s = e) for (s = retstr; *s != NUL; s = e)
{ {
e = vim_strchr(s, '\n'); e = vim_strchr(s, '\n');
@ -3007,23 +3013,56 @@ ExpandUserDefined(
keep = *e; keep = *e;
*e = NUL; *e = NUL;
skip = xp->xp_pattern[0] && vim_regexec(regmatch, s, (colnr_T)0) == 0; if (xp->xp_pattern[0] || fuzzy)
{
if (!fuzzy)
match = vim_regexec(regmatch, s, (colnr_T)0);
else
{
score = fuzzy_match_str(s, pat);
match = (score != 0);
}
}
else
match = TRUE; // match everything
*e = keep; *e = keep;
if (!skip) if (match)
{ {
if (ga_grow(&ga, 1) == FAIL) if (ga_grow(&ga, 1) == FAIL)
break; break;
((char_u **)ga.ga_data)[ga.ga_len] = vim_strnsave(s, e - s); if (!fuzzy)
((char_u **)ga.ga_data)[ga.ga_len] = vim_strnsave(s, e - s);
else
{
fuzmatch_str_T *fuzmatch =
&((fuzmatch_str_T *)ga.ga_data)[ga.ga_len];
fuzmatch->idx = count;
fuzmatch->str = vim_strnsave(s, e - s);
fuzmatch->score = score;
}
++ga.ga_len; ++ga.ga_len;
count++;
} }
if (*e != NUL) if (*e != NUL)
++e; ++e;
} }
vim_free(retstr); vim_free(retstr);
*matches = ga.ga_data;
*numMatches = ga.ga_len; if (!fuzzy)
{
*matches = ga.ga_data;
*numMatches = ga.ga_len;
}
else
{
if (fuzzymatches_to_strmatches(ga.ga_data, matches, count,
FALSE) == FAIL)
return FAIL;
*numMatches = count;
}
return OK; return OK;
} }

345
src/testdir/test_cmdline.vim
View File

@ -2455,9 +2455,8 @@ func Test_cmdline_complete_dlist()
call assert_equal("\"dlist 10 /pat/ | chistory", @:) call assert_equal("\"dlist 10 /pat/ | chistory", @:)
endfunc endfunc
" Test for 'fuzzy' in 'wildoptions' (fuzzy completion) " argument list (only for :argdel) fuzzy completion
func Test_wildoptions_fuzzy() func Test_fuzzy_completion_arglist()
" argument list (only for :argdel)
argadd change.py count.py charge.py argadd change.py count.py charge.py
set wildoptions& set wildoptions&
call feedkeys(":argdel cge\<C-A>\<C-B>\"\<CR>", 'tx') call feedkeys(":argdel cge\<C-A>\<C-B>\"\<CR>", 'tx')
@ -2466,8 +2465,11 @@ func Test_wildoptions_fuzzy()
call feedkeys(":argdel cge\<C-A>\<C-B>\"\<CR>", 'tx') call feedkeys(":argdel cge\<C-A>\<C-B>\"\<CR>", 'tx')
call assert_equal('"argdel change.py charge.py', @:) call assert_equal('"argdel change.py charge.py', @:)
%argdelete %argdelete
set wildoptions&
endfunc
" autocmd group name fuzzy completion " autocmd group name fuzzy completion
func Test_fuzzy_completion_autocmd()
set wildoptions& set wildoptions&
augroup MyFuzzyGroup augroup MyFuzzyGroup
augroup END augroup END
@ -2481,8 +2483,11 @@ func Test_wildoptions_fuzzy()
call feedkeys(":augroup My*p\<Tab>\<C-B>\"\<CR>", 'tx') call feedkeys(":augroup My*p\<Tab>\<C-B>\"\<CR>", 'tx')
call assert_equal('"augroup My*p', @:) call assert_equal('"augroup My*p', @:)
augroup! MyFuzzyGroup augroup! MyFuzzyGroup
set wildoptions&
endfunc
" buffer name fuzzy completion " buffer name fuzzy completion
func Test_fuzzy_completion_bufname()
set wildoptions& set wildoptions&
edit SomeFile.txt edit SomeFile.txt
enew enew
@ -2496,24 +2501,29 @@ func Test_wildoptions_fuzzy()
call feedkeys(":b S*File.txt\<Tab>\<C-B>\"\<CR>", 'tx') call feedkeys(":b S*File.txt\<Tab>\<C-B>\"\<CR>", 'tx')
call assert_equal('"b S*File.txt', @:) call assert_equal('"b S*File.txt', @:)
%bw! %bw!
set wildoptions&
endfunc
" buffer name (full path) fuzzy completion " buffer name (full path) fuzzy completion
if has('unix') func Test_fuzzy_completion_bufname_fullpath()
set wildoptions& CheckUnix
call mkdir('Xcmd/Xstate/Xfile.js', 'p') set wildoptions&
edit Xcmd/Xstate/Xfile.js call mkdir('Xcmd/Xstate/Xfile.js', 'p')
cd Xcmd/Xstate edit Xcmd/Xstate/Xfile.js
enew cd Xcmd/Xstate
call feedkeys(":b CmdStateFile\<Tab>\<C-B>\"\<CR>", 'tx') enew
call assert_equal('"b CmdStateFile', @:) call feedkeys(":b CmdStateFile\<Tab>\<C-B>\"\<CR>", 'tx')
set wildoptions=fuzzy call assert_equal('"b CmdStateFile', @:)
call feedkeys(":b CmdStateFile\<Tab>\<C-B>\"\<CR>", 'tx') set wildoptions=fuzzy
call assert_match('Xcmd/Xstate/Xfile.js$', @:) call feedkeys(":b CmdStateFile\<Tab>\<C-B>\"\<CR>", 'tx')
cd - call assert_match('Xcmd/Xstate/Xfile.js$', @:)
call delete('Xcmd', 'rf') cd -
endif call delete('Xcmd', 'rf')
set wildoptions&
endfunc
" :behave suboptions fuzzy completion " :behave suboptions fuzzy completion
func Test_fuzzy_completion_behave()
set wildoptions& set wildoptions&
call feedkeys(":behave xm\<Tab>\<C-B>\"\<CR>", 'tx') call feedkeys(":behave xm\<Tab>\<C-B>\"\<CR>", 'tx')
call assert_equal('"behave xm', @:) call assert_equal('"behave xm', @:)
@ -2528,10 +2538,15 @@ func Test_wildoptions_fuzzy()
call feedkeys(":behave win\<C-D>\<F4>\<C-B>\"\<CR>", 'tx') call feedkeys(":behave win\<C-D>\<F4>\<C-B>\"\<CR>", 'tx')
call assert_equal('mswin', g:Sline) call assert_equal('mswin', g:Sline)
call assert_equal('"behave win', @:) call assert_equal('"behave win', @:)
set wildoptions&
endfunc
" colorscheme name fuzzy completion - NOT supported " " colorscheme name fuzzy completion - NOT supported
" func Test_fuzzy_completion_colorscheme()
" endfunc
" built-in command name fuzzy completion " built-in command name fuzzy completion
func Test_fuzzy_completion_cmdname()
set wildoptions& set wildoptions&
call feedkeys(":sbwin\<Tab>\<C-B>\"\<CR>", 'tx') call feedkeys(":sbwin\<Tab>\<C-B>\"\<CR>", 'tx')
call assert_equal('"sbwin', @:) call assert_equal('"sbwin', @:)
@ -2542,24 +2557,31 @@ func Test_wildoptions_fuzzy()
call assert_equal('"sbrewind', @:) call assert_equal('"sbrewind', @:)
call feedkeys(":sbr*d\<Tab>\<C-B>\"\<CR>", 'tx') call feedkeys(":sbr*d\<Tab>\<C-B>\"\<CR>", 'tx')
call assert_equal('"sbr*d', @:) call assert_equal('"sbr*d', @:)
set wildoptions&
endfunc
" compiler name fuzzy completion - NOT supported " " compiler name fuzzy completion - NOT supported
" func Test_fuzzy_completion_compiler()
" endfunc
" :cscope suboptions fuzzy completion " :cscope suboptions fuzzy completion
if has('cscope') func Test_fuzzy_completion_cscope()
set wildoptions& CheckFeature cscope
call feedkeys(":cscope ret\<Tab>\<C-B>\"\<CR>", 'tx') set wildoptions&
call assert_equal('"cscope ret', @:) call feedkeys(":cscope ret\<Tab>\<C-B>\"\<CR>", 'tx')
call feedkeys(":cscope re*t\<Tab>\<C-B>\"\<CR>", 'tx') call assert_equal('"cscope ret', @:)
call assert_equal('"cscope reset', @:) call feedkeys(":cscope re*t\<Tab>\<C-B>\"\<CR>", 'tx')
set wildoptions=fuzzy call assert_equal('"cscope reset', @:)
call feedkeys(":cscope ret\<Tab>\<C-B>\"\<CR>", 'tx') set wildoptions=fuzzy
call assert_equal('"cscope reset', @:) call feedkeys(":cscope ret\<Tab>\<C-B>\"\<CR>", 'tx')
call feedkeys(":cscope re*t\<Tab>\<C-B>\"\<CR>", 'tx') call assert_equal('"cscope reset', @:)
call assert_equal('"cscope re*t', @:) call feedkeys(":cscope re*t\<Tab>\<C-B>\"\<CR>", 'tx')
endif call assert_equal('"cscope re*t', @:)
set wildoptions&
endfunc
" :diffget/:diffput buffer name fuzzy completion " :diffget/:diffput buffer name fuzzy completion
func Test_fuzzy_completion_diff()
new SomeBuffer new SomeBuffer
diffthis diffthis
new OtherBuffer new OtherBuffer
@ -2575,26 +2597,37 @@ func Test_wildoptions_fuzzy()
call feedkeys(":diffput sbuf\<Tab>\<C-B>\"\<CR>", 'tx') call feedkeys(":diffput sbuf\<Tab>\<C-B>\"\<CR>", 'tx')
call assert_equal('"diffput SomeBuffer', @:) call assert_equal('"diffput SomeBuffer', @:)
%bw! %bw!
set wildoptions&
endfunc
" directory name fuzzy completion - NOT supported " " directory name fuzzy completion - NOT supported
" func Test_fuzzy_completion_dirname()
" endfunc
" environment variable name fuzzy completion " environment variable name fuzzy completion
func Test_fuzzy_completion_env()
set wildoptions& set wildoptions&
call feedkeys(":echo $VUT\<Tab>\<C-B>\"\<CR>", 'tx') call feedkeys(":echo $VUT\<Tab>\<C-B>\"\<CR>", 'tx')
call assert_equal('"echo $VUT', @:) call assert_equal('"echo $VUT', @:)
set wildoptions=fuzzy set wildoptions=fuzzy
call feedkeys(":echo $VUT\<Tab>\<C-B>\"\<CR>", 'tx') call feedkeys(":echo $VUT\<Tab>\<C-B>\"\<CR>", 'tx')
call assert_equal('"echo $VIMRUNTIME', @:) call assert_equal('"echo $VIMRUNTIME', @:)
set wildoptions&
endfunc
" autocmd event fuzzy completion " autocmd event fuzzy completion
func Test_fuzzy_completion_autocmd_event()
set wildoptions& set wildoptions&
call feedkeys(":autocmd BWout\<Tab>\<C-B>\"\<CR>", 'tx') call feedkeys(":autocmd BWout\<Tab>\<C-B>\"\<CR>", 'tx')
call assert_equal('"autocmd BWout', @:) call assert_equal('"autocmd BWout', @:)
set wildoptions=fuzzy set wildoptions=fuzzy
call feedkeys(":autocmd BWout\<Tab>\<C-B>\"\<CR>", 'tx') call feedkeys(":autocmd BWout\<Tab>\<C-B>\"\<CR>", 'tx')
call assert_equal('"autocmd BufWipeout', @:) call assert_equal('"autocmd BufWipeout', @:)
set wildoptions&
endfunc
" vim expression fuzzy completion " vim expression fuzzy completion
func Test_fuzzy_completion_expr()
let g:PerPlaceCount = 10 let g:PerPlaceCount = 10
set wildoptions& set wildoptions&
call feedkeys(":let c = ppc\<Tab>\<C-B>\"\<CR>", 'tx') call feedkeys(":let c = ppc\<Tab>\<C-B>\"\<CR>", 'tx')
@ -2602,32 +2635,49 @@ func Test_wildoptions_fuzzy()
set wildoptions=fuzzy set wildoptions=fuzzy
call feedkeys(":let c = ppc\<Tab>\<C-B>\"\<CR>", 'tx') call feedkeys(":let c = ppc\<Tab>\<C-B>\"\<CR>", 'tx')
call assert_equal('"let c = PerPlaceCount', @:) call assert_equal('"let c = PerPlaceCount', @:)
" file name fuzzy completion - NOT supported
" files in path fuzzy completion - NOT supported
" filetype name fuzzy completion - NOT supported
" user defined function name completion
set wildoptions& set wildoptions&
call feedkeys(":call Test_w_fuz\<Tab>\<C-B>\"\<CR>", 'tx') endfunc
call assert_equal('"call Test_w_fuz', @:)
set wildoptions=fuzzy
call feedkeys(":call Test_w_fuz\<Tab>\<C-B>\"\<CR>", 'tx')
call assert_equal('"call Test_wildoptions_fuzzy()', @:)
" user defined command name completion " " file name fuzzy completion - NOT supported
" func Test_fuzzy_completion_filename()
" endfunc
" " files in path fuzzy completion - NOT supported
" func Test_fuzzy_completion_filesinpath()
" endfunc
" " filetype name fuzzy completion - NOT supported
" func Test_fuzzy_completion_filetype()
" endfunc
" user defined function name completion
func Test_fuzzy_completion_userdefined_func()
set wildoptions&
call feedkeys(":call Test_f_u_f\<Tab>\<C-B>\"\<CR>", 'tx')
call assert_equal('"call Test_f_u_f', @:)
set wildoptions=fuzzy
call feedkeys(":call Test_f_u_f\<Tab>\<C-B>\"\<CR>", 'tx')
call assert_equal('"call Test_fuzzy_completion_userdefined_func()', @:)
set wildoptions&
endfunc
" user defined command name completion
func Test_fuzzy_completion_userdefined_cmd()
set wildoptions& set wildoptions&
call feedkeys(":MsFeat\<Tab>\<C-B>\"\<CR>", 'tx') call feedkeys(":MsFeat\<Tab>\<C-B>\"\<CR>", 'tx')
call assert_equal('"MsFeat', @:) call assert_equal('"MsFeat', @:)
set wildoptions=fuzzy set wildoptions=fuzzy
call feedkeys(":MsFeat\<Tab>\<C-B>\"\<CR>", 'tx') call feedkeys(":MsFeat\<Tab>\<C-B>\"\<CR>", 'tx')
call assert_equal('"MissingFeature', @:) call assert_equal('"MissingFeature', @:)
set wildoptions&
endfunc
" :help tag fuzzy completion - NOT supported " " :help tag fuzzy completion - NOT supported
" func Test_fuzzy_completion_helptag()
" endfunc
" highlight group name fuzzy completion " highlight group name fuzzy completion
func Test_fuzzy_completion_hlgroup()
set wildoptions& set wildoptions&
call feedkeys(":highlight SKey\<Tab>\<C-B>\"\<CR>", 'tx') call feedkeys(":highlight SKey\<Tab>\<C-B>\"\<CR>", 'tx')
call assert_equal('"highlight SKey', @:) call assert_equal('"highlight SKey', @:)
@ -2638,8 +2688,11 @@ func Test_wildoptions_fuzzy()
call assert_equal('"highlight SpecialKey', @:) call assert_equal('"highlight SpecialKey', @:)
call feedkeys(":highlight Sp*Key\<Tab>\<C-B>\"\<CR>", 'tx') call feedkeys(":highlight Sp*Key\<Tab>\<C-B>\"\<CR>", 'tx')
call assert_equal('"highlight Sp*Key', @:) call assert_equal('"highlight Sp*Key', @:)
set wildoptions&
endfunc
" :history suboptions fuzzy completion " :history suboptions fuzzy completion
func Test_fuzzy_completion_history()
set wildoptions& set wildoptions&
call feedkeys(":history dg\<Tab>\<C-B>\"\<CR>", 'tx') call feedkeys(":history dg\<Tab>\<C-B>\"\<CR>", 'tx')
call assert_equal('"history dg', @:) call assert_equal('"history dg', @:)
@ -2650,26 +2703,34 @@ func Test_wildoptions_fuzzy()
call assert_equal('"history debug', @:) call assert_equal('"history debug', @:)
call feedkeys(":history se*h\<Tab>\<C-B>\"\<CR>", 'tx') call feedkeys(":history se*h\<Tab>\<C-B>\"\<CR>", 'tx')
call assert_equal('"history se*h', @:) call assert_equal('"history se*h', @:)
set wildoptions&
endfunc
" :language locale name fuzzy completion " :language locale name fuzzy completion
if has('unix') func Test_fuzzy_completion_lang()
set wildoptions& CheckUnix
call feedkeys(":lang psx\<Tab>\<C-B>\"\<CR>", 'tx') set wildoptions&
call assert_equal('"lang psx', @:) call feedkeys(":lang psx\<Tab>\<C-B>\"\<CR>", 'tx')
set wildoptions=fuzzy call assert_equal('"lang psx', @:)
call feedkeys(":lang psx\<Tab>\<C-B>\"\<CR>", 'tx') set wildoptions=fuzzy
call assert_equal('"lang POSIX', @:) call feedkeys(":lang psx\<Tab>\<C-B>\"\<CR>", 'tx')
endif call assert_equal('"lang POSIX', @:)
set wildoptions&
endfunc
" :mapclear buffer argument fuzzy completion " :mapclear buffer argument fuzzy completion
func Test_fuzzy_completion_mapclear()
set wildoptions& set wildoptions&
call feedkeys(":mapclear buf\<Tab>\<C-B>\"\<CR>", 'tx') call feedkeys(":mapclear buf\<Tab>\<C-B>\"\<CR>", 'tx')
call assert_equal('"mapclear buf', @:) call assert_equal('"mapclear buf', @:)
set wildoptions=fuzzy set wildoptions=fuzzy
call feedkeys(":mapclear buf\<Tab>\<C-B>\"\<CR>", 'tx') call feedkeys(":mapclear buf\<Tab>\<C-B>\"\<CR>", 'tx')
call assert_equal('"mapclear <buffer>', @:) call assert_equal('"mapclear <buffer>', @:)
set wildoptions&
endfunc
" map name fuzzy completion " map name fuzzy completion
func Test_fuzzy_completion_mapname()
" test regex completion works " test regex completion works
set wildoptions=fuzzy set wildoptions=fuzzy
call feedkeys(":cnoremap <ex\<Tab> <esc> \<Tab>\<C-B>\"\<CR>", 'tx') call feedkeys(":cnoremap <ex\<Tab> <esc> \<Tab>\<C-B>\"\<CR>", 'tx')
@ -2704,8 +2765,11 @@ func Test_wildoptions_fuzzy()
nunmap <Plug>fendoff nunmap <Plug>fendoff
nunmap <Plug>state nunmap <Plug>state
nunmap <Plug>FendingOff nunmap <Plug>FendingOff
set wildoptions&
endfunc
" abbreviation fuzzy completion " abbreviation fuzzy completion
func Test_fuzzy_completion_abbr()
set wildoptions=fuzzy set wildoptions=fuzzy
call feedkeys(":iabbr wait\<Tab>\<C-B>\"\<CR>", 'tx') call feedkeys(":iabbr wait\<Tab>\<C-B>\"\<CR>", 'tx')
call assert_equal("\"iabbr <nowait>", @:) call assert_equal("\"iabbr <nowait>", @:)
@ -2715,26 +2779,34 @@ func Test_wildoptions_fuzzy()
call feedkeys(":iabbr a1z\<Tab>\<C-B>\"\<CR>", 'tx') call feedkeys(":iabbr a1z\<Tab>\<C-B>\"\<CR>", 'tx')
call assert_equal("\"iabbr a1z\t", @:) call assert_equal("\"iabbr a1z\t", @:)
iunabbrev WaitForCompletion iunabbrev WaitForCompletion
set wildoptions&
endfunc
" menu name fuzzy completion " menu name fuzzy completion
if has('gui_running') func Test_fuzzy_completion_menu()
set wildoptions& CheckGui
call feedkeys(":menu pup\<Tab>\<C-B>\"\<CR>", 'tx') set wildoptions&
call assert_equal('"menu pup', @:) call feedkeys(":menu pup\<Tab>\<C-B>\"\<CR>", 'tx')
set wildoptions=fuzzy call assert_equal('"menu pup', @:)
call feedkeys(":menu pup\<Tab>\<C-B>\"\<CR>", 'tx') set wildoptions=fuzzy
call assert_equal('"menu PopUp.', @:) call feedkeys(":menu pup\<Tab>\<C-B>\"\<CR>", 'tx')
endif call assert_equal('"menu PopUp.', @:)
set wildoptions&
endfunc
" :messages suboptions fuzzy completion " :messages suboptions fuzzy completion
func Test_fuzzy_completion_messages()
set wildoptions& set wildoptions&
call feedkeys(":messages clr\<Tab>\<C-B>\"\<CR>", 'tx') call feedkeys(":messages clr\<Tab>\<C-B>\"\<CR>", 'tx')
call assert_equal('"messages clr', @:) call assert_equal('"messages clr', @:)
set wildoptions=fuzzy set wildoptions=fuzzy
call feedkeys(":messages clr\<Tab>\<C-B>\"\<CR>", 'tx') call feedkeys(":messages clr\<Tab>\<C-B>\"\<CR>", 'tx')
call assert_equal('"messages clear', @:) call assert_equal('"messages clear', @:)
set wildoptions&
endfunc
" :set option name fuzzy completion " :set option name fuzzy completion
func Test_fuzzy_completion_option()
set wildoptions& set wildoptions&
call feedkeys(":set brkopt\<Tab>\<C-B>\"\<CR>", 'tx') call feedkeys(":set brkopt\<Tab>\<C-B>\"\<CR>", 'tx')
call assert_equal('"set brkopt', @:) call assert_equal('"set brkopt', @:)
@ -2747,8 +2819,11 @@ func Test_wildoptions_fuzzy()
set wildoptions=fuzzy set wildoptions=fuzzy
call feedkeys(":set fixeol\<Tab>\<C-B>\"\<CR>", 'tx') call feedkeys(":set fixeol\<Tab>\<C-B>\"\<CR>", 'tx')
call assert_equal('"set fixendofline', @:) call assert_equal('"set fixendofline', @:)
set wildoptions&
endfunc
" :set <term_option> " :set <term_option>
func Test_fuzzy_completion_term_option()
set wildoptions& set wildoptions&
call feedkeys(":set t_E\<Tab>\<C-B>\"\<CR>", 'tx') call feedkeys(":set t_E\<Tab>\<C-B>\"\<CR>", 'tx')
call assert_equal('"set t_EC', @:) call assert_equal('"set t_EC', @:)
@ -2759,52 +2834,76 @@ func Test_wildoptions_fuzzy()
call assert_equal('"set t_EC', @:) call assert_equal('"set t_EC', @:)
call feedkeys(":set <t_E\<Tab>\<C-B>\"\<CR>", 'tx') call feedkeys(":set <t_E\<Tab>\<C-B>\"\<CR>", 'tx')
call assert_equal('"set <t_EC>', @:) call assert_equal('"set <t_EC>', @:)
set wildoptions&
endfunc
" :packadd directory name fuzzy completion - NOT supported " " :packadd directory name fuzzy completion - NOT supported
" func Test_fuzzy_completion_packadd()
" endfunc
" shell command name fuzzy completion - NOT supported " " shell command name fuzzy completion - NOT supported
" func Test_fuzzy_completion_shellcmd()
" endfunc
" :sign suboptions fuzzy completion " :sign suboptions fuzzy completion
func Test_fuzzy_completion_sign()
set wildoptions& set wildoptions&
call feedkeys(":sign ufe\<Tab>\<C-B>\"\<CR>", 'tx') call feedkeys(":sign ufe\<Tab>\<C-B>\"\<CR>", 'tx')
call assert_equal('"sign ufe', @:) call assert_equal('"sign ufe', @:)
set wildoptions=fuzzy set wildoptions=fuzzy
call feedkeys(":sign ufe\<Tab>\<C-B>\"\<CR>", 'tx') call feedkeys(":sign ufe\<Tab>\<C-B>\"\<CR>", 'tx')
call assert_equal('"sign undefine', @:) call assert_equal('"sign undefine', @:)
set wildoptions&
endfunc
" :syntax suboptions fuzzy completion " :syntax suboptions fuzzy completion
func Test_fuzzy_completion_syntax_cmd()
set wildoptions& set wildoptions&
call feedkeys(":syntax kwd\<Tab>\<C-B>\"\<CR>", 'tx') call feedkeys(":syntax kwd\<Tab>\<C-B>\"\<CR>", 'tx')
call assert_equal('"syntax kwd', @:) call assert_equal('"syntax kwd', @:)
set wildoptions=fuzzy set wildoptions=fuzzy
call feedkeys(":syntax kwd\<Tab>\<C-B>\"\<CR>", 'tx') call feedkeys(":syntax kwd\<Tab>\<C-B>\"\<CR>", 'tx')
call assert_equal('"syntax keyword', @:) call assert_equal('"syntax keyword', @:)
set wildoptions&
endfunc
" syntax group name fuzzy completion " syntax group name fuzzy completion
func Test_fuzzy_completion_syntax_group()
set wildoptions& set wildoptions&
call feedkeys(":syntax list mpar\<Tab>\<C-B>\"\<CR>", 'tx') call feedkeys(":syntax list mpar\<Tab>\<C-B>\"\<CR>", 'tx')
call assert_equal('"syntax list mpar', @:) call assert_equal('"syntax list mpar', @:)
set wildoptions=fuzzy set wildoptions=fuzzy
call feedkeys(":syntax list mpar\<Tab>\<C-B>\"\<CR>", 'tx') call feedkeys(":syntax list mpar\<Tab>\<C-B>\"\<CR>", 'tx')
call assert_equal('"syntax list MatchParen', @:) call assert_equal('"syntax list MatchParen', @:)
set wildoptions&
endfunc
" :syntime suboptions fuzzy completion " :syntime suboptions fuzzy completion
if has('profile') func Test_fuzzy_completion_syntime()
set wildoptions& CheckFeature profile
call feedkeys(":syntime clr\<Tab>\<C-B>\"\<CR>", 'tx') set wildoptions&
call assert_equal('"syntime clr', @:) call feedkeys(":syntime clr\<Tab>\<C-B>\"\<CR>", 'tx')
set wildoptions=fuzzy call assert_equal('"syntime clr', @:)
call feedkeys(":syntime clr\<Tab>\<C-B>\"\<CR>", 'tx') set wildoptions=fuzzy
call assert_equal('"syntime clear', @:) call feedkeys(":syntime clr\<Tab>\<C-B>\"\<CR>", 'tx')
endif call assert_equal('"syntime clear', @:)
set wildoptions&
endfunc
" tag name fuzzy completion - NOT supported " " tag name fuzzy completion - NOT supported
" func Test_fuzzy_completion_tagname()
" endfunc
" tag name and file fuzzy completion - NOT supported " " tag name and file fuzzy completion - NOT supported
" func Test_fuzzy_completion_tagfile()
" endfunc
" user names fuzzy completion - how to test this functionality? " " user names fuzzy completion - how to test this functionality?
" func Test_fuzzy_completion_username()
" endfunc
" user defined variable name fuzzy completion " user defined variable name fuzzy completion
func Test_fuzzy_completion_userdefined_var()
let g:SomeVariable=10 let g:SomeVariable=10
set wildoptions& set wildoptions&
call feedkeys(":let SVar\<Tab>\<C-B>\"\<CR>", 'tx') call feedkeys(":let SVar\<Tab>\<C-B>\"\<CR>", 'tx')
@ -2812,8 +2911,11 @@ func Test_wildoptions_fuzzy()
set wildoptions=fuzzy set wildoptions=fuzzy
call feedkeys(":let SVar\<Tab>\<C-B>\"\<CR>", 'tx') call feedkeys(":let SVar\<Tab>\<C-B>\"\<CR>", 'tx')
call assert_equal('"let SomeVariable', @:) call assert_equal('"let SomeVariable', @:)
set wildoptions&
endfunc
" Test for sorting the results by the best match " Test for sorting the results by the best match
func Test_fuzzy_completion_cmd_sort_results()
%bw! %bw!
command T123format : command T123format :
command T123goformat : command T123goformat :
@ -2831,9 +2933,11 @@ func Test_wildoptions_fuzzy()
delcommand T123state delcommand T123state
delcommand T123FendingOff delcommand T123FendingOff
%bw %bw
set wildoptions&
endfunc
" Test for fuzzy completion of a command with lower case letters and a " Test for fuzzy completion of a command with lower case letters and a number
" number func Test_fuzzy_completion_cmd_alnum()
command Foo2Bar : command Foo2Bar :
set wildoptions=fuzzy set wildoptions=fuzzy
call feedkeys(":foo2\<Tab>\<C-B>\"\<CR>", 'tx') call feedkeys(":foo2\<Tab>\<C-B>\"\<CR>", 'tx')
@ -2843,8 +2947,11 @@ func Test_wildoptions_fuzzy()
call feedkeys(":bar\<Tab>\<C-B>\"\<CR>", 'tx') call feedkeys(":bar\<Tab>\<C-B>\"\<CR>", 'tx')
call assert_equal('"Foo2Bar', @:) call assert_equal('"Foo2Bar', @:)
delcommand Foo2Bar delcommand Foo2Bar
set wildoptions&
endfunc
" Test for command completion for a command starting with 'k' " Test for command completion for a command starting with 'k'
func Test_fuzzy_completion_cmd_k()
command KillKillKill : command KillKillKill :
set wildoptions& set wildoptions&
call feedkeys(":killkill\<Tab>\<C-B>\"\<CR>", 'tx') call feedkeys(":killkill\<Tab>\<C-B>\"\<CR>", 'tx')
@ -2853,9 +2960,33 @@ func Test_wildoptions_fuzzy()
call feedkeys(":killkill\<Tab>\<C-B>\"\<CR>", 'tx') call feedkeys(":killkill\<Tab>\<C-B>\"\<CR>", 'tx')
call assert_equal('"KillKillKill', @:) call assert_equal('"KillKillKill', @:)
delcom KillKillKill delcom KillKillKill
set wildoptions& set wildoptions&
%bw! endfunc
" Test for fuzzy completion for user defined custom completion function
func Test_fuzzy_completion_custom_func()
func Tcompl(a, c, p)
return "format\ngoformat\nTestFOrmat\nfendoff\nstate"
endfunc
command -nargs=* -complete=custom,Tcompl Fuzzy :
set wildoptions&
call feedkeys(":Fuzzy fo\<C-A>\<C-B>\"\<CR>", 'tx')
call assert_equal("\"Fuzzy format", @:)
call feedkeys(":Fuzzy xy\<Tab>\<C-B>\"\<CR>", 'tx')
call assert_equal("\"Fuzzy xy", @:)
call feedkeys(":Fuzzy ttt\<C-A>\<C-B>\"\<CR>", 'tx')
call assert_equal("\"Fuzzy ttt", @:)
set wildoptions=fuzzy
call feedkeys(":Fuzzy \<C-A>\<C-B>\"\<CR>", 'tx')
call assert_equal("\"Fuzzy format goformat TestFOrmat fendoff state", @:)
call feedkeys(":Fuzzy fo\<C-A>\<C-B>\"\<CR>", 'tx')
call assert_equal("\"Fuzzy format TestFOrmat goformat fendoff", @:)
call feedkeys(":Fuzzy xy\<Tab>\<C-B>\"\<CR>", 'tx')
call assert_equal("\"Fuzzy xy", @:)
call feedkeys(":Fuzzy ttt\<C-A>\<C-B>\"\<CR>", 'tx')
call assert_equal("\"Fuzzy TestFOrmat", @:)
delcom Fuzzy
set wildoptions&
endfunc endfunc
" vim: shiftwidth=2 sts=2 expandtab " vim: shiftwidth=2 sts=2 expandtab

2
src/version.c
View File

@ -754,6 +754,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 */
/**/
4482,
/**/ /**/
4481, 4481,
/**/ /**/