From c1b4cca48b0e631449bffc48c86ded3de06be2a1 Mon Sep 17 00:00:00 2001
From: Antonio Scandurra <me@as-cii.com>
Date: Fri, 21 May 2021 12:37:45 +0200
Subject: [PATCH] Delete commented-out diff code

---
 zed/src/editor/buffer/mod.rs | 65 ------------------------------------
 1 file changed, 65 deletions(-)

diff --git a/zed/src/editor/buffer/mod.rs b/zed/src/editor/buffer/mod.rs
index fd1c263b30..a5994aeffd 100644
--- a/zed/src/editor/buffer/mod.rs
+++ b/zed/src/editor/buffer/mod.rs
@@ -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]>);