patch 9.2.0454: tests: no test that "abbr" in customlist completion is shown

Problem:  No test that "abbr" in customlist completion is shown in pum.
Solution: Add some "abbr" fields to the existing test (zeertzjq).

closes: #20165

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

diff --git a/src/testdir/dumps/Test_customlist_info_popup_01.dump b/src/testdir/dumps/Test_customlist_info_popup_01.dump
index 0bb1ddb7b1031840decbefaca320bc9e81f143ff..a17ff601eb816e7011db348eccfd6f67819985bf 100644 (file)
--- a/src/testdir/dumps/Test_customlist_info_popup_01.dump
+++ b/src/testdir/dumps/Test_customlist_info_popup_01.dump
@@ -5,8 +5,8 @@
 |~| @73
 |~| @73
 |~| @26|╔+0#0000001#e0e0e08|═@12|X| +0#4040ff13#ffffff0@31
-|~| @6| +0#0000001#e0e0e08|a|p@1|l|e| @1|f| |f|r|u|i|t| @4|║| |A| |r|e|d| |f|r|u|i|t| |║| +0#4040ff13#ffffff0@31
-|~| @6| +0#0000001#ffd7ff255|b|a|n|a|n|a| |f| |f|r|u|i|t| @4|╚+0&#e0e0e08|═@12|⇲| +0#4040ff13#ffffff0@31
+|~| @6| +0#0000001#e0e0e08|🍎*&| +&@4|f| |f|r|u|i|t| @4|║| |A| |r|e|d| |f|r|u|i|t| |║| +0#4040ff13#ffffff0@31
+|~| @6| +0#0000001#ffd7ff255|🍌*&| +&@4|f| |f|r|u|i|t| @4|╚+0&#e0e0e08|═@12|⇲| +0#4040ff13#ffffff0@31
 |~| @6| +0#0000001#ffd7ff255|c|a|r@1|o|t| |v| |v|e|g|e|t|a|b|l|e| | +0#4040ff13#ffffff0@46
 |~| @6| +0#0000001#ffd7ff255|p|l|a|i|n| @13| +0#4040ff13#ffffff0@46
 |:+0#0000000&|D|i|c|t|C|m|d| |a|p@1|l|e> @60

diff --git a/src/testdir/dumps/Test_customlist_info_popup_02.dump b/src/testdir/dumps/Test_customlist_info_popup_02.dump
index 3959110152624f8b6342c038be2cfcfa3ec89ca1..c8c9c54ae30a0b08fc177c4eb1f969e882a3e54c 100644 (file)
--- a/src/testdir/dumps/Test_customlist_info_popup_02.dump
+++ b/src/testdir/dumps/Test_customlist_info_popup_02.dump
@@ -5,8 +5,8 @@
 |~| @73
 |~| @73
 |~| @73
-|~| @6| +0#0000001#ffd7ff255|a|p@1|l|e| @1|f| |f|r|u|i|t| @4|╔+0&#e0e0e08|═@15|X| +0#4040ff13#ffffff0@28
-|~| @6| +0#0000001#e0e0e08|b|a|n|a|n|a| |f| |f|r|u|i|t| @4|║| |A| |y|e|l@1|o|w| |f|r|u|i|t| |║| +0#4040ff13#ffffff0@28
+|~| @6| +0#0000001#ffd7ff255|🍎*&| +&@4|f| |f|r|u|i|t| @4|╔+0&#e0e0e08|═@15|X| +0#4040ff13#ffffff0@28
+|~| @6| +0#0000001#e0e0e08|🍌*&| +&@4|f| |f|r|u|i|t| @4|║| |A| |y|e|l@1|o|w| |f|r|u|i|t| |║| +0#4040ff13#ffffff0@28
 |~| @6| +0#0000001#ffd7ff255|c|a|r@1|o|t| |v| |v|e|g|e|t|a|b|l|e| |╚+0&#e0e0e08|═@15|⇲| +0#4040ff13#ffffff0@28
 |~| @6| +0#0000001#ffd7ff255|p|l|a|i|n| @13| +0#4040ff13#ffffff0@46
 |:+0#0000000&|D|i|c|t|C|m|d| |b|a|n|a|n|a> @59

diff --git a/src/testdir/dumps/Test_customlist_info_popup_03.dump b/src/testdir/dumps/Test_customlist_info_popup_03.dump
index f67d860c5d639f0534ff4086d9d1b691d772b9e6..4aa47adfcb50b71215eaab05634f8eb8b74acf18 100644 (file)
--- a/src/testdir/dumps/Test_customlist_info_popup_03.dump
+++ b/src/testdir/dumps/Test_customlist_info_popup_03.dump
@@ -5,8 +5,8 @@
 |~| @73
 |~| @73
 |~| @73
-|~| @6| +0#0000001#ffd7ff255|a|p@1|l|e| @1|f| |f|r|u|i|t| @4| +0#4040ff13#ffffff0@46
-|~| @6| +0#0000001#ffd7ff255|b|a|n|a|n|a| |f| |f|r|u|i|t| @4|╔+0&#e0e0e08|═@20|X| +0#4040ff13#ffffff0@23
+|~| @6| +0#0000001#ffd7ff255|🍎*&| +&@4|f| |f|r|u|i|t| @4| +0#4040ff13#ffffff0@46
+|~| @6| +0#0000001#ffd7ff255|🍌*&| +&@4|f| |f|r|u|i|t| @4|╔+0&#e0e0e08|═@20|X| +0#4040ff13#ffffff0@23
 |~| @6| +0#0000001#e0e0e08|c|a|r@1|o|t| |v| |v|e|g|e|t|a|b|l|e| |║| |A|n| |o|r|a|n|g|e| |v|e|g|e|t|a|b|l|e| |║| +0#4040ff13#ffffff0@23
 |~| @6| +0#0000001#ffd7ff255|p|l|a|i|n| @13|╚+0&#e0e0e08|═@20|⇲| +0#4040ff13#ffffff0@23
 |:+0#0000000&|D|i|c|t|C|m|d| |c|a|r@1|o|t> @59

diff --git a/src/testdir/dumps/Test_customlist_info_popup_04.dump b/src/testdir/dumps/Test_customlist_info_popup_04.dump
index 0092776a94faed18a619a66000cdffc8310f7840..18cb1ba1f9a906d4356d669488cf4f6d689c7df0 100644 (file)
--- a/src/testdir/dumps/Test_customlist_info_popup_04.dump
+++ b/src/testdir/dumps/Test_customlist_info_popup_04.dump
@@ -5,8 +5,8 @@
 |~| @73
 |~| @73
 |~| @73
-|~| @6| +0#0000001#ffd7ff255|a|p@1|l|e| @1|f| |f|r|u|i|t| @4| +0#4040ff13#ffffff0@46
-|~| @6| +0#0000001#ffd7ff255|b|a|n|a|n|a| |f| |f|r|u|i|t| @4| +0#4040ff13#ffffff0@46
+|~| @6| +0#0000001#ffd7ff255|🍎*&| +&@4|f| |f|r|u|i|t| @4| +0#4040ff13#ffffff0@46
+|~| @6| +0#0000001#ffd7ff255|🍌*&| +&@4|f| |f|r|u|i|t| @4| +0#4040ff13#ffffff0@46
 |~| @6| +0#0000001#ffd7ff255|c|a|r@1|o|t| |v| |v|e|g|e|t|a|b|l|e| | +0#4040ff13#ffffff0@46
 |~| @6| +0#0000001#e0e0e08|p|l|a|i|n| @13| +0#4040ff13#ffffff0@46
 |:+0#0000000&|D|i|c|t|C|m|d| |p|l|a|i|n> @60

diff --git a/src/testdir/dumps/Test_customlist_info_popup_05.dump b/src/testdir/dumps/Test_customlist_info_popup_05.dump
index 37242aec780361ca47cca520bd70beafe55b0c19..a4b6d1517ced236e1b4332413bec61911ade695f 100644 (file)
--- a/src/testdir/dumps/Test_customlist_info_popup_05.dump
+++ b/src/testdir/dumps/Test_customlist_info_popup_05.dump
@@ -5,8 +5,8 @@
 |~| @73
 |~| @73
 |~| @73
-|~| @6| +0#0000001#ffd7ff255|a|p@1|l|e| @1|f| |f|r|u|i|t| @4| +0#4040ff13#ffffff0@46
-|~| @6| +0#0000001#ffd7ff255|b|a|n|a|n|a| |f| |f|r|u|i|t| @4| +0#4040ff13#ffffff0@46
+|~| @6| +0#0000001#ffd7ff255|🍎*&| +&@4|f| |f|r|u|i|t| @4| +0#4040ff13#ffffff0@46
+|~| @6| +0#0000001#ffd7ff255|🍌*&| +&@4|f| |f|r|u|i|t| @4| +0#4040ff13#ffffff0@46
 |~| @6| +0#0000001#ffd7ff255|c|a|r@1|o|t| |v| |v|e|g|e|t|a|b|l|e| | +0#4040ff13#ffffff0@46
 |~| @6| +0#0000001#ffd7ff255|p|l|a|i|n| @13| +0#4040ff13#ffffff0@46
 |:+0#0000000&|D|i|c|t|C|m|d| > @65

diff --git a/src/testdir/dumps/Test_customlist_info_popup_06.dump b/src/testdir/dumps/Test_customlist_info_popup_06.dump
index 72324ff0a80fbc96b438a68fd1c7b62dc65d65c1..7b8eba89db98b6f93aa48f4fb799838e4b785968 100644 (file)
--- a/src/testdir/dumps/Test_customlist_info_popup_06.dump
+++ b/src/testdir/dumps/Test_customlist_info_popup_06.dump
@@ -1,6 +1,6 @@
 |D+0&#ffffff0|i|c|t|C|m|d| |a|p@1|l|e> @13|╔+0#0000001#e0e0e08|═@12|X| +0#0000000#ffffff0@32
-|~+0#4040ff13&| @5| +0#0000001#e0e0e08|a|p@1|l|e| @1|f| |f|r|u|i|t| @4|║| |A| |r|e|d| |f|r|u|i|t| |║| +0#4040ff13#ffffff0@32
-|~| @5| +0#0000001#ffd7ff255|b|a|n|a|n|a| |f| |f|r|u|i|t| @4|╚+0&#e0e0e08|═@12|⇲| +0#4040ff13#ffffff0@32
+|~+0#4040ff13&| @5| +0#0000001#e0e0e08|🍎*&| +&@4|f| |f|r|u|i|t| @4|║| |A| |r|e|d| |f|r|u|i|t| |║| +0#4040ff13#ffffff0@32
+|~| @5| +0#0000001#ffd7ff255|🍌*&| +&@4|f| |f|r|u|i|t| @4|╚+0&#e0e0e08|═@12|⇲| +0#4040ff13#ffffff0@32
 |~| @5| +0#0000001#ffd7ff255|c|a|r@1|o|t| |v| |v|e|g|e|t|a|b|l|e| | +0#4040ff13#ffffff0@47
 |~| @5| +0#0000001#ffd7ff255|p|l|a|i|n| @13| +0#4040ff13#ffffff0@47
 |~| @73

diff --git a/src/testdir/dumps/Test_customlist_info_popup_07.dump b/src/testdir/dumps/Test_customlist_info_popup_07.dump
index f11f3ea9f1e41f2db9e7070dcb8f8d01021614ad..a0202af08b3018b5ebacdb450c7e3032d472f54c 100644 (file)
--- a/src/testdir/dumps/Test_customlist_info_popup_07.dump
+++ b/src/testdir/dumps/Test_customlist_info_popup_07.dump
@@ -1,6 +1,6 @@
 |D+0&#ffffff0|i|c|t|C|m|d| |b|a|n|a|n|a> @60
-|~+0#4040ff13&| @5| +0#0000001#ffd7ff255|a|p@1|l|e| @1|f| |f|r|u|i|t| @4|╔+0&#e0e0e08|═@15|X| +0#4040ff13#ffffff0@29
-|~| @5| +0#0000001#e0e0e08|b|a|n|a|n|a| |f| |f|r|u|i|t| @4|║| |A| |y|e|l@1|o|w| |f|r|u|i|t| |║| +0#4040ff13#ffffff0@29
+|~+0#4040ff13&| @5| +0#0000001#ffd7ff255|🍎*&| +&@4|f| |f|r|u|i|t| @4|╔+0&#e0e0e08|═@15|X| +0#4040ff13#ffffff0@29
+|~| @5| +0#0000001#e0e0e08|🍌*&| +&@4|f| |f|r|u|i|t| @4|║| |A| |y|e|l@1|o|w| |f|r|u|i|t| |║| +0#4040ff13#ffffff0@29
 |~| @5| +0#0000001#ffd7ff255|c|a|r@1|o|t| |v| |v|e|g|e|t|a|b|l|e| |╚+0&#e0e0e08|═@15|⇲| +0#4040ff13#ffffff0@29
 |~| @5| +0#0000001#ffd7ff255|p|l|a|i|n| @13| +0#4040ff13#ffffff0@47
 |~| @73

diff --git a/src/testdir/dumps/Test_customlist_info_popup_08.dump b/src/testdir/dumps/Test_customlist_info_popup_08.dump
index adbe3b71afbedc9823ea02982c060cb4572b6c75..90f9de7f70d36adbf3792510cc9aa81ddc316c09 100644 (file)
--- a/src/testdir/dumps/Test_customlist_info_popup_08.dump
+++ b/src/testdir/dumps/Test_customlist_info_popup_08.dump
@@ -1,6 +1,6 @@
 |D+0&#ffffff0|i|c|t|C|m|d| |c|a|r@1|o|t> @60
-|~+0#4040ff13&| @5| +0#0000001#ffd7ff255|a|p@1|l|e| @1|f| |f|r|u|i|t| @4| +0#4040ff13#ffffff0@47
-|~| @5| +0#0000001#ffd7ff255|b|a|n|a|n|a| |f| |f|r|u|i|t| @4|╔+0&#e0e0e08|═@20|X| +0#4040ff13#ffffff0@24
+|~+0#4040ff13&| @5| +0#0000001#ffd7ff255|🍎*&| +&@4|f| |f|r|u|i|t| @4| +0#4040ff13#ffffff0@47
+|~| @5| +0#0000001#ffd7ff255|🍌*&| +&@4|f| |f|r|u|i|t| @4|╔+0&#e0e0e08|═@20|X| +0#4040ff13#ffffff0@24
 |~| @5| +0#0000001#e0e0e08|c|a|r@1|o|t| |v| |v|e|g|e|t|a|b|l|e| |║| |A|n| |o|r|a|n|g|e| |v|e|g|e|t|a|b|l|e| |║| +0#4040ff13#ffffff0@24
 |~| @5| +0#0000001#ffd7ff255|p|l|a|i|n| @13|╚+0&#e0e0e08|═@20|⇲| +0#4040ff13#ffffff0@24
 |~| @73

diff --git a/src/testdir/dumps/Test_customlist_info_popup_09.dump b/src/testdir/dumps/Test_customlist_info_popup_09.dump
index 236c7dcd1ec58b96e10542f9a4dafc959fcb8e11..5b048f8499e7b7270e09f4ae8ff969ab08dc2e81 100644 (file)
--- a/src/testdir/dumps/Test_customlist_info_popup_09.dump
+++ b/src/testdir/dumps/Test_customlist_info_popup_09.dump
@@ -1,6 +1,6 @@
 |D+0&#ffffff0|i|c|t|C|m|d| |p|l|a|i|n> @61
-|~+0#4040ff13&| @5| +0#0000001#ffd7ff255|a|p@1|l|e| @1|f| |f|r|u|i|t| @4| +0#4040ff13#ffffff0@47
-|~| @5| +0#0000001#ffd7ff255|b|a|n|a|n|a| |f| |f|r|u|i|t| @4| +0#4040ff13#ffffff0@47
+|~+0#4040ff13&| @5| +0#0000001#ffd7ff255|🍎*&| +&@4|f| |f|r|u|i|t| @4| +0#4040ff13#ffffff0@47
+|~| @5| +0#0000001#ffd7ff255|🍌*&| +&@4|f| |f|r|u|i|t| @4| +0#4040ff13#ffffff0@47
 |~| @5| +0#0000001#ffd7ff255|c|a|r@1|o|t| |v| |v|e|g|e|t|a|b|l|e| | +0#4040ff13#ffffff0@47
 |~| @5| +0#0000001#e0e0e08|p|l|a|i|n| @13| +0#4040ff13#ffffff0@47
 |~| @73

diff --git a/src/testdir/dumps/Test_customlist_info_popup_10.dump b/src/testdir/dumps/Test_customlist_info_popup_10.dump
index 5c07e54db1cd661a3ee3ab374cb835c40ea1d14b..67775f75a7d31f8aee5544ae26fa234ddc568a44 100644 (file)
--- a/src/testdir/dumps/Test_customlist_info_popup_10.dump
+++ b/src/testdir/dumps/Test_customlist_info_popup_10.dump
@@ -1,6 +1,6 @@
 |D+0&#ffffff0|i|c|t|C|m|d| > @66
-|~+0#4040ff13&| @5| +0#0000001#ffd7ff255|a|p@1|l|e| @1|f| |f|r|u|i|t| @4| +0#4040ff13#ffffff0@47
-|~| @5| +0#0000001#ffd7ff255|b|a|n|a|n|a| |f| |f|r|u|i|t| @4| +0#4040ff13#ffffff0@47
+|~+0#4040ff13&| @5| +0#0000001#ffd7ff255|🍎*&| +&@4|f| |f|r|u|i|t| @4| +0#4040ff13#ffffff0@47
+|~| @5| +0#0000001#ffd7ff255|🍌*&| +&@4|f| |f|r|u|i|t| @4| +0#4040ff13#ffffff0@47
 |~| @5| +0#0000001#ffd7ff255|c|a|r@1|o|t| |v| |v|e|g|e|t|a|b|l|e| | +0#4040ff13#ffffff0@47
 |~| @5| +0#0000001#ffd7ff255|p|l|a|i|n| @13| +0#4040ff13#ffffff0@47
 |~| @73

diff --git a/src/testdir/test_cmdline.vim b/src/testdir/test_cmdline.vim
index 6809ef5f78fa1fbcd981eefb8a97208bb525b773..c10cff90bd1e3235469cd2f86e8df5f6051a8707 100644 (file)
--- a/src/testdir/test_cmdline.vim
+++ b/src/testdir/test_cmdline.vim
@@ -4647,8 +4647,8 @@ func Test_customlist_dict_completion_info_popup()
   let lines =<< trim END
     func DictComp(A, L, P)
       return [
-            \ {'word': 'apple',  'kind': 'f', 'menu': 'fruit',     'info': 'A red fruit'},
-            \ {'word': 'banana', 'kind': 'f', 'menu': 'fruit',     'info': 'A yellow fruit'},
+            \ {'word': 'apple',  'kind': 'f', 'menu': 'fruit',     'info': 'A red fruit',    'abbr': '🍎'},
+            \ {'word': 'banana', 'kind': 'f', 'menu': 'fruit',     'info': 'A yellow fruit', 'abbr': '🍌'},
             \ {'word': 'carrot', 'kind': 'v', 'menu': 'vegetable', 'info': 'An orange vegetable'},
             \ 'plain',
             \ ]

diff --git a/src/version.c b/src/version.c
index 713701f9671c783a1e7c5ba762a30e888293d0a6..0103f023e2eb62673b9484d2bc105c873207a6e4 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -729,6 +729,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    454,
 /**/
     453,
 /**/