fix: extract nested slices #1821
Merged
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
Fix for the util method `extractSlices`. When extracting slices, we need to adjust the ranges of marks that appear after each slice in the document. In order to do this, we keep track of the ranges that are to be deleted and then loop over them, adjusting the mark ranges as needed. However, when we have nested slices, each slice may be split by another slice, causing a slice to have multiple ranges. In this case, the list of ranges to be deleted would be overlapping, and thus eventually cause the mark ranges to be adjusted incorrectly. This fix normalizes the list of ranges to be deleted before we start updating mark ranges by first sorting those ranges and then merging overlapping ranges into each other.
bachbui
force-pushed
the
overlapping-slices
branch
from
02282e1
to
1a377b6
Compare
bachbui
force-pushed
the
overlapping-slices
branch
from
1a377b6
to
ebd358d
Compare
colin-alexa
reviewed
Nov 13, 2024
packages/@atjson/util/src/index.ts
Outdated
| @@ -390,6 +400,24 @@ export function extractSlices(value: { | |||
| }); | |||
| } | |||
|
|
|||
| // Normalize the ranges again, as we may have extended ranges into each other | |||
| // First sort the ranges | |||
| rangesToDelete = rangesToDelete.sort(compareRanges).reduce((acc, range) => { | |||
There was a problem hiding this comment.
I would prefer a for loop here for performance and clarity reasons, but I don't care that much
tim-evans
approved these changes
Nov 13, 2024
bachbui
force-pushed
the
overlapping-slices
branch
from
2868590
to
95b081e
Compare
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.
Fix for the util method
extractSlices. When extracting slices, we need to adjust the ranges of marks that appear after each slice in the document. In order to do this, we keep track of the ranges that are to be deleted and then loop over them, adjusting the mark ranges as needed.However, when we have nested slices, each slice may be split by another slice, causing a slice to have multiple ranges. In this case, the list of ranges to be deleted would be overlapping, and thus eventually cause the mark ranges to be adjusted incorrectly. This fix normalizes the list of ranges to be deleted before we start updating mark ranges by first sorting those ranges and then merging overlapping ranges into each other.