From 68cc2b8a37197872e737fb61244069e13b7227a2 Mon Sep 17 00:00:00 2001 From: rbtnn Date: Wed, 9 Feb 2022 11:55:47 +0000 Subject: patch 8.2.4334: command line popup menu not positioned correctly Problem: Command line popup menu not positioned correctly. Solution: Also use vim_strsize() on the existing text. (Naruhiko Nishino, closes #9727) --- src/cmdexpand.c | 2 +- src/testdir/dumps/Test_wildmenu_pum_32.dump | 10 ++++++++++ src/testdir/test_cmdline.vim | 11 +++++++++++ src/version.c | 2 ++ 4 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 src/testdir/dumps/Test_wildmenu_pum_32.dump (limited to 'src') diff --git a/src/cmdexpand.c b/src/cmdexpand.c index b37c4f9acb..2463ed53e3 100644 --- a/src/cmdexpand.c +++ b/src/cmdexpand.c @@ -622,7 +622,7 @@ showmatches(expand_T *xp, int wildmenu UNUSED) compl_match_array[i].pum_extra = NULL; compl_match_array[i].pum_kind = NULL; } - compl_startcol = ccline->cmdpos + 1; + compl_startcol = vim_strsize(ccline->cmdbuff) + 1; columns = vim_strsize(xp->xp_pattern); if (showtail) { diff --git a/src/testdir/dumps/Test_wildmenu_pum_32.dump b/src/testdir/dumps/Test_wildmenu_pum_32.dump new file mode 100644 index 0000000000..a8a0dfe5ca --- /dev/null +++ b/src/testdir/dumps/Test_wildmenu_pum_32.dump @@ -0,0 +1,10 @@ +| +0&#ffffff0@74 +|~+0#4040ff13&| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @12| +0#0000001#e0e0e08|1|2|3| @11| +0#4040ff13#ffffff0@44 +|~| @12| +0#0000001#ffd7ff255|a|b|c| @11| +0#4040ff13#ffffff0@44 +|~| @12| +0#0000001#ffd7ff255|x|y|z| @11| +0#4040ff13#ffffff0@44 +|:+0#0000000&|e| |X|d|i|r|/|あ*&|い|う|/+&|1|2|3> @56 diff --git a/src/testdir/test_cmdline.vim b/src/testdir/test_cmdline.vim index 175647dd17..c40d653d3c 100644 --- a/src/testdir/test_cmdline.vim +++ b/src/testdir/test_cmdline.vim @@ -2141,6 +2141,17 @@ func Test_wildmenu_pum() call TermWait(buf) call VerifyScreenDump(buf, 'Test_wildmenu_pum_31', {}) + " Tests a directory name contained full-width characters. + call mkdir('Xdir/あいう', 'p') + call writefile([], 'Xdir/あいう/abc') + call writefile([], 'Xdir/あいう/xyz') + call writefile([], 'Xdir/あいう/123') + + call term_sendkeys(buf, "\set wildmode&\") + call term_sendkeys(buf, ":\e Xdir/あいう/\") + call TermWait(buf) + call VerifyScreenDump(buf, 'Test_wildmenu_pum_32', {}) + call term_sendkeys(buf, "\\") call StopVimInTerminal(buf) call delete('Xtest') diff --git a/src/version.c b/src/version.c index a4480e1866..9ef520ebcb 100644 --- a/src/version.c +++ b/src/version.c @@ -746,6 +746,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 4334, /**/ 4333, /**/ -- cgit v1.2.3