neovim

commit 52b19e012474c19601a491bf0a0ab6ba15cfae8d
parent 686e7aca40b850789af45ec9a97905518654b49e
Author: zeertzjq <zeertzjq@outlook.com>
Date:   Sat, 29 Mar 2025 20:12:12 +0800

vim-patch:9.1.1257: Mixing vim_strsize() with mb_ptr2cells() in pum_redraw()

Problem:  Mixing vim_strsize() with mb_ptr2cells() in pum_redraw().
Solution: Change vim_strsize() to mb_string2cells() (zeertzjq).

Since vim_strsize() uses ptr2cells() for the cell width of each char, it
is strange to mix it with mb_ptr2cells(), which is used both just below
and in pum_screen_puts_with_attr(), and screen_puts_len() also uses
something similar.  Meanwhile mb_string2cells() uses mb_ptr2cells() for
the cell width of each char.

Note that the vim_strsize() and mb_string2cells() actually return the
same value here, as the transstr() above makes sure the string only
contains printable chars, and ptr2cells() and mb_ptr2cells() only return
different values for unprintable chars.

closes: vim/vim#17003

https://github.com/vim/vim/commit/90e52490b39f0052fb5313d67728eff77191aaae

Diffstat:
M
src/nvim/popupmenu.c
 | 
2
+-

1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/nvim/popupmenu.c b/src/nvim/popupmenu.c
@@ -710,7 +710,7 @@ void pum_redraw(void)
           if (pum_rl) {
             char *rt = reverse_text(st);
             char *rt_start = rt;
-            int cells = vim_strsize(rt);
+            int cells = (int)mb_string2cells(rt);
             if (p_pmw > ellipsis_width && pum_width == p_pmw
                 && grid_col - cells < col_off - pum_width) {
               need_ellipsis = true;