Merge #469

469: kill text utils r=matklad a=matklad



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

4 files changed, 11 insertions, 38 deletions

diff --git a/crates/ra_syntax/src/lib.rs b/crates/ra_syntax/src/lib.rs
index a75e641ea..1dbfca91b 100644
--- a/crates/ra_syntax/src/lib.rs
+++ b/crates/ra_syntax/src/lib.rs
@@ -31,7 +31,6 @@ mod parser_impl;
 mod reparsing;
 mod string_lexing;
 mod syntax_kinds;
-pub mod text_utils;
 /// Utilities for simple uses of the parser.
 pub mod utils;
 mod validation;
@@ -75,8 +74,7 @@ impl SourceFile {
             .map(|(green_node, errors)| SourceFile::new(green_node, errors))
     }
     fn full_reparse(&self, edit: &AtomTextEdit) -> TreePtr<SourceFile> {
-        let text =
-            text_utils::replace_range(self.syntax().text().to_string(), edit.delete, &edit.insert);
+        let text = edit.apply(self.syntax().text().to_string());
         SourceFile::parse(&text)
     }
     pub fn errors(&self) -> Vec<SyntaxError> {
diff --git a/crates/ra_syntax/src/reparsing.rs b/crates/ra_syntax/src/reparsing.rs
index d5d72e1f8..2f1de6b02 100644
--- a/crates/ra_syntax/src/reparsing.rs
+++ b/crates/ra_syntax/src/reparsing.rs
@@ -3,7 +3,6 @@ use crate::grammar;
 use crate::lexer::{tokenize, Token};
 use crate::parser_api::Parser;
 use crate::parser_impl;
-use crate::text_utils::replace_range;
 use crate::yellow::{self, GreenNode, SyntaxError, SyntaxNode};
 use crate::{SyntaxKind::*, TextRange, TextUnit};
 use ra_text_edit::AtomTextEdit;
@@ -62,11 +61,8 @@ fn reparse_block<'node>(
 }
 
 fn get_text_after_edit(node: &SyntaxNode, edit: &AtomTextEdit) -> String {
-    replace_range(
-        node.text().to_string(),
-        edit.delete - node.range().start(),
-        &edit.insert,
-    )
+    let edit = AtomTextEdit::replace(edit.delete - node.range().start(), edit.insert.clone());
+    edit.apply(node.text().to_string())
 }
 
 fn is_contextual_kw(text: &str) -> bool {
@@ -156,7 +152,7 @@ fn merge_errors(
 mod tests {
     use test_utils::{extract_range, assert_eq_text};
 
-    use crate::{SourceFile, AstNode, text_utils::replace_range, utils::dump_tree};
+    use crate::{SourceFile, AstNode, utils::dump_tree};
     use super::*;
 
     fn do_check<F>(before: &str, replace_with: &str, reparser: F)
@@ -167,7 +163,8 @@ mod tests {
         ) -> Option<(&'a SyntaxNode, GreenNode, Vec<SyntaxError>)>,
     {
         let (range, before) = extract_range(before);
-        let after = replace_range(before.clone(), range, replace_with);
+        let edit = AtomTextEdit::replace(range, replace_with.to_owned());
+        let after = edit.apply(before.clone());
 
         let fully_reparsed = SourceFile::parse(&after);
         let incrementally_reparsed = {
diff --git a/crates/ra_syntax/src/text_utils.rs b/crates/ra_syntax/src/text_utils.rs
deleted file mode 100644
index 417d43e1b..000000000
--- a/crates/ra_syntax/src/text_utils.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-use crate::TextRange;
-
-pub fn intersect(r1: TextRange, r2: TextRange) -> Option<TextRange> {
-    let start = r1.start().max(r2.start());
-    let end = r1.end().min(r2.end());
-    if start <= end {
-        Some(TextRange::from_to(start, end))
-    } else {
-        None
-    }
-}
-
-pub fn replace_range(mut text: String, range: TextRange, replace_with: &str) -> String {
-    let start = u32::from(range.start()) as usize;
-    let end = u32::from(range.end()) as usize;
-    text.replace_range(start..end, replace_with);
-    text
-}
diff --git a/crates/ra_syntax/src/yellow/syntax_text.rs b/crates/ra_syntax/src/yellow/syntax_text.rs
index 31db0fdab..08dbe57a2 100644
--- a/crates/ra_syntax/src/yellow/syntax_text.rs
+++ b/crates/ra_syntax/src/yellow/syntax_text.rs
@@ -1,10 +1,6 @@
 use std::{fmt, ops};
 
-use ra_text_edit::text_utils::contains_offset_nonstrict;
-use crate::{
-    text_utils::intersect,
-    SyntaxNode, TextRange, TextUnit,
-};
+use crate::{SyntaxNode, TextRange, TextUnit};
 
 #[derive(Clone)]
 pub struct SyntaxText<'a> {
@@ -23,7 +19,7 @@ impl<'a> SyntaxText<'a> {
         let range = self.range;
         self.node.descendants().filter_map(move |node| {
             let text = node.leaf_text()?;
-            let range = intersect(range, node.range())?;
+            let range = range.intersection(&node.range())?;
             let range = range - node.range().start();
             Some(&text[range])
         })
@@ -92,13 +88,13 @@ pub trait SyntaxTextSlice: fmt::Debug {
 
 impl SyntaxTextSlice for TextRange {
     fn restrict(&self, range: TextRange) -> Option<TextRange> {
-        intersect(*self, range)
+        self.intersection(&range)
     }
 }
 
 impl SyntaxTextSlice for ops::RangeTo<TextUnit> {
     fn restrict(&self, range: TextRange) -> Option<TextRange> {
-        if !contains_offset_nonstrict(range, self.end) {
+        if !range.contains_inclusive(self.end) {
             return None;
         }
         Some(TextRange::from_to(range.start(), self.end))
@@ -107,7 +103,7 @@ impl SyntaxTextSlice for ops::RangeTo<TextUnit> {
 
 impl SyntaxTextSlice for ops::RangeFrom<TextUnit> {
     fn restrict(&self, range: TextRange) -> Option<TextRange> {
-        if !contains_offset_nonstrict(range, self.start) {
+        if !range.contains_inclusive(self.start) {
             return None;
         }
         Some(TextRange::from_to(self.start, range.end()))