aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/nvim/insexpand.c6
-rw-r--r--test/old/testdir/test_ins_complete.vim7
2 files changed, 8 insertions, 5 deletions
diff --git a/src/nvim/insexpand.c b/src/nvim/insexpand.c
index 77fae4dd18..9f39c7d581 100644
--- a/src/nvim/insexpand.c
+++ b/src/nvim/insexpand.c
@@ -1195,8 +1195,8 @@ static int ins_compl_build_pum(void)
int max_fuzzy_score = 0;
do {
- // when completeopt include fuzzy option and leader is not null or empty
- // set the cp_score for after compare.
+ // When 'completeopt' contains "fuzzy" and leader is not NULL or empty,
+ // set the cp_score for later comparisons.
if (compl_fuzzy_match && compl_leader != NULL && lead_len > 0) {
comp->cp_score = fuzzy_match_str(comp->cp_str, compl_leader);
}
@@ -3639,7 +3639,7 @@ static void ins_compl_show_filename(void)
redraw_cmdline = false; // don't overwrite!
}
-/// find a completion item in when completeopt include fuzzy option
+/// Find a completion item when 'completeopt' contains "fuzzy".
static compl_T *find_comp_when_fuzzy(void)
{
int target_idx = -1;
diff --git a/test/old/testdir/test_ins_complete.vim b/test/old/testdir/test_ins_complete.vim
index ba5e5acce9..573cd9729c 100644
--- a/test/old/testdir/test_ins_complete.vim
+++ b/test/old/testdir/test_ins_complete.vim
@@ -2529,6 +2529,7 @@ func Test_complete_fuzzy_match()
endif
return [#{word: "foo"}, #{word: "foobar"}, #{word: "fooBaz"}, #{word: "foobala"}]
endfunc
+
new
set omnifunc=Omni_test
set completeopt+=noinsert,fuzzy
@@ -2541,13 +2542,13 @@ func Test_complete_fuzzy_match()
" select next
call feedkeys("S\<C-x>\<C-o>fb\<C-n>", 'tx')
call assert_equal('foobar', g:word)
- " can circly select next
+ " can cyclically select next
call feedkeys("S\<C-x>\<C-o>fb\<C-n>\<C-n>\<C-n>", 'tx')
call assert_equal(v:null, g:word)
" select prev
call feedkeys("S\<C-x>\<C-o>fb\<C-p>", 'tx')
call assert_equal(v:null, g:word)
- " can circly select prev
+ " can cyclically select prev
call feedkeys("S\<C-x>\<C-o>fb\<C-p>\<C-p>\<C-p>\<C-p>", 'tx')
call assert_equal('fooBaz', g:word)
@@ -2566,6 +2567,8 @@ func Test_complete_fuzzy_match()
augroup! AAAAA_Group
delfunc OnPumChange
delfunc Omni_test
+ unlet g:item
+ unlet g:word
endfunc
" vim: shiftwidth=2 sts=2 expandtab nofoldenable