patch 9.1.1261: No test for 'pummaxwidth' non-truncated items

Problem:  No test for 'pummaxwidth' non-truncated items (after v9.1.1250)
Solution: Add shorter items to Test_pum_maxwidth_multibyte() (zeertzjq).

closes: #17007

Signed-off-by: zeertzjq <zeertzjq@outlook.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/src/testdir/dumps/Test_pum_maxwidth_05.dump b/src/testdir/dumps/Test_pum_maxwidth_05.dump
index 0dd6a39370023f6c3758a09ae873a3c38ff77ba4..b5765bc03520d29c9cd433abdff96547ffc285fc 100644 (file)
--- a/src/testdir/dumps/Test_pum_maxwidth_05.dump
+++ b/src/testdir/dumps/Test_pum_maxwidth_05.dump
@@ -1,8 +1,8 @@
 |1+0&#ffffff0|2|3|4|5|6|7|8|9|_|1|2|3|4|5|6|7|8|9|_|1|2|3|4|5|6|7|8|9|_> @44
 |1+0#0000001#e0e0e08|2|3|4|5|6|7|8|9|_|1|2|3|4|5|6|7|8|9|_|1|2|3|4|5|6|7|8|9|_| | +0#4040ff13#ffffff0@43
 |一*0#0000001#ffd7ff255|二|三|四|五|六|七|八|九|十| +&@10| +0#4040ff13#ffffff0@43
-|~| @73
-|~| @73
+|a+0#0000001#ffd7ff255|b|c|d|e|f|g|h|i|j| @20| +0#4040ff13#ffffff0@43
+|上*0#0000001#ffd7ff255|下|左|右| +&@22| +0#4040ff13#ffffff0@43
 |~| @73
 |~| @73
 |~| @73

diff --git a/src/testdir/dumps/Test_pum_maxwidth_06.dump b/src/testdir/dumps/Test_pum_maxwidth_06.dump
index 7321870ebeb14a918681cfc802c42c8564ce24a4..abc6bdf22be6ad66324a4a7f34c27e6f11cc0bfd 100644 (file)
--- a/src/testdir/dumps/Test_pum_maxwidth_06.dump
+++ b/src/testdir/dumps/Test_pum_maxwidth_06.dump
@@ -1,8 +1,8 @@
 |1+0&#ffffff0|2|3|4|5|6|7|8|9|_|1|2|3|4|5|6|7|8|9|_|1|2|3|4|5|6|7|8|9|_> @44
 |1+0#0000001#e0e0e08|2|3|4|5|6|7|.@2| +0#4040ff13#ffffff0@64
 |一*0#0000001#ffd7ff255|二|三| +&|.@2| +0#4040ff13#ffffff0@64
-|~| @73
-|~| @73
+|a+0#0000001#ffd7ff255|b|c|d|e|f|g|h|i|j| +0#4040ff13#ffffff0@64
+|上*0#0000001#ffd7ff255|下|左|右| +&@1| +0#4040ff13#ffffff0@64
 |~| @73
 |~| @73
 |~| @73

diff --git a/src/testdir/dumps/Test_pum_maxwidth_07.dump b/src/testdir/dumps/Test_pum_maxwidth_07.dump
index 8e81d31b9e78501b0c7c7f7609468ed1eadce6ba..acdaa39dbc0f2f359e699f408a7e300955ebf114 100644 (file)
--- a/src/testdir/dumps/Test_pum_maxwidth_07.dump
+++ b/src/testdir/dumps/Test_pum_maxwidth_07.dump
@@ -1,8 +1,8 @@
 | +0&#ffffff0@43> |_|9|8|7|6|5|4|3|2|1|_|9|8|7|6|5|4|3|2|1|_|9|8|7|6|5|4|3|2|1
 | +0#4040ff13&@64|.+0#0000001#e0e0e08@2|7|6|5|4|3|2|1
 | +0#4040ff13#ffffff0@64|.+0#0000001#ffd7ff255@2| |三*&|二|一
+| +0#4040ff13#ffffff0@64|j+0#0000001#ffd7ff255|i|h|g|f|e|d|c|b|a
+| +0#4040ff13#ffffff0@64| +0#0000001#ffd7ff255@1|右*&|左|下|上
 | +0#4040ff13#ffffff0@73|~
 | @73|~
 | @73|~
-| @73|~
-| @73|~

diff --git a/src/testdir/dumps/Test_pum_maxwidth_08.dump b/src/testdir/dumps/Test_pum_maxwidth_08.dump
index 8681e5f69f11c5217a96ada573a36fecf6189f34..3c6ae5124eaf0e6ceb48d370a3dc22d5480342c9 100644 (file)
--- a/src/testdir/dumps/Test_pum_maxwidth_08.dump
+++ b/src/testdir/dumps/Test_pum_maxwidth_08.dump
@@ -1,8 +1,8 @@
 |1+0&#ffffff0|2|3|4|5|6|7|8|9|_|1|2|3|4|5|6|7|8|9|_|1|2|3|4|5|6|7|8|9|_> @44
 |1+0#0000001#e0e0e08|2| +0#4040ff13#ffffff0@72
 |一*0#0000001#ffd7ff255| +0#4040ff13#ffffff0@72
-|~| @73
-|~| @73
+|a+0#0000001#ffd7ff255|b| +0#4040ff13#ffffff0@72
+|上*0#0000001#ffd7ff255| +0#4040ff13#ffffff0@72
 |~| @73
 |~| @73
 |~| @73

diff --git a/src/testdir/test_popup.vim b/src/testdir/test_popup.vim
index e95465c2d4dad950328b981a0f85e1d98eeef7b3..e216a6d586e5c7e810abab5821d899ffb2a50b53 100644 (file)
--- a/src/testdir/test_popup.vim
+++ b/src/testdir/test_popup.vim
@@ -2036,6 +2036,8 @@ func Test_pum_maxwidth_multibyte()
       return [
         \ #{word: "123456789_123456789_123456789_"},
         \ #{word: "一二三四五六七八九十"},
+        \ #{word: "abcdefghij"},
+        \ #{word: "上下左右"},
         \ ]
     endfunc
     set omnifunc=Omni_test

diff --git a/src/version.c b/src/version.c
index d0fdb652897e2ab6075809eb5b85f07f172d7f6b..4be2967b6ff389347850d1629abf98813562dfdc 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 */
+/**/
+    1261,
 /**/
     1260,
 /**/