fix(ui2): don't adjust dialog pos for pum wildmenu (#37695)

Problem:  Dialog position unnecessarily adjusted for pum wildmenu.
Solution: Apply no offset if the pum is visible.
This commit is contained in:
Sean Dewar
2026-02-04 12:15:34 +00:00
committed by GitHub
parent ddd1bf757f
commit 9655bd560f
2 changed files with 22 additions and 3 deletions

View File

@@ -8,7 +8,7 @@ local M = {
srow = 0, -- Buffer row at which the current cmdline starts; > 0 in block mode.
erow = 0, -- Buffer row at which the current cmdline ends; messages appended here in block mode.
level = -1, -- Current cmdline level; 0 when inactive, -1 one loop iteration after closing.
wmnumode = 0, -- Return value of wildmenumode(), dialog position adjusted when toggled.
wmnumode = 0, -- wildmenumode() when not using the pum, dialog position adjusted when toggled.
}
--- Set the 'cmdheight' and cmdline window height. Reposition message windows.
@@ -29,7 +29,7 @@ local function win_config(win, hide, height)
vim.o.cmdheight = height
end)
ext.msg.set_pos()
elseif M.wmnumode ~= (M.prompt and fn.wildmenumode() or 0) then
elseif M.wmnumode ~= (M.prompt and fn.pumvisible() == 0 and fn.wildmenumode() or 0) then
M.wmnumode = (M.wmnumode == 1 and 0 or 1)
ext.msg.set_pos()
end

View File

@@ -182,7 +182,7 @@ describe('cmdline2', function()
]])
end)
it('dialog position is adjusted for toggled wildmenu', function()
it('dialog position is adjusted for toggled non-pum wildmenu', function()
exec([[
set wildmode=list:full,full wildoptions-=pum
func Foo()
@@ -218,6 +218,25 @@ describe('cmdline2', function()
|
{16::}{15:call} {25:Foo}{16:()()}^ |
]])
exec('set wildoptions+=pum laststatus=2')
feed('<C-U>call Fo<C-Z><C-Z>')
screen:expect([[
|
{1:~ }|*9
{3: }|
Foo(){12: Foo() } |
{4: Fooo() } |
{16::}{15:call} {25:Foo}{16:()}^ |
]])
feed('()')
screen:expect([[
|
{1:~ }|*9
{3: }|
Foo() Fooo() |
|
{16::}{15:call} {25:Foo}{16:()()}^ |
]])
end)
end)