PublicArchive/neovim
2
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2026-05-06 16:29:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix(pum): crash with 'pumborder' and wide item (#38852)

Browse Source 
Problem: pum_col goes negative when item width + border exceeds screen.

Solution: account for border_width in pum_compute_horizontal_placement()
instead of adjusting pum_col after the fact

(cherry picked from commit 8603fc9180)
This commit is contained in:
glepnir
2026-04-08 09:16:41 +08:00
committed by github-actions[bot]
parent eee2d10fd2
commit ca0e3818c0
2 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/nvim/popupmenu.c
+8 -12
View File
@@ -220,16 +220,16 @@ static bool set_pum_width_aligned_with_cursor(int width, int available_width)
/// Calculate horizontal placement for popup menu. Sets pum_col and pum_width
/// based on cursor position and available space.
static void pum_compute_horizontal_placement(win_T *target_win, int cursor_col)
static void pum_compute_horizontal_placement(win_T *target_win, int cursor_col, int border_width)
{
int max_col = MAX(Columns, target_win ? (target_win->w_wincol + target_win->w_view_width) : 0);
int desired_width = pum_base_width + pum_kind_width + pum_extra_width;
int available_width;
if (pum_rl) {
available_width = cursor_col - pum_scrollbar + 1;
available_width = cursor_col - pum_scrollbar + 1 - border_width;
} else {
available_width = max_col - cursor_col - pum_scrollbar;
available_width = max_col - cursor_col - pum_scrollbar - border_width;
}
// Align pum with "cursor_col"
@@ -246,7 +246,7 @@ static void pum_compute_horizontal_placement(win_T *target_win, int cursor_col)
// Truncated pum is no longer aligned with "cursor_col"
if (pum_rl) {
available_width = max_col - pum_scrollbar;
available_width = max_col - pum_scrollbar - border_width;
} else {
available_width += cursor_col;
}
@@ -254,9 +254,9 @@ static void pum_compute_horizontal_placement(win_T *target_win, int cursor_col)
if (available_width > p_pw) {
pum_width = (int)p_pw + 1; // Truncate beyond 'pum_width'
if (pum_rl) {
pum_col = pum_width + pum_scrollbar;
pum_col = pum_width + pum_scrollbar + border_width;
} else {
pum_col = max_col - pum_width - pum_scrollbar;
pum_col = max_col - pum_width - pum_scrollbar - border_width;
}
return;
}
@@ -267,7 +267,7 @@ static void pum_compute_horizontal_placement(win_T *target_win, int cursor_col)
} else {
pum_col = 0;
}
pum_width = max_col - pum_scrollbar;
pum_width = max_col - pum_scrollbar - border_width;
}
static inline int pum_border_width(void)
@@ -416,11 +416,7 @@ void pum_display(pumitem_T *array, int size, int selected, bool array_changed, i
pum_scrollbar = (pum_height < size) ? 1 : 0;
// Figure out the horizontal size and position of the pum.
pum_compute_horizontal_placement(target_win, cursor_col);
if (pum_col + border_width + pum_width > Columns) {
pum_col -= border_width;
}
pum_compute_horizontal_placement(target_win, cursor_col, border_width);
// Set selected item and redraw. If the window size changed need to redo
// the positioning. Limit this to two times, when there is not much
test/functional/ui/popupmenu_spec.lua
+8
View File
@@ -9241,6 +9241,14 @@ describe('builtin popupmenu', function()
]])
end
end)
it('no crash with wide item and border #38840', function()
exec([[
set cot+=menuone
let g:list = [#{word: repeat('a', &columns - 2)}]
]])
feed('S<C-x><C-o>')
assert_alive()
end)
end)
it("'pumborder' on mouse-menu displays completely within screen", function()
screen:try_resize(40, 12)