fix(decor): clamp last column by decor provider range #35587
+46
−20
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
For #35575, the issue happened because I rebased incorrectly and used the wrong variable (see: #35575 (comment)), so when window height matched a position on the line with no decorations, the issue occured. Reproduction: -- window height is 5, 9, 11, 13, 15, ...
vim.cmd('set nowrap')
vim.api.nvim_buf_set_lines(0, 0, -1, true, {
'local foo = { { severity = 0 }, { severity = 1 }, { severity = 2 }, { severity = 3 }, { severity = 0 }, { severity = 1 }, { severity = 2 }, { severity = 3 }, { severity = 0 }, { severity = 1 }, { severity = 2 }, { serity = 3 } }'
})
vim.cmd('set ft=lua')UPD: also fixed this |
7e952e9 to
225b480
Compare
vanaigr
commented
Sep 1, 2025
| @@ -1268,7 +1268,7 @@ static TriState decor_spell_nav_col(win_T *wp, linenr_T lnum, linenr_T *decor_ln | |||
| decor_redraw_line(wp, lnum - 1, &decor_state); | |||
| *decor_lnum = lnum; | |||
| } | |||
| decor_redraw_col(wp, col, 0, false, &decor_state); | |||
| decor_redraw_col(wp, col, 0, false, &decor_state, MAXCOL); | |||
There was a problem hiding this comment.
I used MAXCOL here since I think decor_state is reset afterwards, so the column doesn't affect anything
vanaigr
commented
Sep 1, 2025
| @@ -792,7 +793,7 @@ int decor_redraw_col_impl(win_T *wp, int col, int win_col, bool hidden, DecorSta | |||
| DecorSignHighlight *sh = &r->data.sh; | |||
| conceal = 2; | |||
| conceal_char = sh->text[0]; | |||
| col_until = MIN(col_until, r->start_col); | |||
| col_last = MIN(col_last, r->start_col); | |||
There was a problem hiding this comment.
It looks like this code assumes the character is 1 byte, and this is start_col + char_len - 1.
Are conceal characters always single byte?
225b480 to
e9a357e
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
fixes #35575
Problem:
When decoration provider is invoked and there's no more decorations, it sets
col_untiltoMAXCOL. However, with the addition of range based highlighting, more decorations may be added afterwards, but they would be ignored.Solution:
Use last column of the range of the requested decorations as maximum for
col_untilI also renamed
col_untiltocol_lastsince it is not end-exclusive.