extract AtomEdit and Edit into new ra_text_edit crate

crates/ra_editor/src/edit.rs

@@ -1,83 +0,0 @@
-use crate::{TextRange, TextUnit};
-use ra_syntax::{text_utils::contains_offset_nonstrict, AtomEdit};
-
-#[derive(Debug, Clone)]
-pub struct Edit {
-    atoms: Vec<AtomEdit>,
-}
-
-#[derive(Debug)]
-pub struct EditBuilder {
-    atoms: Vec<AtomEdit>,
-}
-
-impl EditBuilder {
-    pub fn new() -> EditBuilder {
-        EditBuilder { atoms: Vec::new() }
-    }
-    pub fn replace(&mut self, range: TextRange, replace_with: String) {
-        self.atoms.push(AtomEdit::replace(range, replace_with))
-    }
-    pub fn delete(&mut self, range: TextRange) {
-        self.atoms.push(AtomEdit::delete(range))
-    }
-    pub fn insert(&mut self, offset: TextUnit, text: String) {
-        self.atoms.push(AtomEdit::insert(offset, text))
-    }
-    pub fn finish(self) -> Edit {
-        let mut atoms = self.atoms;
-        atoms.sort_by_key(|a| (a.delete.start(), a.delete.end()));
-        for (a1, a2) in atoms.iter().zip(atoms.iter().skip(1)) {
-            assert!(a1.delete.end() <= a2.delete.start())
-        }
-        Edit { atoms }
-    }
-    pub fn invalidates_offset(&self, offset: TextUnit) -> bool {
-        self.atoms
-            .iter()
-            .any(|atom| contains_offset_nonstrict(atom.delete, offset))
-    }
-}
-
-impl Edit {
-    pub fn into_atoms(self) -> Vec<AtomEdit> {
-        self.atoms
-    }
-
-    pub fn apply(&self, text: &str) -> String {
-        let mut total_len = text.len();
-        for atom in self.atoms.iter() {
-            total_len += atom.insert.len();
-            total_len -= u32::from(atom.delete.end() - atom.delete.start()) as usize;
-        }
-        let mut buf = String::with_capacity(total_len);
-        let mut prev = 0;
-        for atom in self.atoms.iter() {
-            let start = u32::from(atom.delete.start()) as usize;
-            let end = u32::from(atom.delete.end()) as usize;
-            if start > prev {
-                buf.push_str(&text[prev..start]);
-            }
-            buf.push_str(&atom.insert);
-            prev = end;
-        }
-        buf.push_str(&text[prev..text.len()]);
-        assert_eq!(buf.len(), total_len);
-        buf
-    }
-
-    pub fn apply_to_offset(&self, offset: TextUnit) -> Option<TextUnit> {
-        let mut res = offset;
-        for atom in self.atoms.iter() {
-            if atom.delete.start() >= offset {
-                break;
-            }
-            if offset < atom.delete.end() {
-                return None;
-            }
-            res += TextUnit::of_str(&atom.insert);
-            res -= atom.delete.len();
-        }
-        Some(res)
-    }
-}

crates/ra_editor/src/lib.rs

@@ -1,5 +1,4 @@
 mod code_actions;
-mod edit;
 mod extend_selection;
 mod folding_ranges;
 mod line_index;
@@ -10,14 +9,13 @@ mod typing;
 
 pub use self::{
     code_actions::{add_derive, add_impl, flip_comma, introduce_variable, LocalEdit},
-    edit::{Edit, EditBuilder},
     extend_selection::extend_selection,
     folding_ranges::{folding_ranges, Fold, FoldKind},
     line_index::{LineCol, LineIndex},
     symbols::{file_structure, file_symbols, FileSymbol, StructureNode},
     typing::{join_lines, on_enter, on_eq_typed},
 };
-pub use ra_syntax::AtomEdit;
+use ra_text_edit::{Edit, EditBuilder};
 use ra_syntax::{
     algo::find_leaf_at_offset,
     ast::{self, AstNode, NameOwner},

crates/ra_editor/src/typing.rs

@@ -3,11 +3,12 @@ use std::mem;
 use ra_syntax::{
     algo::{find_covering_node, find_leaf_at_offset, LeafAtOffset},
     ast,
-    text_utils::{contains_offset_nonstrict, intersect},
+    text_utils::intersect,
     AstNode, SourceFileNode, SyntaxKind,
     SyntaxKind::*,
     SyntaxNodeRef, TextRange, TextUnit,
 };
+use ra_text_edit::text_utils::contains_offset_nonstrict;
 
 use crate::{find_node_at_offset, EditBuilder, LocalEdit};