Merge #469

469: kill text utils r=matklad a=matklad



Co-authored-by: Aleksey Kladov <[email protected]>

3 files changed, 8 insertions, 8 deletions

diff --git a/crates/ra_text_edit/src/lib.rs b/crates/ra_text_edit/src/lib.rs
index 8acf10448..fb693b3ae 100644
--- a/crates/ra_text_edit/src/lib.rs
+++ b/crates/ra_text_edit/src/lib.rs
@@ -1,5 +1,4 @@
 mod text_edit;
-pub mod text_utils;
 pub mod test_utils;
 
 pub use crate::text_edit::{TextEdit, TextEditBuilder};
@@ -29,4 +28,11 @@ impl AtomTextEdit {
     pub fn insert(offset: TextUnit, text: String) -> AtomTextEdit {
         AtomTextEdit::replace(TextRange::offset_len(offset, 0.into()), text)
     }
+
+    pub fn apply(&self, mut text: String) -> String {
+        let start = u32::from(self.delete.start()) as usize;
+        let end = u32::from(self.delete.end()) as usize;
+        text.replace_range(start..end, &self.insert);
+        text
+    }
 }
diff --git a/crates/ra_text_edit/src/text_edit.rs b/crates/ra_text_edit/src/text_edit.rs
index a288a990d..363b3d8c0 100644
--- a/crates/ra_text_edit/src/text_edit.rs
+++ b/crates/ra_text_edit/src/text_edit.rs
@@ -1,5 +1,4 @@
 use crate::AtomTextEdit;
-use crate::text_utils::contains_offset_nonstrict;
 use text_unit::{TextRange, TextUnit};
 
 #[derive(Debug, Clone)]
@@ -28,7 +27,7 @@ impl TextEditBuilder {
     pub fn invalidates_offset(&self, offset: TextUnit) -> bool {
         self.atoms
             .iter()
-            .any(|atom| contains_offset_nonstrict(atom.delete, offset))
+            .any(|atom| atom.delete.contains_inclusive(offset))
     }
 }
 
diff --git a/crates/ra_text_edit/src/text_utils.rs b/crates/ra_text_edit/src/text_utils.rs
deleted file mode 100644
index e3b4dc4fe..000000000
--- a/crates/ra_text_edit/src/text_utils.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-use text_unit::{TextRange, TextUnit};
-
-pub fn contains_offset_nonstrict(range: TextRange, offset: TextUnit) -> bool {
-    range.start() <= offset && offset <= range.end()
-}