mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-07 10:26:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(ui): fix multi-byte characters highlight in virtual text

Browse Source 
This also fixes insert cursor position around virtual text

vim-patch:9.0.0132: multi-byte characters in virtual text not handled correctly

Problem:    Multi-byte characters in virtual text not handled correctly.
Solution:   Count screen cells instead of bytes.

09ff4b54fb
This commit is contained in:
Ibby
2023-03-19 20:31:52 +11:00
committed by bfredl
parent 389f5ca39d
commit 0c7fa3bdcc
3 changed files with 82 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/nvim/charset.c
View File

@@ -1079,8 +1079,10 @@ void getvcol(win_T *wp, pos_T *pos, colnr_T *start, colnr_T *cursor, colnr_T *en
}
if (cursor != NULL) {
// cursor is after inserted text
vcol += cts.cts_cur_text_width;
if ((State & MODE_INSERT) == 0) {
// cursor is after inserted text
vcol += cts.cts_cur_text_width;
}
if ((*ptr == TAB)
&& (State & MODE_NORMAL)
&& !wp->w_p_list

2
src/nvim/drawline.c
View File

@@ -1824,7 +1824,7 @@ int win_line(win_T *wp, linenr_T lnum, int startrow, int endrow, bool nochange,
wlv.c_extra = NUL;
wlv.c_final = NUL;
wlv.extra_attr = vtc.hl_id ? syn_id2attr(vtc.hl_id) : 0;
n_attr = wlv.n_extra;
n_attr = mb_charlen(vtc.text);
extmark_attr = 0;
virt_inline_i++;
}