patch 9.1.0756: missing change from patch v9.1.0754

Problem:  missing change from patch v9.1.0754
Solution: use correct width for the actual item
          in pum_redraw() (glepnir)

closes: #15786

Signed-off-by: glepnir <glephunter@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/src/popupmenu.c b/src/popupmenu.c
index 010a9872f577250a37c115786632b9a5abe9e91d..437c6e7e190869657f1b5bf5af2f61f9dec7e1b8 100644 (file)
--- a/src/popupmenu.c
+++ b/src/popupmenu.c
@@ -810,7 +810,7 @@ pum_redraw(void)
            if (j == 2
                    || (next_isempty && (j == 1 || (j == 0
                                && pum_get_item(idx, order[j + 2]) == NULL)))
-                   || pum_base_width + n >= pum_width)
+                   || basic_width + n >= pum_width)
                break;
 #ifdef FEAT_RIGHTLEFT
            if (pum_rl)

diff --git a/src/testdir/dumps/Test_pum_completeitemalign_07.dump b/src/testdir/dumps/Test_pum_completeitemalign_07.dump
new file mode 100644 (file)
index 0000000..3b8acb9
--- /dev/null
+++ b/src/testdir/dumps/Test_pum_completeitemalign_07.dump
@@ -0,0 +1,20 @@
+|l+0&#ffffff0|o@3|n|g|_|f|o@1> 
+|m+0#0000001#e0e0e08|e|n|u| |S| |l|o@3
+|m+0&#ffd7ff255|e|n|u| |T| |l|o@3
+|~+0#4040ff13#ffffff0| @10
+|~| @10
+|~| @10
+|~| @10
+|~| @10
+|~| @10
+|~| @10
+|~| @10
+|~| @10
+|~| @10
+|~| @10
+|~| @10
+|~| @10
+|~| @10
+|~| @10
+| +0#0000000&@11
+|-+2&&@1| +0&&@9

diff --git a/src/testdir/test_popup.vim b/src/testdir/test_popup.vim
index 1758f7498a89398ed5ebc3f4d0596a0ff8c32616..a4f6d02d20955ec9c1a1367bbbb066df82033b70 100644 (file)
--- a/src/testdir/test_popup.vim
+++ b/src/testdir/test_popup.vim
@@ -1595,6 +1595,17 @@ func Test_pum_completeitemalign()
             \ { 'word': '你好', 'kind': 'C', 'menu': '中文' },
             \]}
     endfunc
+
+    func Omni_long(findstart, base)
+      if a:findstart
+        return col(".")
+      endif
+      return {
+            \ 'words': [
+            \ { 'word': 'loooong_foo', 'kind': 'S', 'menu': 'menu' },
+            \ { 'word': 'loooong_bar', 'kind': 'T', 'menu': 'menu' },
+            \]}
+    endfunc
     set omnifunc=Omni_test
     command! -nargs=0 T1 set cia=abbr,kind,menu
     command! -nargs=0 T2 set cia=abbr,menu,kind
@@ -1636,8 +1647,11 @@ func Test_pum_completeitemalign()
   " T6
   call term_sendkeys(buf, ":T6\<CR>S\<C-X>\<C-O>")
   call VerifyScreenDump(buf, 'Test_pum_completeitemalign_06', {})
-  call term_sendkeys(buf, "\<C-E>\<Esc>:T7\<CR>")
+  call term_sendkeys(buf, "\<C-E>\<Esc>")
 
+  call term_sendkeys(buf, ":set columns=12 cmdheight=2 omnifunc=Omni_long\<CR>S\<C-X>\<C-O>")
+  call VerifyScreenDump(buf, 'Test_pum_completeitemalign_07', {})
+  call term_sendkeys(buf, "\<C-E>\<Esc>:T7\<CR>")
   call StopVimInTerminal(buf)
 endfunc
 

diff --git a/src/version.c b/src/version.c
index 3ea146859c736ab6b49fcef029b86bab71db2712..633c1e6d51d869e8867ea2290a3eee15129b4a5e 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    756,
 /**/
     755,
 /**/