IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix(pum): make :popup position correctly with float border

Browse Source
This commit is contained in:
zeertzjq 2023-04-27 23:40:39 +08:00
parent f65043154e
commit fbaa278773
2 changed files with 129 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/nvim/popupmenu.c
View File

@ -1169,8 +1169,15 @@ void pum_make_popup(const char *path_name, int use_mouse_pos)
if (!use_mouse_pos) { if (!use_mouse_pos) {
// Hack: set mouse position at the cursor so that the menu pops up // Hack: set mouse position at the cursor so that the menu pops up
// around there. // around there.
mouse_row = curwin->w_winrow + curwin->w_wrow; mouse_row = curwin->w_grid.row_offset + curwin->w_wrow;
mouse_col = curwin->w_wincol + curwin->w_wcol; mouse_col = curwin->w_grid.col_offset + curwin->w_wcol;
if (ui_has(kUIMultigrid)) {
mouse_grid = curwin->w_grid.target->handle;
} else if (curwin->w_grid.target != &default_grid) {
mouse_grid = 0;
mouse_row += curwin->w_winrow;
mouse_col += curwin->w_wincol;
}
} }
vimmenu_T *menu = menu_find(path_name); vimmenu_T *menu = menu_find(path_name);

123
test/functional/ui/float_spec.lua
View File

@ -9,6 +9,7 @@ local eval = helpers.eval
local eq = helpers.eq local eq = helpers.eq
local neq = helpers.neq local neq = helpers.neq
local expect = helpers.expect local expect = helpers.expect
local exec = helpers.exec
local exec_lua = helpers.exec_lua local exec_lua = helpers.exec_lua
local insert = helpers.insert local insert = helpers.insert
local meths = helpers.meths local meths = helpers.meths
@ -2123,7 +2124,7 @@ describe('float window', function()
{5:║}{1:^ }{5:║}| {5:║}{1:^ }{5:║}|
{5:╚═════════╝}| {5:╚═════════╝}|
]], float_pos={ ]], float_pos={
[5] = { { id = 1002 }, "NW", 1, 0, 5, true } [5] = { { id = 1002 }, "NW", 1, 0, 5, true };
}, win_viewport={ }, win_viewport={
[2] = {win = {id = 1000}, topline = 0, botline = 2, curline = 0, curcol = 0, linecount = 1, sum_scroll_delta = 0}; [2] = {win = {id = 1000}, topline = 0, botline = 2, curline = 0, curcol = 0, linecount = 1, sum_scroll_delta = 0};
[5] = {win = {id = 1002}, topline = 0, botline = 3, curline = 2, curcol = 0, linecount = 3, sum_scroll_delta = 0}; [5] = {win = {id = 1002}, topline = 0, botline = 3, curline = 2, curcol = 0, linecount = 3, sum_scroll_delta = 0};
@ -2181,8 +2182,8 @@ describe('float window', function()
{1: abb }| {1: abb }|
{13: acc }| {13: acc }|
]], float_pos={ ]], float_pos={
[5] = { { id = 1002 }, "NW", 1, 0, 5, true, 50 }, [5] = { { id = 1002 }, "NW", 1, 0, 5, true, 50 };
[6] = { { id = -1 }, "NW", 5, 4, 0, false, 100 } [6] = { { id = -1 }, "NW", 5, 4, 0, false, 100 };
}, win_viewport={ }, win_viewport={
[2] = {win = {id = 1000}, topline = 0, botline = 2, curline = 0, curcol = 0, linecount=1, sum_scroll_delta = 0}; [2] = {win = {id = 1000}, topline = 0, botline = 2, curline = 0, curcol = 0, linecount=1, sum_scroll_delta = 0};
[5] = {win = {id = 1002}, topline = 0, botline = 3, curline = 2, curcol = 3, linecount=3, sum_scroll_delta = 0}; [5] = {win = {id = 1002}, topline = 0, botline = 3, curline = 2, curcol = 3, linecount=3, sum_scroll_delta = 0};
@ -2201,6 +2202,122 @@ describe('float window', function()
{3:-- }{8:match 1 of 4} | {3:-- }{8:match 1 of 4} |
]]} ]]}
end end
feed '<esc>'
if multigrid then
screen:expect{grid=[[
## grid 1
[2:----------------------------------------]|
[2:----------------------------------------]|
[2:----------------------------------------]|
[2:----------------------------------------]|
[2:----------------------------------------]|
[2:----------------------------------------]|
[2:----------------------------------------]|
[2:----------------------------------------]|
[2:----------------------------------------]|
[3:----------------------------------------]|
## grid 2
|
{0:~ }|
{0:~ }|
{0:~ }|
{0:~ }|
{0:~ }|
{0:~ }|
{0:~ }|
{0:~ }|
## grid 3
|
## grid 5
{5:╔═════════╗}|
{5:║}{1:aaa aab }{5:║}|
{5:║}{1:abb acc }{5:║}|
{5:║}{1:ac^c }{5:║}|
{5:╚═════════╝}|
]], float_pos={
[5] = { { id = 1002 }, "NW", 1, 0, 5, true };
}, win_viewport={
[2] = {win = {id = 1000}, topline = 0, botline = 2, curline = 0, curcol = 0, linecount = 1, sum_scroll_delta = 0};
[5] = {win = {id = 1002}, topline = 0, botline = 3, curline = 2, curcol = 2, linecount = 3, sum_scroll_delta = 0};
}}
else
screen:expect{grid=[[
{5:╔═════════╗} |
{0:~ }{5:║}{1:aaa aab }{5:║}{0: }|
{0:~ }{5:║}{1:abb acc }{5:║}{0: }|
{0:~ }{5:║}{1:ac^c }{5:║}{0: }|
{0:~ }{5:╚═════════╝}{0: }|
{0:~ }|
{0:~ }|
{0:~ }|
{0:~ }|
|
]]}
end
exec([[
nnoremenu Test.foo :
nnoremenu Test.bar :
nnoremenu Test.baz :
]])
feed ':popup Test<CR>'
if multigrid then
screen:expect{grid=[[
## grid 1
[2:----------------------------------------]|
[2:----------------------------------------]|
[2:----------------------------------------]|
[2:----------------------------------------]|
[2:----------------------------------------]|
[2:----------------------------------------]|
[2:----------------------------------------]|
[2:----------------------------------------]|
[2:----------------------------------------]|
[3:----------------------------------------]|
## grid 2
|
{0:~ }|
{0:~ }|
{0:~ }|
{0:~ }|
{0:~ }|
{0:~ }|
{0:~ }|
{0:~ }|
## grid 3
:popup Test |
## grid 5
{5:╔═════════╗}|
{5:║}{1:aaa aab }{5:║}|
{5:║}{1:abb acc }{5:║}|
{5:║}{1:ac^c }{5:║}|
{5:╚═════════╝}|
## grid 6
{1: foo }|
{1: bar }|
{1: baz }|
]], float_pos={
[5] = { { id = 1002 }, "NW", 1, 0, 5, true };
[6] = { { id = -1 }, "NW", 5, 4, 2, false, 250 };
}, win_viewport={
[2] = {win = {id = 1000}, topline = 0, botline = 2, curline = 0, curcol = 0, linecount = 1, sum_scroll_delta = 0};
[5] = {win = {id = 1002}, topline = 0, botline = 3, curline = 2, curcol = 2, linecount = 3, sum_scroll_delta = 0};
}}
else
screen:expect{grid=[[
{5:╔═════════╗} |
{0:~ }{5:║}{1:aaa aab }{5:║}{0: }|
{0:~ }{5:║}{1:abb acc }{5:║}{0: }|
{0:~ }{5:║}{1:ac^c }{5:║}{0: }|
{0:~ }{5:╚═}{1: foo }{5:═══╝}{0: }|
{0:~ }{1: bar }{0: }|
{0:~ }{1: baz }{0: }|
{0:~ }|
{0:~ }|
:popup Test |
]]}
end
end) end)
it('show ruler of current floating window', function() it('show ruler of current floating window', function()