mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-29 06:28:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:9.1.1296: completion: incorrect truncation logic

Browse Source 
Problem:  completion: incorrect truncation logic (after: v9.1.1284)
Solution: replace string allocation with direct screen rendering and
          fixe RTL/LTR truncation calculations (glepnir)

closes: vim/vim#17081

d4dbf822dc

Co-authored-by: glepnir <glephunter@gmail.com>
This commit is contained in:
zeertzjq
2025-04-16 07:29:44 +08:00
parent 1c723b2e6f
commit 6e5671b00d
8 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/nvim/popupmenu.c
View File

@@ -577,7 +577,8 @@ void pum_redraw(void)
int thumb_pos = 0;
int thumb_height = 1;
int n;
schar_T fcs_trunc = curwin->w_p_fcs_chars.trunc;
const schar_T fcs_trunc = pum_rl ? curwin->w_p_fcs_chars.truncrl
: curwin->w_p_fcs_chars.trunc;
// "word" "kind" "extra text"
const hlf_T hlfsNorm[3] = { HLF_PNI, HLF_PNK, HLF_PNX };
@@ -720,7 +721,9 @@ void pum_redraw(void)
char *rt = reverse_text(st);
char *rt_start = rt;
int cells = (int)mb_string2cells(rt);
if (pum_width == p_pmw && totwidth + 1 + cells >= pum_width) {
if (pum_width == p_pmw
&& (pum_width - totwidth < cells
|| (j + 1 < 3 && pum_get_item(idx, order[j + 1]) != NULL))) {
need_fcs_trunc = true;
}
@@ -749,7 +752,9 @@ void pum_redraw(void)
grid_col -= width;
} else {
int cells = (int)mb_string2cells(st);
if (pum_width == p_pmw && totwidth + 1 + cells >= pum_width) {
if (pum_width == p_pmw
&& (pum_width - totwidth < cells
|| (j + 1 < 3 && pum_get_item(idx, order[j + 1]) != NULL))) {
need_fcs_trunc = true;
}
@@ -818,8 +823,7 @@ void pum_redraw(void)
const int lcol = col_off - pum_width + 1;
grid_line_fill(lcol, grid_col + 1, schar_from_ascii(' '), orig_attr);
if (need_fcs_trunc) {
linebuf_char[lcol] = fcs_trunc != NUL && fcs_trunc != schar_from_ascii('>')
? fcs_trunc : schar_from_ascii('<');
linebuf_char[lcol] = fcs_trunc != NUL ? fcs_trunc : schar_from_ascii('<');
if (pum_width > 1 && linebuf_char[lcol + 1] == NUL) {
linebuf_char[lcol + 1] = schar_from_ascii(' ');
}