oak-team/oak-gpui
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
crates/editor/src/display_map/patch.rs
+12 -4
View File
@@ -61,11 +61,19 @@ impl Patch {
}
(Some(old_edit), Some(new_edit)) => {
if old_edit.new.start <= new_edit.old.start {
intermediate_end = old_edit.new.end;
merge_edits(&mut pending_old_edit, old_edits.next().unwrap())
if old_edit.new.start <= intermediate_end {
intermediate_end = old_edit.new.end;
merge_edits(&mut pending_old_edit, old_edits.next().unwrap())
} else {
break;
}
} else {
intermediate_end = new_edit.old.end;
merge_edits(&mut pending_new_edit, new_edits.next().unwrap());
if new_edit.old.start <= intermediate_end {
intermediate_end = new_edit.old.end;
merge_edits(&mut pending_new_edit, new_edits.next().unwrap());
} else {
break;
}
}
}
}