fix: prevent incorrect merge of content-identical lines across non-monotonic crossings - #374
Merged
Merged
Conversation
…notonic crossings When a multi-line block is restructured (lines moved between blocks), content-identical lines at different old/new positions were incorrectly merged into context lines, causing duplicated content, missing lines, and non-monotonic line numbers in both unified and split diff views. Two root causes fixed: 1. mergeModifiedLines second pass re-paired content-identical deletes with inserts after detectAndUnpairCrossings intentionally un-paired them. Now prevents crossing pairs unless the unpaired lines form a complete permutation (rotation of identical content). 2. lookupOldHtml used full-file highlighted content indexed by old line number for delete lines, but the fetched file content can diverge from the diff's line numbering. Delete lines now highlight directly from their segment value. Also adds cache-busting to the diff worker URL to prevent stale worker caching during development.
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.
When a multi-line block is restructured (lines moved between blocks),
content-identical lines at different old/new positions were incorrectly
merged into context lines, causing duplicated content, missing lines,
and non-monotonic line numbers in both unified and split diff views.
Two root causes fixed:
mergeModifiedLines second pass re-paired content-identical deletes
with inserts after detectAndUnpairCrossings intentionally un-paired
them. Now prevents crossing pairs unless the unpaired lines form a
complete permutation (rotation of identical content).
lookupOldHtml used full-file highlighted content indexed by old line
number for delete lines, but the fetched file content can diverge
from the diff's line numbering. Delete lines now highlight directly
from their segment value.
Also adds cache-busting to the diff worker URL to prevent stale worker
caching during development.