Skip to content

Commit

Permalink
patch 8.2.4475: fuzzy cmdline completion does not work for lower case
Browse files Browse the repository at this point in the history
Problem:    Fuzzy cmdline completion does not work for lower case.
Solution:   Also use fuzzy completion for lower case input. (Yegappan
            Lakshmanan, closes #9849)
  • Loading branch information
yegappan authored and brammool committed Feb 26, 2022
1 parent 5a2d4a3 commit 4df5b33
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 7 deletions.
22 changes: 15 additions & 7 deletions src/cmdexpand.c
Expand Up @@ -1212,6 +1212,7 @@ set_cmd_index(char_u *cmd, exarg_T *eap, expand_T *xp, int *complp)
{
char_u *p = NULL;
int len = 0;
int fuzzy = cmdline_fuzzy_complete(cmd);

// Isolate the command and search for it in the command table.
// Exceptions:
Expand Down Expand Up @@ -1253,7 +1254,9 @@ set_cmd_index(char_u *cmd, exarg_T *eap, expand_T *xp, int *complp)

eap->cmdidx = excmd_get_cmdidx(cmd, len);

if (cmd[0] >= 'A' && cmd[0] <= 'Z')
// User defined commands support alphanumeric characters.
// Also when doing fuzzy expansion, support alphanumeric characters.
if ((cmd[0] >= 'A' && cmd[0] <= 'Z') || (fuzzy && *p != NUL))
while (ASCII_ISALNUM(*p) || *p == '*') // Allow * wild card
++p;
}
Expand Down Expand Up @@ -2493,6 +2496,7 @@ ExpandFromContext(
int ret;
int flags;
char_u *tofree = NULL;
int fuzzy = cmdline_fuzzy_complete(pat);

flags = map_wildopts_to_ewflags(options);

Expand Down Expand Up @@ -2577,12 +2581,15 @@ ExpandFromContext(
pat = tofree;
}

regmatch.regprog = vim_regcomp(pat, magic_isset() ? RE_MAGIC : 0);
if (regmatch.regprog == NULL)
return FAIL;
if (!fuzzy)
{
regmatch.regprog = vim_regcomp(pat, magic_isset() ? RE_MAGIC : 0);
if (regmatch.regprog == NULL)
return FAIL;

// set ignore-case according to p_ic, p_scs and pat
regmatch.rm_ic = ignorecase(pat);
// set ignore-case according to p_ic, p_scs and pat
regmatch.rm_ic = ignorecase(pat);
}

if (xp->xp_context == EXPAND_SETTINGS
|| xp->xp_context == EXPAND_BOOL_SETTINGS)
Expand All @@ -2596,7 +2603,8 @@ ExpandFromContext(
else
ret = ExpandOther(pat, xp, &regmatch, matches, numMatches);

vim_regfree(regmatch.regprog);
if (!fuzzy)
vim_regfree(regmatch.regprog);
vim_free(tofree);

return ret;
Expand Down
12 changes: 12 additions & 0 deletions src/testdir/test_cmdline.vim
Expand Up @@ -2776,6 +2776,18 @@ func Test_wildoptions_fuzzy()
delcommand T123FendingOff
%bw

" Test for fuzzy completion of a command with lower case letters and a
" number
command Foo2Bar :
set wildoptions=fuzzy
call feedkeys(":foo2\<Tab>\<C-B>\"\<CR>", 'tx')
call assert_equal('"Foo2Bar', @:)
call feedkeys(":foo\<Tab>\<C-B>\"\<CR>", 'tx')
call assert_equal('"Foo2Bar', @:)
call feedkeys(":bar\<Tab>\<C-B>\"\<CR>", 'tx')
call assert_equal('"Foo2Bar', @:)
delcommand Foo2Bar

set wildoptions&
%bw!
endfunc
Expand Down
2 changes: 2 additions & 0 deletions src/version.c
Expand Up @@ -754,6 +754,8 @@ static char *(features[]) =

static int included_patches[] =
{ /* Add new patch number below this line */
/**/
4475,
/**/
4474,
/**/
Expand Down

0 comments on commit 4df5b33

Please sign in to comment.