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

WIP

Browse source
This commit is contained in:
Antonio Scandurra 2021-11-11 19:49:01 +01:00
parent 4fecab6d4b
commit d75f415b25
1 changed files with 59 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -8,52 +8,73 @@ struct Patch(Vec<Edit>);
impl Patch { impl Patch {
fn compose(&self, new: &Self) -> Patch { fn compose(&self, new: &Self) -> Patch {
let mut composed = Vec::new(); let mut composed = Vec::new();
let mut new_edits = new.0.iter().cloned().peekable(); let mut old_edits = self.0.iter().cloned().peekable();
let mut old_delta = 0; let mut old_delta = 0;
let mut new_delta = 0; let mut new_delta = 0;
for mut old_edit in self.0.iter().cloned() { for mut new_edit in new.0.iter().cloned() {
let old_edit_new_start = old_edit.new.start; while let Some(mut old_edit) = old_edits.peek().cloned() {
let old_edit_new_end = old_edit.new.end; if old_edit.new.end < new_edit.old.start {
let mut next_new_delta = new_delta; old_edit.new.start = (old_edit.new.start as i32 + new_delta) as u32;
while let Some(mut new_edit) = new_edits.peek().cloned() { old_edit.new.end = (old_edit.new.end as i32 + new_delta) as u32;
let new_edit_delta = new_edit.new.len() as i32 - new_edit.old.len() as i32; old_edits.next();
if new_edit.old.end < old_edit_new_start { composed.push(old_edit);
new_edit.old.start = (new_edit.old.start as i32 - old_delta) as u32; } else if old_edit.new.start < new_edit.old.end {
new_edit.old.end = (new_edit.old.end as i32 - old_delta) as u32; if old_edit.new.start < new_edit.old.start {
new_edits.next(); new_edit.old.start -= new_edit.old.start - old_edit.new.start;
new_delta += new_edit_delta; new_edit.new.start -= new_edit.old.start - old_edit.new.start;
next_new_delta += new_edit_delta;
composed.push(new_edit);
} else if new_edit.old.start <= old_edit_new_end {
if new_edit.old.start < old_edit_new_start {
old_edit.old.start -= old_edit_new_start - new_edit.old.start;
old_edit.new.start -= old_edit_new_start - new_edit.old.start;
} }
if new_edit.old.end > old_edit_new_end { if old_edit.new.end > new_edit.old.end {
old_edit.old.end += new_edit.old.end - old_edit_new_end; new_edit.old.end += old_edit.new.end - new_edit.old.end;
old_edit.new.end += new_edit.old.end - old_edit_new_end; new_edit.new.end += old_edit.new.end - new_edit.old.end;
} }
old_edit.new.end = (old_edit.new.end as i32 + new_edit_delta) as u32;
new_edits.next();
next_new_delta += new_edit_delta;
} else {
break;
} }
} }
old_edit.new.start = (old_edit.new.start as i32 + new_delta) as u32;
old_edit.new.end = (old_edit.new.end as i32 + new_delta) as u32;
old_delta += old_edit.new.len() as i32 - old_edit.old.len() as i32;
new_delta = next_new_delta;
composed.push(old_edit);
} }
composed.extend(new_edits.map(|mut new_edit| {
new_edit.old.start = (new_edit.old.start as i32 - old_delta) as u32; todo!();
new_edit.old.end = (new_edit.old.end as i32 - old_delta) as u32; // for mut old_edit in self.0.iter().cloned() {
new_edit // let old_edit_new_start = old_edit.new.start;
})); // let old_edit_new_end = old_edit.new.end;
// let mut next_new_delta = new_delta;
// while let Some(mut new_edit) = new_edits.peek().cloned() {
// let new_edit_delta = new_edit.new.len() as i32 - new_edit.old.len() as i32;
// if new_edit.old.end < old_edit_new_start {
// new_edit.old.start = (new_edit.old.start as i32 - old_delta) as u32;
// new_edit.old.end = (new_edit.old.end as i32 - old_delta) as u32;
// new_edits.next();
// new_delta += new_edit_delta;
// next_new_delta += new_edit_delta;
// composed.push(new_edit);
// } else if new_edit.old.start <= old_edit_new_end {
// if new_edit.old.start < old_edit_new_start {
// old_edit.old.start -= old_edit_new_start - new_edit.old.start;
// old_edit.new.start -= old_edit_new_start - new_edit.old.start;
// }
// if new_edit.old.end > old_edit_new_end {
// old_edit.old.end += new_edit.old.end - old_edit_new_end;
// old_edit.new.end += new_edit.old.end - old_edit_new_end;
// }
// old_edit.new.end = (old_edit.new.end as i32 + new_edit_delta) as u32;
// new_edits.next();
// next_new_delta += new_edit_delta;
// } else {
// break;
// }
// }
// old_edit.new.start = (old_edit.new.start as i32 + new_delta) as u32;
// old_edit.new.end = (old_edit.new.end as i32 + new_delta) as u32;
// old_delta += old_edit.new.len() as i32 - old_edit.old.len() as i32;
// new_delta = next_new_delta;
// composed.push(old_edit);
// }
// composed.extend(new_edits.map(|mut new_edit| {
// new_edit.old.start = (new_edit.old.start as i32 - old_delta) as u32;
// new_edit.old.end = (new_edit.old.end as i32 - old_delta) as u32;
// new_edit
// }));
Patch(composed) Patch(composed)
} }