fix(inline): preserve syntax fg on added text in diff1_inline#171
Merged
Conversation
There was a problem hiding this comment.
Pull request overview
This PR adjusts diff1_inline intraline-added highlighting so added text preserves syntax foreground colors by switching from DiffviewDiffText to a new DiffviewDiffAddInline highlight group (bg/style only).
Changes:
- Switch intraline “added range” extmarks in
diff1_inlinerendering to useDiffviewDiffAddInline. - Add/derive the new
DiffviewDiffAddInlinehighlight group fromDiffviewDiffAddwhile omittingfg. - Update functional tests to look for the new extmark highlight group and add a highlight-definition test.
Reviewed changes
Copilot reviewed 3 out of 3 changed files in this pull request and generated 3 comments.
| File | Description |
|---|---|
| lua/diffview/tests/functional/inline_diff_spec.lua | Updates extmark expectations to DiffviewDiffAddInline and adds a highlight inheritance test. |
| lua/diffview/scene/inline_diff.lua | Changes intraline added-span extmarks to use DiffviewDiffAddInline. |
| lua/diffview/hl.lua | Simplifies hi_link() relinking behavior and introduces/updates derived diff highlight groups including DiffviewDiffAddInline. |
Comments suppressed due to low confidence (2)
lua/diffview/tests/functional/inline_diff_spec.lua:351
- This overleaf test now asserts
DiffviewDiffAddInlineextmarks, but the test name/message above still says “DiffText”. Update the wording to match the new highlight group so failures are easier to interpret.
local ranges = char_ranges(extmarks(bufnr))
assert.is_true(#ranges > 0, "expected DiffviewDiffAddInline extmarks on added chars")
end)
lua/diffview/tests/functional/inline_diff_spec.lua:946
- In this helper the highlight group filter was updated to
DiffviewDiffAddInline, but several assertion messages in this describe block still mention “DiffText”. Consider updating those strings to the new group name to avoid confusion when diagnosing failures.
local out = { hl = 0, inline = 0 }
for _, m in ipairs(marks) do
local d = m[4]
if d.hl_group == "DiffviewDiffAddInline" then
out.hl = out.hl + 1
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
eaf7b61 to
f964efc
Compare
f964efc to
722574a
Compare
722574a to
a947fe5
Compare
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
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.
No description provided.