Reuse existing element rendering

[rust.git] / crates / text_edit / src / lib.rs

diff --git a/crates/text_edit/src/lib.rs b/crates/text_edit/src/lib.rs
index ab8cd7fd1197a3b7cede4bc5759fd1f2de2f1965..9eef7a8906713b4d06748580216306a128108f1e 100644 (file)
--- a/crates/text_edit/src/lib.rs
+++ b/crates/text_edit/src/lib.rs
@@ -48,6 +48,10 @@ pub fn builder() -> TextEditBuilder {
         TextEditBuilder::default()
     }
 
+    pub fn into_builder(self) -> TextEditBuilder {
+        TextEditBuilder { indels: self.indels }
+    }
+
     pub fn insert(offset: TextSize, text: String) -> TextEdit {
         let mut builder = TextEdit::builder();
         builder.insert(offset, text);
@@ -119,7 +123,7 @@ pub fn union(&mut self, other: TextEdit) -> Result<(), TextEdit> {
             return Err(other);
         }
         self.indels.extend(other.indels);
-        assert!(check_disjoint(&mut self.indels));
+        assert_disjoint(&mut self.indels);
         Ok(())
     }
 
@@ -159,24 +163,33 @@ fn into_iter(self) -> Self::IntoIter {
 
 impl TextEditBuilder {
     pub fn replace(&mut self, range: TextRange, replace_with: String) {
-        self.indels.push(Indel::replace(range, replace_with))
+        self.indel(Indel::replace(range, replace_with))
     }
     pub fn delete(&mut self, range: TextRange) {
-        self.indels.push(Indel::delete(range))
+        self.indel(Indel::delete(range))
     }
     pub fn insert(&mut self, offset: TextSize, text: String) {
-        self.indels.push(Indel::insert(offset, text))
+        self.indel(Indel::insert(offset, text))
     }
     pub fn finish(self) -> TextEdit {
         let mut indels = self.indels;
-        assert!(check_disjoint(&mut indels));
+        assert_disjoint(&mut indels);
         TextEdit { indels }
     }
     pub fn invalidates_offset(&self, offset: TextSize) -> bool {
         self.indels.iter().any(|indel| indel.delete.contains_inclusive(offset))
     }
+    fn indel(&mut self, indel: Indel) {
+        self.indels.push(indel);
+        if self.indels.len() <= 16 {
+            assert_disjoint(&mut self.indels);
+        }
+    }
 }
 
+fn assert_disjoint(indels: &mut [impl std::borrow::Borrow<Indel>]) {
+    assert!(check_disjoint(indels));
+}
 fn check_disjoint(indels: &mut [impl std::borrow::Borrow<Indel>]) -> bool {
     indels.sort_by_key(|indel| (indel.borrow().delete.start(), indel.borrow().delete.end()));
     indels