forked from aniani/vim
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>
This commit is contained in:
committed by
Christian Brabandt
parent
2982299699
commit
a6d9e3c4e0
@@ -810,7 +810,7 @@ pum_redraw(void)
|
|||||||
if (j == 2
|
if (j == 2
|
||||||
|| (next_isempty && (j == 1 || (j == 0
|
|| (next_isempty && (j == 1 || (j == 0
|
||||||
&& pum_get_item(idx, order[j + 2]) == NULL)))
|
&& pum_get_item(idx, order[j + 2]) == NULL)))
|
||||||
|| pum_base_width + n >= pum_width)
|
|| basic_width + n >= pum_width)
|
||||||
break;
|
break;
|
||||||
#ifdef FEAT_RIGHTLEFT
|
#ifdef FEAT_RIGHTLEFT
|
||||||
if (pum_rl)
|
if (pum_rl)
|
||||||
|
20
src/testdir/dumps/Test_pum_completeitemalign_07.dump
Normal file
20
src/testdir/dumps/Test_pum_completeitemalign_07.dump
Normal file
@@ -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
|
@@ -1595,6 +1595,17 @@ func Test_pum_completeitemalign()
|
|||||||
\ { 'word': '你好', 'kind': 'C', 'menu': '中文' },
|
\ { 'word': '你好', 'kind': 'C', 'menu': '中文' },
|
||||||
\]}
|
\]}
|
||||||
endfunc
|
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
|
set omnifunc=Omni_test
|
||||||
command! -nargs=0 T1 set cia=abbr,kind,menu
|
command! -nargs=0 T1 set cia=abbr,kind,menu
|
||||||
command! -nargs=0 T2 set cia=abbr,menu,kind
|
command! -nargs=0 T2 set cia=abbr,menu,kind
|
||||||
@@ -1636,8 +1647,11 @@ func Test_pum_completeitemalign()
|
|||||||
" T6
|
" T6
|
||||||
call term_sendkeys(buf, ":T6\<CR>S\<C-X>\<C-O>")
|
call term_sendkeys(buf, ":T6\<CR>S\<C-X>\<C-O>")
|
||||||
call VerifyScreenDump(buf, 'Test_pum_completeitemalign_06', {})
|
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)
|
call StopVimInTerminal(buf)
|
||||||
endfunc
|
endfunc
|
||||||
|
|
||||||
|
@@ -704,6 +704,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
756,
|
||||||
/**/
|
/**/
|
||||||
755,
|
755,
|
||||||
/**/
|
/**/
|
||||||
|
Reference in New Issue
Block a user