kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-12-25 13:45:15 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #23447 from neovim/backport-23445-to-release-0.9

Browse Source 
[Backport release-0.9] fix(pum): fix missing rightmost column with 'rightleft'
This commit is contained in:
zeertzjq 2023-05-03 00:06:09 +08:00 committed by GitHub
commit 4d1d9472fe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 219 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/nvim/popupmenu.c
View File

@ -435,15 +435,20 @@ void pum_redraw(void)
int col_off = 0; int col_off = 0;
bool extra_space = false; bool extra_space = false;
if (pum_rl) { if (pum_rl) {
col_off = pum_width; col_off = pum_width - 1;
if (pum_col < curwin->w_wincol + curwin->w_width - 1) { assert(!(State & MODE_CMDLINE));
int win_end_col = ui_has(kUIMultigrid) ? curwin->w_grid.cols : W_ENDCOL(curwin);
if (pum_col < win_end_col - 1) {
grid_width += 1; grid_width += 1;
extra_space = true; extra_space = true;
} }
} else if (pum_col > 0) { } else {
grid_width += 1; int min_col = (!(State & MODE_CMDLINE) && ui_has(kUIMultigrid)) ? -curwin->w_wincol : 0;
col_off = 1; if (pum_col > min_col) {
extra_space = true; grid_width += 1;
col_off = 1;
extra_space = true;
}
} }
if (pum_scrollbar > 0) { if (pum_scrollbar > 0) {
grid_width++; grid_width++;

225
test/functional/ui/popupmenu_spec.lua
View File

@ -5,6 +5,7 @@ local clear, feed = helpers.clear, helpers.feed
local source = helpers.source local source = helpers.source
local insert = helpers.insert local insert = helpers.insert
local meths = helpers.meths local meths = helpers.meths
local async_meths = helpers.async_meths
local command = helpers.command local command = helpers.command
local funcs = helpers.funcs local funcs = helpers.funcs
local eq = helpers.eq local eq = helpers.eq
@ -1978,6 +1979,54 @@ describe('builtin popupmenu', function()
{2:-- }{5:match 1 of 4} | {2:-- }{5:match 1 of 4} |
]]) ]])
end end
feed('\n<c-x><c-n>')
if multigrid then
screen:expect{grid=[[
## grid 1
[4:-----------]│[2:--------------------]|
[4:-----------]│[2:--------------------]|
[4:-----------]│[2:--------------------]|
[4:-----------]│[2:--------------------]|
[4:-----------]│[2:--------------------]|
[4:-----------]│[2:--------------------]|
{3:<Name] [+] }{4:[No Name] [+] }|
[3:--------------------------------]|
## grid 2
aaa aab aac |
bbb aaa |
c aaabcdef ccc aaa |
aaa^ |
{1:~ }|
{1:~ }|
## grid 3
{2:-- }{5:match 1 of 6} |
## grid 4
aaa aab aac|
bbb aaa |
c aaabcdef |
ccc aaa |
aaa |
{1:~ }|
## grid 5
{s: aaa }{c: }|
{n: aab }{s: }|
{n: aac }{s: }|
]], float_pos={
[5] = {{id = -1}, "NW", 2, 4, -1, false, 100};
}}
else
screen:expect([[
aaa aab aac│aaa aab aac |
bbb aaa │bbb aaa |
c aaabcdef │c aaabcdef ccc aaa |
ccc aaa │aaa^ |
aaa {s: aaa }{c: }{1: }|
{1:~ }{n: aab }{s: }{1: }|
{3:<Name] [+] }{n: aac }{s: }{4: }|
{2:-- }{5:match 1 of 6} |
]])
end
end) end)
if not multigrid then if not multigrid then
@ -2488,10 +2537,10 @@ describe('builtin popupmenu', function()
funcs.complete(16, {'word', 'choice', 'text', 'thing'}) funcs.complete(16, {'word', 'choice', 'text', 'thing'})
screen:expect([[ screen:expect([[
^ tfelthgir emos| ^ tfelthgir emos|
{1: }{n: drow}{1: ~}| {1: }{n: drow }{1: ~}|
{1: }{n: eciohc}{1: ~}| {1: }{n: eciohc }{1: ~}|
{1: }{n: txet}{1: ~}| {1: }{n: txet }{1: ~}|
{1: }{n: gniht}{1: ~}| {1: }{n: gniht }{1: ~}|
{1: ~}| {1: ~}|
{1: ~}| {1: ~}|
{1: ~}| {1: ~}|
@ -2512,10 +2561,10 @@ describe('builtin popupmenu', function()
feed('<c-n>') feed('<c-n>')
screen:expect([[ screen:expect([[
^ drow tfelthgir emos| ^ drow tfelthgir emos|
{1: }{s: drow}{1: ~}| {1: }{s: drow }{1: ~}|
{1: }{n: eciohc}{1: ~}| {1: }{n: eciohc }{1: ~}|
{1: }{n: txet}{1: ~}| {1: }{n: txet }{1: ~}|
{1: }{n: gniht}{1: ~}| {1: }{n: gniht }{1: ~}|
{1: ~}| {1: ~}|
{1: ~}| {1: ~}|
{1: ~}| {1: ~}|
@ -2643,25 +2692,167 @@ describe('builtin popupmenu', function()
{1: ~}| {1: ~}|
{1: ~}| {1: ~}|
## grid 5 ## grid 5
{n: drow}| {n: drow }|
{n: eciohc}| {n: eciohc }|
{n: txet}| {n: txet }|
{n: gniht}| {n: gniht }|
]], float_pos={ ]], float_pos={
[5] = {{id = -1}, "NW", 4, 1, -11, false, 100}; [5] = {{id = -1}, "NW", 4, 1, -10, false, 100};
}} }}
else else
screen:expect([[ screen:expect([[
tfelthgir emos│ ^ tfelthgir emos| tfelthgir emos│ ^ tfelthgir emos|
{1: }{n: drow}{1: ~}| {1: }{n: drow }{1: ~}|
{1: }{n: eciohc}{1: ~}| {1: }{n: eciohc }{1: ~}|
{1: }{n: txet}{1: ~}| {1: }{n: txet }{1: ~}|
{1: }{n: gniht}{1: ~}| {1: }{n: gniht }{1: ~}|
{1: ~}│{1: ~}| {1: ~}│{1: ~}|
{3:[No Name] [+] }{4:[No Name] [+] }| {3:[No Name] [+] }{4:[No Name] [+] }|
{2:-- INSERT --} | {2:-- INSERT --} |
]]) ]])
end end
feed('<C-E><CR>')
funcs.complete(1, {'word', 'choice', 'text', 'thing'})
if multigrid then
screen:expect{grid=[[
## grid 1
[2:-------------------]│[4:--------------------]|
[2:-------------------]│[4:--------------------]|
[2:-------------------]│[4:--------------------]|
[2:-------------------]│[4:--------------------]|
[2:-------------------]│[4:--------------------]|
[2:-------------------]│[4:--------------------]|
{3:[No Name] [+] }{4:[No Name] [+] }|
[3:----------------------------------------]|
## grid 2
tfelthgir emos|
|
{1: ~}|
{1: ~}|
{1: ~}|
{1: ~}|
## grid 3
{2:-- INSERT --} |
## grid 4
tfelthgir emos|
^ |
{1: ~}|
{1: ~}|
{1: ~}|
{1: ~}|
## grid 5
{n: drow}|
{n: eciohc}|
{n: txet}|
{n: gniht}|
]], float_pos={
[5] = {{id = -1}, "NW", 4, 2, 5, false, 100};
}}
else
screen:expect([[
tfelthgir emos│ tfelthgir emos|
│ ^ |
{1: ~}│{1: }{n: drow}|
{1: ~}│{1: }{n: eciohc}|
{1: ~}│{1: }{n: txet}|
{1: ~}│{1: }{n: gniht}|
{3:[No Name] [+] }{4:[No Name] [+] }|
{2:-- INSERT --} |
]])
end
feed('<C-E>')
async_meths.call_function('input', {'', '', 'sign'})
if multigrid then
screen:expect{grid=[[
## grid 1
[2:-------------------]│[4:--------------------]|
[2:-------------------]│[4:--------------------]|
[2:-------------------]│[4:--------------------]|
[2:-------------------]│[4:--------------------]|
[2:-------------------]│[4:--------------------]|
[2:-------------------]│[4:--------------------]|
{3:[No Name] [+] }{4:[No Name] [+] }|
[3:----------------------------------------]|
## grid 2
tfelthgir emos|
|
{1: ~}|
{1: ~}|
{1: ~}|
{1: ~}|
## grid 3
^ |
## grid 4
tfelthgir emos|
|
{1: ~}|
{1: ~}|
{1: ~}|
{1: ~}|
]]}
else
screen:expect([[
tfelthgir emos│ tfelthgir emos|
│ |
{1: ~}│{1: ~}|
{1: ~}│{1: ~}|
{1: ~}│{1: ~}|
{1: ~}│{1: ~}|
{3:[No Name] [+] }{4:[No Name] [+] }|
^ |
]])
end
command('set wildoptions+=pum')
feed('<Tab>')
if multigrid then
screen:expect{grid=[[
## grid 1
[2:-------------------]│[4:--------------------]|
[2:-------------------]│[4:--------------------]|
[2:-------------------]│[4:--------------------]|
[2:-------------------]│[4:--------------------]|
[2:-------------------]│[4:--------------------]|
[2:-------------------]│[4:--------------------]|
{3:[No Name] [+] }{4:[No Name] [+] }|
[3:----------------------------------------]|
## grid 2
tfelthgir emos|
|
{1: ~}|
{1: ~}|
{1: ~}|
{1: ~}|
## grid 3
define^ |
## grid 4
tfelthgir emos|
|
{1: ~}|
{1: ~}|
{1: ~}|
{1: ~}|
## grid 5
{s:define }|
{n:jump }|
{n:list }|
{n:place }|
{n:undefine }|
{n:unplace }|
]], float_pos={
[5] = {{id = -1}, "SW", 1, 7, 0, false, 250};
}}
else
screen:expect([[
tfelthgir emos│ tfelthgir emos|
{s:define } │ |
{n:jump }{1: ~}│{1: ~}|
{n:list }{1: ~}│{1: ~}|
{n:place }{1: ~}│{1: ~}|
{n:undefine }{1: ~}│{1: ~}|
{n:unplace }{3: }{4:[No Name] [+] }|
define^ |
]])
end
end) end)
if not multigrid then if not multigrid then