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

WIP

Browse source
This commit is contained in:
Nathan Sobo 2021-11-12 00:20:39 -07:00
parent 47ad9baebc
commit 068aa1adb3
1 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
crates/editor/src/display_map/patch.rs
View file

@ -61,11 +61,19 @@ impl Patch {
} }
(Some(old_edit), Some(new_edit)) => { (Some(old_edit), Some(new_edit)) => {
if old_edit.new.start <= new_edit.old.start { if old_edit.new.start <= new_edit.old.start {
if old_edit.new.start <= intermediate_end {
intermediate_end = old_edit.new.end; intermediate_end = old_edit.new.end;
merge_edits(&mut pending_old_edit, old_edits.next().unwrap()) merge_edits(&mut pending_old_edit, old_edits.next().unwrap())
} else { } else {
break;
}
} else {
if new_edit.old.start <= intermediate_end {
intermediate_end = new_edit.old.end; intermediate_end = new_edit.old.end;
merge_edits(&mut pending_new_edit, new_edits.next().unwrap()); merge_edits(&mut pending_new_edit, new_edits.next().unwrap());
} else {
break;
}
} }
} }
} }