diff: handle "matching" regions of different lengths, minor cleanup #4522
Conversation
This file contains 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
martinvonz
reviewed
Sep 23, 2024
…ield I'll replace offsets with absolute [Range, ..] to support unchanged regions of different lengths. All fields in UnchangedRange will be ranges.
…lengths We have two options to achieve "diff --ignore-*-space": a. preprocess contents to be diffed, then translate hunk ranges back b. add hooks to customize eq and hash functions I originally thought (a) would be easier, but actually, there aren't many changes needed to implement (b). And (b) should have a fewer logic errors. This patch removes assumption that each unchanged region has the same content length. It won't be true if whitespace characters are ignored.
yuja
force-pushed
the
push-ponuxwwuoqkv
branch
from
30677bb
to
88ab7eb
Compare
martinvonz
approved these changes
Oct 1, 2024
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.
Checklist
If applicable:
CHANGELOG.md