fix(inline): stack tree-sitter captures so @spell doesn't drop @comment's fg#159
Merged
dlyongemallo merged 1 commit intomainfrom May 6, 2026
Merged
fix(inline): stack tree-sitter captures so @spell doesn't drop @comment's fg#159dlyongemallo merged 1 commit intomainfrom
@spell doesn't drop @comment's fg#159dlyongemallo merged 1 commit intomainfrom
Conversation
There was a problem hiding this comment.
Pull request overview
This PR updates Diffview’s inline deletion rendering to keep Tree-sitter highlight attributes composable when multiple captures overlap (notably ensuring decoration-only captures like @spell don’t clobber earlier captures’ foreground like @comment). This fits into the inline diff rendering path by improving how virt_line highlight group stacks are constructed for deleted text.
Changes:
- Change
captured_chunksto preserve the full per-byte capture stack (instead of reducing to a single “latest” capture). - Coalesce runs by comparing stacked capture lists, and forward
{ del_hl, cap1, cap2, ... }to let Neovim merge attributes correctly. - Extend functional tests to cover overlapping capture stacking and the
@comment+@spellregression scenario.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
| lua/diffview/scene/inline_diff.lua | Reworks captured_chunks to build/compare per-byte capture stacks and forward the full hl-group list for correct attribute composition. |
| lua/diffview/tests/functional/inline_diff_spec.lua | Updates/extends tests to assert stacked capture behavior, including @spell not dropping @comment fg. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
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.
Relates to #156 (comment).