diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2023-09-15 15:56:52 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-15 15:56:52 +0800 |
| commit | a6e4793bafa0edda2ef5e948cd071dc9626688d8 (patch) | |
| tree | a82ad1b93c72772a3c991fbd61206549996a3c2f /src | |
| parent | fe2fa98460c6f5fce665eeb410c8b15a653a4269 (diff) | |
| download | rneovim-a6e4793bafa0edda2ef5e948cd071dc9626688d8.tar.gz rneovim-a6e4793bafa0edda2ef5e948cd071dc9626688d8.tar.bz2 rneovim-a6e4793bafa0edda2ef5e948cd071dc9626688d8.zip | |
fix(extmarks): draw virt_text below diff filler lines properly (#25170)
fix(extmarks): draw virt_text properly below diff filler lines
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/drawline.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/nvim/drawline.c b/src/nvim/drawline.c index f9ddeeb94b..cd1a5df8de 100644 --- a/src/nvim/drawline.c +++ b/src/nvim/drawline.c @@ -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); } |