patch 8.2.1673: complete_info() selected index has an invalid value

Problem:    complete_info() selected index has an invalid value. (Ben Jackson)
Solution:   Set the index when there is only one match. (closes #6945)
            Add test for complete_info().

diff --git a/src/insexpand.c b/src/insexpand.c
index 03dddc3ee71148f15e5eb0ed231b7c9136d1098c..23ab0afc0ae187d41ff49184e109271fc5b63bf6 100644 (file)
--- a/src/insexpand.c
+++ b/src/insexpand.c
@@ -4009,6 +4009,7 @@ ins_complete(int c, int enable_pum)
        {
            edit_submode_extra = (char_u *)_("The only match");
            edit_submode_highl = HLF_COUNT;
+           compl_curr_match->cp_number = 0;
        }
        else
        {

diff --git a/src/testdir/test_ins_complete.vim b/src/testdir/test_ins_complete.vim
index 41d6b7f50ece75d4b61477109cd27781b2afdc1f..992fefab43cd550fa818aa08fddd3f2013259adb 100644 (file)
--- a/src/testdir/test_ins_complete.vim
+++ b/src/testdir/test_ins_complete.vim
@@ -313,6 +313,24 @@ func Test_CompleteDone_undo()
   au! CompleteDone
 endfunc
 
+func CompleteTest(findstart, query)
+  if a:findstart
+    return col('.')
+  endif
+  return ['matched']
+endfunc
+
+func Test_completefunc_info()
+  new
+  set completeopt=menuone
+  set completefunc=CompleteTest
+  call feedkeys("i\<C-X>\<C-U>\<C-R>\<C-R>=string(complete_info())\<CR>\<ESC>", "tx")
+  call assert_equal("matched{'pum_visible': 1, 'mode': 'function', 'selected': -1, 'items': [{'word': 'matched', 'menu': '', 'user_data': '', 'info': '', 'kind': '', 'abbr': ''}]}", getline(1))
+  bwipe!
+  set completeopt&
+  set completefunc&
+endfunc
+
 " Check that when using feedkeys() typeahead does not interrupt searching for
 " completions.
 func Test_compl_feedkeys()

diff --git a/src/version.c b/src/version.c
index 950ca40c3e790a92186f7400becc44909d6998ee..f30daf818b1249d210dc4fb45acf2f7471dcaaff 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1673,
 /**/
     1672,
 /**/