fix(highlight): make intra-line bg visible under line backgrounds#192
Merged
barrettruth merged 3 commits intomainfrom Mar 14, 2026
Merged
fix(highlight): make intra-line bg visible under line backgrounds#192barrettruth merged 3 commits intomainfrom
barrettruth merged 3 commits intomainfrom
Conversation
Closed
Problem: `line_hl_group` bg unconditionally overrides `hl_group` bg regardless of priority (neovim/neovim#31151). `DiffsAddText`/ `DiffsDeleteText` at p201 were invisible under `DiffsAdd`/`DiffsDelete` `line_hl_group` at p200 because they operate on separate stacking layers. Solution: replace `line_hl_group` with `hl_group` + `hl_eol` + `end_col` for line backgrounds, putting them on the same layer as intra-line highlights so priority governs stacking. Use single-row extmarks (`end_row = buf_line`) to avoid the adjacent-hunk clearing bug. Split `number_hl_group` into a separate extmark. Use raw `DiffAdd.bg`/`DiffDelete.bg` for `DiffsAddText`/`DiffsDeleteText` instead of alpha-blending toward Normal.bg, which produced indistinguishable colors on dark themes.
barrettruth
force-pushed
the
fix/intra-line-bg-visibility
branch
from
a7d0c04 to
8c41c70
Compare
|
it don't highlight the whole line for me: Not sure what's end_col here, but this can make this work as expected for me: diff --git a/lua/diffs/highlight.lua b/lua/diffs/highlight.lua
index 445354a..1045d81 100644
--- a/lua/diffs/highlight.lua
+++ b/lua/diffs/highlight.lua
@@ -636,10 +636,8 @@ function M.highlight_hunk(bufnr, ns, hunk, opts)
end
if opts.highlights.background and is_diff_line then
- local bg_end_col = raw_len or (line_len + qw)
pcall(vim.api.nvim_buf_set_extmark, bufnr, ns, buf_line, 0, {
- end_row = buf_line,
- end_col = bg_end_col,
+ end_row = buf_line + 1,
hl_group = line_hl,
hl_eol = true,
priority = p.line_bg,
|
Owner
Author
|
Damn. We're definitely looping on this. My bad... |
barrettruth
added a commit
that referenced
this pull request
Mar 15, 2026
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
tbh unsure how to test this well and not in the perfect mood for it... make an issue tracking the upstream one.
this should work for now
Closes #191 (thanks @phanen).