mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-02-10 04:09:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Delete commented-out diff code

Browse source
This commit is contained in:
Antonio Scandurra 2021-05-21 12:37:45 +02:00
parent 3a576f0b65
commit c1b4cca48b
1 changed files with 0 additions and 65 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

65
zed/src/editor/buffer/mod.rs
View file

@ -2132,71 +2132,6 @@ impl<'a, F: Fn(&FragmentSummary) -> bool> Iterator for Edits<'a, F> {
}
}
// pub fn diff(a: &[u16], b: &[u16]) -> Vec<Edit> {
// struct EditCollector<'a> {
// a: &'a [u16],
// b: &'a [u16],
// position: Point,
// changes: Vec<Edit>,
// }
//
// impl<'a> diffs::Diff for EditCollector<'a> {
// type Error = ();
//
// fn equal(&mut self, old: usize, _: usize, len: usize) -> Result<(), ()> {
// self.position += &Text::extent(&self.a[old..old + len]);
// Ok(())
// }
//
// fn delete(&mut self, old: usize, len: usize) -> Result<(), ()> {
// self.changes.push(Edit {
// range: self.position..self.position + &Text::extent(&self.a[old..old + len]),
// chars: Vec::new(),
// new_char_count: Point::zero(),
// });
// Ok(())
// }
//
// fn insert(&mut self, _: usize, new: usize, new_len: usize) -> Result<(), ()> {
// let new_char_count = Text::extent(&self.b[new..new + new_len]);
// self.changes.push(Edit {
// range: self.position..self.position,
// chars: Vec::from(&self.b[new..new + new_len]),
// new_char_count,
// });
// self.position += &new_char_count;
// Ok(())
// }
//
// fn replace(
// &mut self,
// old: usize,
// old_len: usize,
// new: usize,
// new_len: usize,
// ) -> Result<(), ()> {
// let old_extent = text::extent(&self.a[old..old + old_len]);
// let new_char_count = text::extent(&self.b[new..new + new_len]);
// self.changes.push(Edit {
// range: self.position..self.position + &old_extent,
// chars: Vec::from(&self.b[new..new + new_len]),
// new_char_count,
// });
// self.position += &new_char_count;
// Ok(())
// }
// }
//
// let mut collector = diffs::Replace::new(EditCollector {
// a,
// b,
// position: Point::zero(),
// changes: Vec::new(),
// });
// diffs::myers::diff(&mut collector, a, 0, a.len(), b, 0, b.len()).unwrap();
// collector.into_inner().changes
// }
#[derive(Ord, PartialOrd, Eq, PartialEq, Clone, Debug)]
struct FragmentId(Arc<[u16]>);