patch 9.1.0941: ComplMatchIns doesn't work after multibyte chars
Problem: ComplMatchIns doesn't work after multibyte chars
(after v9.1.0936)
Solution: Use (ptr - line) instead of wlv.col (zeertzjq).
closes: #16233
Signed-off-by: zeertzjq <zeertzjq@outlook.com>
Signed-off-by: glepnir <glephunter@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
diff --git a/src/testdir/dumps/Test_pum_matchins_01.dump b/src/testdir/dumps/Test_pum_matchins_01.dump
index efaa1eb..9eb47ac 100644
--- a/src/testdir/dumps/Test_pum_matchins_01.dump
+++ b/src/testdir/dumps/Test_pum_matchins_01.dump
@@ -1,7 +1,7 @@
-|f+0#ff404010#ffffff0|o@1> +0#0000000&@71
-|f+0#0000001#e0e0e08|o@1| @11| +0#4040ff13#ffffff0@59
-|b+0#0000001#ffd7ff255|a|r| @11| +0#4040ff13#ffffff0@59
-|你*0#0000001#ffd7ff255|好| +&@10| +0#4040ff13#ffffff0@59
+|α+0&#ffffff0|β|γ| |f+0#ff404010&|o@1> +0#0000000&@67
+|~+0#4040ff13&| @1| +0#0000001#e0e0e08|f|o@1| @11| +0#4040ff13#ffffff0@55
+|~| @1| +0#0000001#ffd7ff255|b|a|r| @11| +0#4040ff13#ffffff0@55
+|~| @1| +0#0000001#ffd7ff255|你*&|好| +&@10| +0#4040ff13#ffffff0@55
|~| @73
|~| @73
|~| @73
diff --git a/src/testdir/dumps/Test_pum_matchins_02.dump b/src/testdir/dumps/Test_pum_matchins_02.dump
index a3d9be3..a9e7258 100644
--- a/src/testdir/dumps/Test_pum_matchins_02.dump
+++ b/src/testdir/dumps/Test_pum_matchins_02.dump
@@ -1,7 +1,7 @@
-|b+0#ff404010#ffffff0|a|r> +0#0000000&@71
-|f+0#0000001#ffd7ff255|o@1| @11| +0#4040ff13#ffffff0@59
-|b+0#0000001#e0e0e08|a|r| @11| +0#4040ff13#ffffff0@59
-|你*0#0000001#ffd7ff255|好| +&@10| +0#4040ff13#ffffff0@59
+|α+0&#ffffff0|β|γ| |b+0#ff404010&|a|r> +0#0000000&@67
+|~+0#4040ff13&| @1| +0#0000001#ffd7ff255|f|o@1| @11| +0#4040ff13#ffffff0@55
+|~| @1| +0#0000001#e0e0e08|b|a|r| @11| +0#4040ff13#ffffff0@55
+|~| @1| +0#0000001#ffd7ff255|你*&|好| +&@10| +0#4040ff13#ffffff0@55
|~| @73
|~| @73
|~| @73
diff --git a/src/testdir/dumps/Test_pum_matchins_03.dump b/src/testdir/dumps/Test_pum_matchins_03.dump
index d1686b7..b8aaffe 100644
--- a/src/testdir/dumps/Test_pum_matchins_03.dump
+++ b/src/testdir/dumps/Test_pum_matchins_03.dump
@@ -1,7 +1,7 @@
-|你*0#ff404010#ffffff0|好> +0#0000000&@70
-|f+0#0000001#ffd7ff255|o@1| @11| +0#4040ff13#ffffff0@59
-|b+0#0000001#ffd7ff255|a|r| @11| +0#4040ff13#ffffff0@59
-|你*0#0000001#e0e0e08|好| +&@10| +0#4040ff13#ffffff0@59
+|α+0&#ffffff0|β|γ| |你*0#ff404010&|好> +0#0000000&@66
+|~+0#4040ff13&| @1| +0#0000001#ffd7ff255|f|o@1| @11| +0#4040ff13#ffffff0@55
+|~| @1| +0#0000001#ffd7ff255|b|a|r| @11| +0#4040ff13#ffffff0@55
+|~| @1| +0#0000001#e0e0e08|你*&|好| +&@10| +0#4040ff13#ffffff0@55
|~| @73
|~| @73
|~| @73
diff --git a/src/testdir/dumps/Test_pum_matchins_04.dump b/src/testdir/dumps/Test_pum_matchins_04.dump
index 0a324ef..ced268e 100644
--- a/src/testdir/dumps/Test_pum_matchins_04.dump
+++ b/src/testdir/dumps/Test_pum_matchins_04.dump
@@ -1,4 +1,4 @@
-|f+0&#ffffff0|o@1> @71
+|α+0&#ffffff0|β|γ| |f|o@1> @67
|~+0#4040ff13&| @73
|~| @73
|~| @73
@@ -17,4 +17,4 @@
|~| @73
|~| @73
|~| @73
-|-+2#0000000&@1| |I|N|S|E|R|T| |-@1| +0&&@44|1|,|4| @10|A|l@1|
+|-+2#0000000&@1| |I|N|S|E|R|T| |-@1| +0&&@44|1|,|1@1|-|8| @7|A|l@1|
diff --git a/src/testdir/dumps/Test_pum_matchins_05.dump b/src/testdir/dumps/Test_pum_matchins_05.dump
index a799fcd..af49de2 100644
--- a/src/testdir/dumps/Test_pum_matchins_05.dump
+++ b/src/testdir/dumps/Test_pum_matchins_05.dump
@@ -1,4 +1,4 @@
-|f+0&#ffffff0|o@1| > @70
+|α+0&#ffffff0|β|γ| |f|o@1| > @66
|~+0#4040ff13&| @73
|~| @73
|~| @73
@@ -17,4 +17,4 @@
|~| @73
|~| @73
|~| @73
-|-+2#0000000&@1| |I|N|S|E|R|T| |-@1| +0&&@44|1|,|5| @10|A|l@1|
+|-+2#0000000&@1| |I|N|S|E|R|T| |-@1| +0&&@44|1|,|1|2|-|9| @7|A|l@1|
diff --git a/src/testdir/test_popup.vim b/src/testdir/test_popup.vim
index bd36957..95ce561 100644
--- a/src/testdir/test_popup.vim
+++ b/src/testdir/test_popup.vim
@@ -1728,29 +1728,29 @@
let buf = RunVimInTerminal('-S Xscript', {})
call TermWait(buf)
- call term_sendkeys(buf, "S\<C-X>\<C-O>")
+ call term_sendkeys(buf, "Sαβγ \<C-X>\<C-O>")
call VerifyScreenDump(buf, 'Test_pum_matchins_01', {})
call term_sendkeys(buf, "\<C-E>\<Esc>")
call TermWait(buf)
- call term_sendkeys(buf, "S\<C-X>\<C-O>\<C-N>")
+ call term_sendkeys(buf, "Sαβγ \<C-X>\<C-O>\<C-N>")
call VerifyScreenDump(buf, 'Test_pum_matchins_02', {})
call term_sendkeys(buf, "\<C-E>\<Esc>")
call TermWait(buf)
- call term_sendkeys(buf, "S\<C-X>\<C-O>\<C-N>\<C-N>")
+ call term_sendkeys(buf, "Sαβγ \<C-X>\<C-O>\<C-N>\<C-N>")
call VerifyScreenDump(buf, 'Test_pum_matchins_03', {})
call term_sendkeys(buf, "\<C-E>\<Esc>")
" restore after accept
call TermWait(buf)
- call term_sendkeys(buf, "S\<C-X>\<C-O>\<C-Y>")
+ call term_sendkeys(buf, "Sαβγ \<C-X>\<C-O>\<C-Y>")
call VerifyScreenDump(buf, 'Test_pum_matchins_04', {})
call term_sendkeys(buf, "\<C-E>\<Esc>")
" restore after cancel completion
call TermWait(buf)
- call term_sendkeys(buf, "S\<C-X>\<C-O>\<Space>")
+ call term_sendkeys(buf, "Sαβγ \<C-X>\<C-O>\<Space>")
call VerifyScreenDump(buf, 'Test_pum_matchins_05', {})
call term_sendkeys(buf, "\<C-E>\<Esc>")