mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-17 15:21:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(extmarks): properly handle virt_text on next screen line (#25166)

Browse Source 
TODO: virt_text_hide doesn't work for the first char on a wrapped screen
line, and it's not clear how to fix that.
This commit is contained in:
zeertzjq
2023-09-15 12:35:27 +08:00
committed by GitHub
parent 9ec0ecb222
commit b52bd8a2de
4 changed files with 92 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/nvim/decoration.c
View File

@@ -348,18 +348,12 @@ next_mark:
if (active && item.decor.spell != kNone) {
spell = item.decor.spell;
}
if (item.start_row == state->row && decor_virt_pos(&item.decor)
&& item.draw_col != INT_MIN) {
if (item.start_col <= col) {
if (item.decor.virt_text_pos == kVTOverlay && item.draw_col == -1) {
item.draw_col = (item.decor.virt_text_hide && hidden) ? INT_MIN : win_col;
} else if (item.draw_col == -3) {
item.draw_col = -1;
}
} else if (wp->w_p_wrap
&& (item.decor.virt_text_pos == kVTRightAlign
|| item.decor.virt_text_pos == kVTWinCol)) {
item.draw_col = -3;
if (item.start_row == state->row && item.start_col <= col
&& decor_virt_pos(&item.decor) && item.draw_col == -1) {
if (item.decor.virt_text_pos == kVTOverlay) {
item.draw_col = (item.decor.virt_text_hide && hidden) ? INT_MIN : win_col;
} else if (win_col < 0 && item.decor.virt_text_pos != kVTInline) {
item.draw_col = win_col;
}
}
if (keep) {