Finished refactoring out fs and rope

crates/text/Cargo.toml

@@ -14,23 +14,23 @@ test-support = ["rand"]
 clock = { path = "../clock" }
 collections = { path = "../collections" }
 fs = { path = "../fs" }
+rope = { path = "../rope" }
 sum_tree = { path = "../sum_tree" }
 anyhow = "1.0.38"
-arrayvec = "0.7.1"
 digest = { version = "0.9", features = ["std"] }
-bromberg_sl2 = "0.6"
 lazy_static = "1.4"
 log = { version = "0.4.16", features = ["kv_unstable_serde"] }
 parking_lot = "0.11"
 postage = { version = "0.4.1", features = ["futures-traits"] }
 rand = { version = "0.8.3", optional = true }
-regex = "1.5"
 smallvec = { version = "1.6", features = ["union"] }
+util = { path = "../util" }
+regex = "1.5"
+
 
 [dev-dependencies]
 collections = { path = "../collections", features = ["test-support"] }
 gpui = { path = "../gpui", features = ["test-support"] }
-util = { path = "../util", features = ["test-support"] }
 ctor = "0.1"
 env_logger = "0.9"
 rand = "0.8.3"

crates/text/src/anchor.rs

@@ -1,9 +1,10 @@
-use super::{Point, ToOffset};
-use crate::{rope::TextDimension, BufferSnapshot, PointUtf16, ToPoint, ToPointUtf16};
 use anyhow::Result;
+use rope::{point::Point, point_utf16::PointUtf16, TextDimension};
 use std::{cmp::Ordering, fmt::Debug, ops::Range};
 use sum_tree::Bias;
 
+use crate::{BufferSnapshot, ToOffset, ToPoint, ToPointUtf16};
+
 #[derive(Copy, Clone, Eq, PartialEq, Debug, Hash, Default)]
 pub struct Anchor {
     pub timestamp: clock::Local,

crates/text/src/offset_utf16.rs

@@ -1,50 +0,0 @@
-use std::ops::{Add, AddAssign, Sub};
-
-#[derive(Copy, Clone, Debug, Default, Eq, PartialEq, Ord, PartialOrd)]
-pub struct OffsetUtf16(pub usize);
-
-impl<'a> Add<&'a Self> for OffsetUtf16 {
-    type Output = Self;
-
-    fn add(self, other: &'a Self) -> Self::Output {
-        Self(self.0 + other.0)
-    }
-}
-
-impl Add for OffsetUtf16 {
-    type Output = Self;
-
-    fn add(self, other: Self) -> Self::Output {
-        Self(self.0 + other.0)
-    }
-}
-
-impl<'a> Sub<&'a Self> for OffsetUtf16 {
-    type Output = Self;
-
-    fn sub(self, other: &'a Self) -> Self::Output {
-        debug_assert!(*other <= self);
-        Self(self.0 - other.0)
-    }
-}
-
-impl Sub for OffsetUtf16 {
-    type Output = OffsetUtf16;
-
-    fn sub(self, other: Self) -> Self::Output {
-        debug_assert!(other <= self);
-        Self(self.0 - other.0)
-    }
-}
-
-impl<'a> AddAssign<&'a Self> for OffsetUtf16 {
-    fn add_assign(&mut self, other: &'a Self) {
-        self.0 += other.0;
-    }
-}
-
-impl AddAssign<Self> for OffsetUtf16 {
-    fn add_assign(&mut self, other: Self) {
-        self.0 += other.0;
-    }
-}

crates/text/src/point.rs

@@ -1,128 +0,0 @@
-use std::{
-    cmp::Ordering,
-    ops::{Add, AddAssign, Sub},
-};
-
-#[derive(Clone, Copy, Default, Eq, PartialEq, Debug, Hash)]
-pub struct Point {
-    pub row: u32,
-    pub column: u32,
-}
-
-impl Point {
-    pub const MAX: Self = Self {
-        row: u32::MAX,
-        column: u32::MAX,
-    };
-
-    pub fn new(row: u32, column: u32) -> Self {
-        Point { row, column }
-    }
-
-    pub fn zero() -> Self {
-        Point::new(0, 0)
-    }
-
-    pub fn parse_str(s: &str) -> Self {
-        let mut point = Self::zero();
-        for (row, line) in s.split('\n').enumerate() {
-            point.row = row as u32;
-            point.column = line.len() as u32;
-        }
-        point
-    }
-
-    pub fn is_zero(&self) -> bool {
-        self.row == 0 && self.column == 0
-    }
-
-    pub fn saturating_sub(self, other: Self) -> Self {
-        if self < other {
-            Self::zero()
-        } else {
-            self - other
-        }
-    }
-}
-
-impl<'a> Add<&'a Self> for Point {
-    type Output = Point;
-
-    fn add(self, other: &'a Self) -> Self::Output {
-        self + *other
-    }
-}
-
-impl Add for Point {
-    type Output = Point;
-
-    fn add(self, other: Self) -> Self::Output {
-        if other.row == 0 {
-            Point::new(self.row, self.column + other.column)
-        } else {
-            Point::new(self.row + other.row, other.column)
-        }
-    }
-}
-
-impl<'a> Sub<&'a Self> for Point {
-    type Output = Point;
-
-    fn sub(self, other: &'a Self) -> Self::Output {
-        self - *other
-    }
-}
-
-impl Sub for Point {
-    type Output = Point;
-
-    fn sub(self, other: Self) -> Self::Output {
-        debug_assert!(other <= self);
-
-        if self.row == other.row {
-            Point::new(0, self.column - other.column)
-        } else {
-            Point::new(self.row - other.row, self.column)
-        }
-    }
-}
-
-impl<'a> AddAssign<&'a Self> for Point {
-    fn add_assign(&mut self, other: &'a Self) {
-        *self += *other;
-    }
-}
-
-impl AddAssign<Self> for Point {
-    fn add_assign(&mut self, other: Self) {
-        if other.row == 0 {
-            self.column += other.column;
-        } else {
-            self.row += other.row;
-            self.column = other.column;
-        }
-    }
-}
-
-impl PartialOrd for Point {
-    fn partial_cmp(&self, other: &Point) -> Option<Ordering> {
-        Some(self.cmp(other))
-    }
-}
-
-impl Ord for Point {
-    #[cfg(target_pointer_width = "64")]
-    fn cmp(&self, other: &Point) -> Ordering {
-        let a = (self.row as usize) << 32 | self.column as usize;
-        let b = (other.row as usize) << 32 | other.column as usize;
-        a.cmp(&b)
-    }
-
-    #[cfg(target_pointer_width = "32")]
-    fn cmp(&self, other: &Point) -> Ordering {
-        match self.row.cmp(&other.row) {
-            Ordering::Equal => self.column.cmp(&other.column),
-            comparison @ _ => comparison,
-        }
-    }
-}

crates/text/src/point_utf16.rs

@@ -1,119 +0,0 @@
-use std::{
-    cmp::Ordering,
-    ops::{Add, AddAssign, Sub},
-};
-
-#[derive(Clone, Copy, Default, Eq, PartialEq, Debug, Hash)]
-pub struct PointUtf16 {
-    pub row: u32,
-    pub column: u32,
-}
-
-impl PointUtf16 {
-    pub const MAX: Self = Self {
-        row: u32::MAX,
-        column: u32::MAX,
-    };
-
-    pub fn new(row: u32, column: u32) -> Self {
-        PointUtf16 { row, column }
-    }
-
-    pub fn zero() -> Self {
-        PointUtf16::new(0, 0)
-    }
-
-    pub fn is_zero(&self) -> bool {
-        self.row == 0 && self.column == 0
-    }
-
-    pub fn saturating_sub(self, other: Self) -> Self {
-        if self < other {
-            Self::zero()
-        } else {
-            self - other
-        }
-    }
-}
-
-impl<'a> Add<&'a Self> for PointUtf16 {
-    type Output = PointUtf16;
-
-    fn add(self, other: &'a Self) -> Self::Output {
-        self + *other
-    }
-}
-
-impl Add for PointUtf16 {
-    type Output = PointUtf16;
-
-    fn add(self, other: Self) -> Self::Output {
-        if other.row == 0 {
-            PointUtf16::new(self.row, self.column + other.column)
-        } else {
-            PointUtf16::new(self.row + other.row, other.column)
-        }
-    }
-}
-
-impl<'a> Sub<&'a Self> for PointUtf16 {
-    type Output = PointUtf16;
-
-    fn sub(self, other: &'a Self) -> Self::Output {
-        self - *other
-    }
-}
-
-impl Sub for PointUtf16 {
-    type Output = PointUtf16;
-
-    fn sub(self, other: Self) -> Self::Output {
-        debug_assert!(other <= self);
-
-        if self.row == other.row {
-            PointUtf16::new(0, self.column - other.column)
-        } else {
-            PointUtf16::new(self.row - other.row, self.column)
-        }
-    }
-}
-
-impl<'a> AddAssign<&'a Self> for PointUtf16 {
-    fn add_assign(&mut self, other: &'a Self) {
-        *self += *other;
-    }
-}
-
-impl AddAssign<Self> for PointUtf16 {
-    fn add_assign(&mut self, other: Self) {
-        if other.row == 0 {
-            self.column += other.column;
-        } else {
-            self.row += other.row;
-            self.column = other.column;
-        }
-    }
-}
-
-impl PartialOrd for PointUtf16 {
-    fn partial_cmp(&self, other: &PointUtf16) -> Option<Ordering> {
-        Some(self.cmp(other))
-    }
-}
-
-impl Ord for PointUtf16 {
-    #[cfg(target_pointer_width = "64")]
-    fn cmp(&self, other: &PointUtf16) -> Ordering {
-        let a = (self.row as usize) << 32 | self.column as usize;
-        let b = (other.row as usize) << 32 | other.column as usize;
-        a.cmp(&b)
-    }
-
-    #[cfg(target_pointer_width = "32")]
-    fn cmp(&self, other: &PointUtf16) -> Ordering {
-        match self.row.cmp(&other.row) {
-            Ordering::Equal => self.column.cmp(&other.column),
-            comparison @ _ => comparison,
-        }
-    }
-}

crates/text/src/random_char_iter.rs

@@ -1,36 +0,0 @@
-use rand::prelude::*;
-
-pub struct RandomCharIter<T: Rng>(T);
-
-impl<T: Rng> RandomCharIter<T> {
-    pub fn new(rng: T) -> Self {
-        Self(rng)
-    }
-}
-
-impl<T: Rng> Iterator for RandomCharIter<T> {
-    type Item = char;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        if std::env::var("SIMPLE_TEXT").map_or(false, |v| !v.is_empty()) {
-            return if self.0.gen_range(0..100) < 5 {
-                Some('\n')
-            } else {
-                Some(self.0.gen_range(b'a'..b'z' + 1).into())
-            };
-        }
-
-        match self.0.gen_range(0..100) {
-            // whitespace
-            0..=19 => [' ', '\n', '\r', '\t'].choose(&mut self.0).copied(),
-            // two-byte greek letters
-            20..=32 => char::from_u32(self.0.gen_range(('α' as u32)..('ω' as u32 + 1))),
-            // // three-byte characters
-            33..=45 => ['✋', '✅', '❌', '❎', '⭐'].choose(&mut self.0).copied(),
-            // // four-byte characters
-            46..=58 => ['🍐', '🏀', '🍗', '🎉'].choose(&mut self.0).copied(),
-            // ascii letters
-            _ => Some(self.0.gen_range(b'a'..b'z' + 1).into()),
-        }
-    }
-}

crates/text/src/selection.rs

@@ -1,5 +1,7 @@
-use crate::Anchor;
-use crate::{rope::TextDimension, BufferSnapshot};
+use rope::TextDimension;
+
+use crate::{Anchor, BufferSnapshot};
+
 use std::cmp::Ordering;
 use std::ops::Range;
 

crates/text/src/text.rs

@@ -2,14 +2,8 @@ mod anchor;
 pub mod locator;
 #[cfg(any(test, feature = "test-support"))]
 pub mod network;
-mod offset_utf16;
 pub mod operation_queue;
 mod patch;
-mod point;
-mod point_utf16;
-#[cfg(any(test, feature = "test-support"))]
-pub mod random_char_iter;
-pub mod rope;
 mod selection;
 pub mod subscription;
 #[cfg(test)]
@@ -20,22 +14,15 @@ pub use anchor::*;
 use anyhow::Result;
 use clock::ReplicaId;
 use collections::{HashMap, HashSet};
-use lazy_static::lazy_static;
+use fs::LineEnding;
 use locator::Locator;
-pub use offset_utf16::*;
 use operation_queue::OperationQueue;
 pub use patch::Patch;
-pub use point::*;
-pub use point_utf16::*;
 use postage::{barrier, oneshot, prelude::*};
-#[cfg(any(test, feature = "test-support"))]
-pub use random_char_iter::*;
-use regex::Regex;
-use rope::TextDimension;
+use rope::{offset_utf16::OffsetUtf16, point::Point, point_utf16::PointUtf16, TextDimension};
 pub use rope::{Chunks, Rope, TextSummary};
 pub use selection::*;
 use std::{
-    borrow::Cow,
     cmp::{self, Ordering, Reverse},
     future::Future,
     iter::Iterator,
@@ -49,9 +36,8 @@ pub use sum_tree::Bias;
 use sum_tree::{FilterCursor, SumTree, TreeMap};
 use undo_map::UndoMap;
 
-lazy_static! {
-    static ref CARRIAGE_RETURNS_REGEX: Regex = Regex::new("\r\n|\r").unwrap();
-}
+#[cfg(any(test, feature = "test-support"))]
+use util::RandomCharIter;
 
 pub type TransactionId = clock::Local;
 
@@ -1458,9 +1444,7 @@ impl Buffer {
             last_end = Some(range.end);
 
             let new_text_len = rng.gen_range(0..10);
-            let new_text: String = crate::random_char_iter::RandomCharIter::new(&mut *rng)
-                .take(new_text_len)
-                .collect();
+            let new_text: String = RandomCharIter::new(&mut *rng).take(new_text_len).collect();
 
             edits.push((range, new_text.into()));
         }