From 4b3a9ac4133c064e1adc8b19e6afbcb8096ba8da Mon Sep 17 00:00:00 2001
From: glepnir <glephunter@gmail.com>
Date: Sun, 11 May 2025 20:36:20 +0800
Subject: [PATCH] vim-patch:9.1.1381: completion: cannot return to original
 text (#33966)

Problem:  Cannot return to the original text after selecting the next
          item when the currently selected item is the last one.
Solution: When continuing to move down past the last item, locate the
          original completion at the head/tail nodes of the completed
          linked list (glepnir).

closes: vim/vim#17300

https://github.com/vim/vim/commit/5a18ccf49007481b1fffcf101e4ce0b36a2db241
---
 src/nvim/insexpand.c                   |  5 ++---
 test/old/testdir/test_ins_complete.vim | 15 ++++++++++++++-
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/nvim/insexpand.c b/src/nvim/insexpand.c
index 0d58d22e8c..8625c0c1ca 100644
--- a/src/nvim/insexpand.c
+++ b/src/nvim/insexpand.c
@@ -4414,9 +4414,8 @@ static compl_T *find_comp_when_fuzzy(void)
   assert(compl_match_array != NULL);
   if ((is_forward && compl_selected_item == compl_match_arraysize - 1)
       || (is_backward && compl_selected_item == 0)) {
-    return compl_first_match != compl_shown_match
-           ? (is_forward ? compl_shown_match->cp_next : compl_first_match)
-           : (compl_first_match->cp_prev ? compl_first_match->cp_prev : NULL);
+    return match_at_original_text(compl_first_match) ? compl_first_match
+                                                     : compl_first_match->cp_prev;
   }
 
   if (is_forward) {
diff --git a/test/old/testdir/test_ins_complete.vim b/test/old/testdir/test_ins_complete.vim
index 63607170be..7d2288d97b 100644
--- a/test/old/testdir/test_ins_complete.vim
+++ b/test/old/testdir/test_ins_complete.vim
@@ -2777,11 +2777,15 @@ func Test_complete_opt_fuzzy()
     autocmd CompleteChanged * :call OnPumChange()
   augroup END
 
+  let g:change = 0
   func Omni_test(findstart, base)
     if a:findstart
       return col(".")
     endif
-    return [#{word: "foo"}, #{word: "foobar"}, #{word: "fooBaz"}, #{word: "foobala"}, #{word: "你好吗"}, #{word: "我好"}]
+    if g:change == 0
+      return [#{word: "foo"}, #{word: "foobar"}, #{word: "fooBaz"}, #{word: "foobala"}, #{word: "你好吗"}, #{word: "我好"}]
+    endif
+    return [#{word: "for i = .."}, #{word: "bar"}, #{word: "foo"}, #{word: "for .. ipairs"}, #{word: "for .. pairs"}]
   endfunc
 
   new
@@ -2878,6 +2882,15 @@ func Test_complete_opt_fuzzy()
   call feedkeys("Salpha bravio charlie\<CR>alpha\<C-X>\<C-N>\<C-X>\<C-N>\<C-X>\<C-N>\<ESC>", 'tx')
   call assert_equal('alpha bravio charlie', getline('.'))
 
+  set cot=fuzzy,menu,noinsert
+  call feedkeys(":let g:change=1\<CR>")
+  call feedkeys("S\<C-X>\<C-O>for\<C-N>\<C-N>\<C-N>", 'tx')
+  call assert_equal('for', getline('.'))
+  call feedkeys("S\<C-X>\<C-O>for\<C-P>", 'tx')
+  call assert_equal('for', getline('.'))
+  call feedkeys("S\<C-X>\<C-O>for\<C-P>\<C-P>", 'tx')
+  call assert_equal('for .. ipairs', getline('.'))
+
   " clean up
   set omnifunc=
   bw!