Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Avoid taking fragment when not fully consuming it

Browse source
This commit is contained in:
Antonio Scandurra 2023-07-23 18:50:57 +02:00
parent 18b32304e2
commit c1f72328ff
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
crates/crdb/src/operations.rs
View file

@ -116,13 +116,13 @@ impl Edit {
parent_fragment.insertion_id, parent_fragment.insertion_id,
parent_fragment.insertion_subrange, parent_fragment.insertion_subrange,
) { ) {
if let Some(fragment) = current_fragment.take() { if let Some(fragment) = current_fragment.as_ref() {
// Advance to fragment_location if it is greater than the location of the current fragment, // Advance to fragment_location if it is greater than the location of the current fragment,
if *fragment_location > fragment.location { if *fragment_location > fragment.location {
// Flush the remainder of current fragment. // Flush the remainder of current fragment.
if !fragment.insertion_subrange.is_empty() { if !fragment.insertion_subrange.is_empty() {
new_ropes.push_fragment(&fragment, fragment.visible()); new_ropes.push_fragment(fragment, fragment.visible());
new_fragments.push(fragment, &()); new_fragments.push(fragment.clone(), &());
} }
old_fragments.next(&()); old_fragments.next(&());
@ -143,10 +143,11 @@ impl Edit {
} }
// If the edit starts at the end of the current fragment, flush it. // If the edit starts at the end of the current fragment, flush it.
if let Some(fragment) = current_fragment.take() { if let Some(fragment) = current_fragment.as_ref() {
if fragment.insertion_id == range.start_insertion_id if fragment.insertion_id == range.start_insertion_id
&& fragment.insertion_subrange.end == range.start_offset_in_insertion && fragment.insertion_subrange.end == range.start_offset_in_insertion
{ {
let fragment = current_fragment.take().unwrap();
new_ropes.push_fragment(&fragment, fragment.visible()); new_ropes.push_fragment(&fragment, fragment.visible());
new_fragments.push(fragment, &()); new_fragments.push(fragment, &());
old_fragments.next(&()); old_fragments.next(&());