aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorglepnir <glephunter@gmail.com>2025-03-12 20:29:03 +0800
committerGitHub <noreply@github.com>2025-03-12 05:29:03 -0700
commit3bc72a4980ab2ffe0c3c5300b79b93905b0237e3 (patch)
treeeb14d34f3936e6d6cb4e0aaa99b21c397be243d0
parenteea0aff4e5e582aede2516ab23acdd6d00cbfeab (diff)
downloadrneovim-3bc72a4980ab2ffe0c3c5300b79b93905b0237e3.tar.gz
rneovim-3bc72a4980ab2ffe0c3c5300b79b93905b0237e3.tar.bz2
rneovim-3bc72a4980ab2ffe0c3c5300b79b93905b0237e3.zip
refactor(popup): use plines_m_win #32857
Problem: Custom inline function duplicated existing functionality Solution: Used existing plines_m_win function to reduce code duplication
-rw-r--r--src/nvim/popupmenu.c18
1 files changed, 2 insertions, 16 deletions
diff --git a/src/nvim/popupmenu.c b/src/nvim/popupmenu.c
index d7909e6872..b1c6e02449 100644
--- a/src/nvim/popupmenu.c
+++ b/src/nvim/popupmenu.c
@@ -839,21 +839,6 @@ static void pum_preview_set_text(buf_T *buf, char *info, linenr_T *lnum, int *ma
buf->b_p_ma = false;
}
-/// Calculate the total height (in screen lines) of the first 'count' buffer lines in window 'wp'.
-/// Takes line wrapping and other display factors into account.
-///
-/// @param wp Window pointer
-/// @param count Number of buffer lines to measure (1-based)
-/// @return Total height in screen lines
-static inline int pum_preview_win_height(win_T *wp, linenr_T count)
-{
- int height = 0;
- for (int i = 1; i <= count; i++) {
- height += plines_win(wp, i, false);
- }
- return height;
-}
-
/// adjust floating info preview window position
static void pum_adjust_info_position(win_T *wp, int width)
{
@@ -878,7 +863,7 @@ static void pum_adjust_info_position(win_T *wp, int width)
wp->w_config.anchor = pum_above ? kFloatAnchorSouth : 0;
linenr_T count = wp->w_buffer->b_ml.ml_line_count;
wp->w_width_inner = wp->w_config.width;
- wp->w_config.height = MIN(Rows, pum_preview_win_height(wp, count));
+ wp->w_config.height = plines_m_win(wp, wp->w_topline, count, Rows);
wp->w_config.row = pum_above ? pum_row + wp->w_config.height : pum_row;
wp->w_config.hide = false;
win_config_float(wp, wp->w_config);
@@ -903,6 +888,7 @@ win_T *pum_set_info(int selected, char *info)
if (!wp) {
return NULL;
}
+ wp->w_topline = 1;
wp->w_p_wfb = true;
}
linenr_T lnum = 0;