[vim/vim] Rewrite popup menu positioning logic and fix bugs (PR #18441)
girish
Refactor
- Simplified and rewrote horizontal positioning logic (was overly complex).
- Split horizontal and vertical positioning into separate functions.
Bug fixes
- Fixed missing truncation marker (e.g.
>) when items were truncated andpummaxwidthwas not set. - Fixed occasional extra space being added to menu items.
You can view, comment on, or merge this pull request online at:
https://github.com/vim/vim/pull/18441
Commit Summary
- 3e13bcb Fix & Refactor: Popupmenu positioning
- b6ff7e1 Fix test failures
- 07e7dae refactor
- 43b7edf Merge branch 'vim:master' into refactor
- 8a388d0 Merge branch 'vim:master' into refactor
File Changes
(22 files)
- M src/popupmenu.c (411)
- M src/testdir/dumps/Test_long_line_noselect_1.dump (2)
- M src/testdir/dumps/Test_long_line_noselect_2.dump (2)
- M src/testdir/dumps/Test_long_line_noselect_3.dump (2)
- M src/testdir/dumps/Test_mouse_popup_position_01.dump (2)
- M src/testdir/dumps/Test_mouse_popup_position_02.dump (2)
- M src/testdir/dumps/Test_popup_position_02.dump (4)
- M src/testdir/dumps/Test_popup_position_03.dump (4)
- M src/testdir/dumps/Test_popup_position_04.dump (4)
- M src/testdir/dumps/Test_popupwin_infopopup_6.dump (10)
- M src/testdir/dumps/Test_popupwin_infopopup_7.dump (10)
- M src/testdir/dumps/Test_popupwin_infopopup_8.dump (6)
- M src/testdir/dumps/Test_popupwin_infopopup_9.dump (6)
- M src/testdir/dumps/Test_popupwin_infopopup_wide_1.dump (6)
- M src/testdir/dumps/Test_pum_completeitemalign_07.dump (4)
- M src/testdir/dumps/Test_pum_maxwidth_07.dump (2)
- M src/testdir/dumps/Test_pum_maxwidth_08.dump (2)
- M src/testdir/dumps/Test_pum_maxwidth_21.dump (2)
- M src/testdir/dumps/Test_pum_maxwidth_22.dump (2)
- M src/testdir/dumps/Test_pum_rightleft_01.dump (2)
- M src/testdir/dumps/Test_wildmenu_pum_odd_wildchar_1.dump (18)
- M src/testdir/dumps/Test_wildmenu_pum_odd_wildchar_2.dump (18)
Patch Links:
—
Reply to this email directly, view it on GitHub.
You are receiving this because you are subscribed to this thread.
zeertzjq
@zeertzjq commented on this pull request.
In src/popupmenu.c:
> + {
+ width = p_pw;
+ end_padding = FALSE;
+ }
+ if (p_pmw > 0 && width > p_pmw)
+ {
+ width = p_pmw;
+ end_padding = FALSE;
+ }
+
+ pum_width = width + (end_padding && width >= p_pw ? 1 : 0);
+ return available_width >= pum_width;
+}
+
+/*
+ * Calculate horizontal placement for popup menu for insert-mode completion.
This is called for cmdline completion as well.
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
girish
@girishji pushed 1 commit.
- d656595 Improve comment and fix test failure
—
View it on GitHub or unsubscribe.
You are receiving this because you are subscribed to this thread.
girish
girishji left a comment (vim/vim#18441)Test_popupwin_infopopup_6.dump and Test_popupwin_infopopup_7.dump are already incorrect:
they show the info window but not the popup menu.
This issue occurs only in the test; I cannot reproduce it otherwise.
In Test_popupmenu_info_border(), setting of pumheight=3 causes the problem.
Without pumheight, the popup menu displays correctly, but pumheight is needed for the test.
If anyone has suggestions, please let me know.
Otherwise I’ll work around it by adding :set completepopup=border:off, which avoids the issue.
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
