fix(highlight): blend_alpha controls line bg and prefix matches gutter#178
Merged
barrettruth merged 3 commits intomainfrom Mar 8, 2026
Merged
fix(highlight): blend_alpha controls line bg and prefix matches gutter#178barrettruth merged 3 commits intomainfrom
barrettruth merged 3 commits intomainfrom
Conversation
Problem: `blend_alpha` was ignored for line backgrounds — transparent path used raw `add_bg`, non-transparent hardcoded 0.4. `DiffsClear.bg` was nil on transparent themes, letting native TS bg bleed through. Gutter Nr fg was blended instead of raw. Solution: collapse transparent/non-transparent into a single blend path using `blend_alpha` for line bg and `alpha + 0.3` for intra-line. Use raw `add_fg`/`del_fg` for gutter Nr fg. Set `DiffsClear.bg` to the resolved bg fallback. Apply same pattern to conflict regions.
Problem: for regular unified diffs, the `+`/`-` prefix char at col 0 had no diffs.nvim extmark. Native TS `@diff.plus` colored it differently from `DiffsAddNr` in the gutter. Solution: add `DiffsAddNr`/`DiffsDeleteNr` at p199 on col 0..1 when `pw == 1` and `background` is enabled. Suppresses native TS at p100.
barrettruth
added a commit
that referenced
this pull request
Mar 8, 2026
Problem: #178 set `DiffsClear.bg` to a dark fallback (`#1a1a1a`) on transparent themes, painting a visible solid rectangle where the terminal background should show through. Solution: only set `DiffsClear.bg` when `Normal.bg` is defined. Body lines are already protected by `line_hl_group` (`DiffsAdd`/ `DiffsDelete`), which stacks above `hl_group` bg regardless of priority.
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
1 participant
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.
Problem
blend_alphawas a no-op for line backgrounds — the transparent path used rawadd_bgand the non-transparent path hardcoded 0.4.DiffsClear.bgwas nil ontransparent themes, letting native TS backgrounds bleed through. The
+/-prefix char used native TS colors which didn't match
DiffsAddNrin the gutter.Solution
Collapse transparent/non-transparent branches into a single
blend_colorcallusing
blend_alphafor line bg andalpha + 0.3for intra-line. Use rawadd_fg/del_fgfor gutter Nr fg. SetDiffsClear.bgto the resolved bgfallback. Apply
DiffsAddNr/DiffsDeleteNrat p199 on col 0..1 for pw=1 diffsso the prefix
+/-matches the gutter.