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

fix(extmarks): draw virt_text below diff filler lines properly (#25170)

Browse Source 
fix(extmarks): draw virt_text properly below diff filler lines
This commit is contained in:
zeertzjq
2023-09-15 15:56:52 +08:00
committed by GitHub
parent fe2fa98460
commit a6e4793baf
2 changed files with 40 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/nvim/drawline.c
View File

@@ -3082,7 +3082,8 @@ int win_line(win_T *wp, linenr_T lnum, int startrow, int endrow, bool number_onl
wlv.char_attr = saved_attr2;
}
if (has_decor && (wp->w_p_rl ? (wlv.col < 0) : (wlv.col >= grid->cols))) {
if (has_decor && wlv.filler_todo <= 0
&& (wp->w_p_rl ? (wlv.col < 0) : (wlv.col >= grid->cols))) {
// At the end of screen line: might need to peek for decorations just after
// this position.
if (!has_fold && wp->w_p_wrap && wlv.n_extra == 0) {
@@ -3119,7 +3120,7 @@ int win_line(win_T *wp, linenr_T lnum, int startrow, int endrow, bool number_onl
if (virt_line_offset >= 0) {
draw_virt_text_item(buf, virt_line_offset, kv_A(virt_lines, virt_line_index).line,
kHlModeReplace, grid->cols, 0);
} else {
} else if (wlv.filler_todo <= 0) {
draw_virt_text(wp, buf, win_col_offset, &draw_col, grid->cols, wlv.row);
}