diff: intersect unchanged ranges by word-range indices, not by byte ranges #4534
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
yuja
force-pushed
the
push-tzvnstyxvnlt
branch
from
5b4b7a2 to
abd36aa
Compare
… recursion It's cheap to create an empty Vec, and I'm going to remove it anyway.
It's silly that we build new Vec for each recursion stack and merge elements back. I don't see a measurable performance difference in the diff bench, but this change will help simplify the next patch. If a result vec were created for each unchanged_ranges() invocation, it would probably make more sense to return a list of "local" word positions. Then, callers would have to translate the returned positions to the caller's local positions.
Intersection of unchanged ranges becomes a simple merge-join loop, so I've removed the existing tests. I also added a fast path for the common 2-way diffs in which we don't have to build vec![(pos, vec![pos])]. One source of confusion introduced by this change is that WordPosition means both global and local indices. This is covered by the added tests, but I might add separate local/global types later.
yuja
force-pushed
the
push-tzvnstyxvnlt
branch
from
abd36aa to
b1b6295
Compare
martinvonz
approved these changes
Sep 30, 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