Rename buffer crate to text and name its entrypoint after the crate

Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>

crates/editor/Cargo.toml

@@ -5,13 +5,13 @@ edition = "2018"
 
 [features]
 test-support = [
-    "buffer/test-support",
+    "text/test-support",
     "language/test-support",
     "gpui/test-support",
 ]
 
 [dependencies]
-buffer = { path = "../buffer" }
+text = { path = "../text" }
 clock = { path = "../clock" }
 gpui = { path = "../gpui" }
 language = { path = "../language" }
@@ -31,7 +31,7 @@ smallvec = { version = "1.6", features = ["union"] }
 smol = "1.2"
 
 [dev-dependencies]
-buffer = { path = "../buffer", features = ["test-support"] }
+text = { path = "../text", features = ["test-support"] }
 language = { path = "../language", features = ["test-support"] }
 gpui = { path = "../gpui", features = ["test-support"] }
 ctor = "0.1"

crates/editor/src/display_map.rs

@@ -6,7 +6,6 @@ mod wrap_map;
 
 pub use block_map::{BlockDisposition, BlockId, BlockProperties, BufferRows, Chunks};
 use block_map::{BlockMap, BlockPoint};
-use buffer::Rope;
 use fold_map::{FoldMap, ToFoldPoint as _};
 use gpui::{
     fonts::{FontId, HighlightStyle},
@@ -19,6 +18,7 @@ use std::{
 };
 use sum_tree::Bias;
 use tab_map::TabMap;
+use text::Rope;
 use theme::{BlockStyle, SyntaxTheme};
 use wrap_map::WrapMap;
 

crates/editor/src/display_map/block_map.rs

@@ -2,7 +2,6 @@ use super::{
     wrap_map::{self, Edit as WrapEdit, Snapshot as WrapSnapshot, WrapPoint},
     BlockStyle, DisplayRow,
 };
-use buffer::{rope, Anchor, Bias, Edit, Point, Rope, ToOffset, ToPoint as _};
 use gpui::{fonts::HighlightStyle, AppContext, ModelHandle};
 use language::{Buffer, Chunk};
 use parking_lot::Mutex;
@@ -19,6 +18,7 @@ use std::{
     vec,
 };
 use sum_tree::SumTree;
+use text::{rope, Anchor, Bias, Edit, Point, Rope, ToOffset, ToPoint as _};
 use theme::SyntaxTheme;
 
 pub struct BlockMap {
@@ -1003,11 +1003,11 @@ fn offset_for_row(s: &str, target: u32) -> (u32, usize) {
 mod tests {
     use super::*;
     use crate::display_map::{fold_map::FoldMap, tab_map::TabMap, wrap_map::WrapMap};
-    use buffer::RandomCharIter;
     use gpui::color::Color;
     use language::Buffer;
     use rand::prelude::*;
     use std::env;
+    use text::RandomCharIter;
 
     #[gpui::test]
     fn test_offset_for_row() {

crates/editor/src/display_map/fold_map.rs

@@ -110,7 +110,7 @@ impl<'a> FoldMapWriter<'a> {
             if range.start != range.end {
                 let fold = Fold(buffer.anchor_after(range.start)..buffer.anchor_before(range.end));
                 folds.push(fold);
-                edits.push(buffer::Edit {
+                edits.push(text::Edit {
                     old: range.clone(),
                     new: range,
                 });
@@ -154,7 +154,7 @@ impl<'a> FoldMapWriter<'a> {
             let mut folds_cursor = intersecting_folds(&buffer, &self.0.folds, range, true);
             while let Some(fold) = folds_cursor.item() {
                 let offset_range = fold.0.start.to_offset(&buffer)..fold.0.end.to_offset(&buffer);
-                edits.push(buffer::Edit {
+                edits.push(text::Edit {
                     old: offset_range.clone(),
                     new: offset_range,
                 });
@@ -285,11 +285,7 @@ impl FoldMap {
         }
     }
 
-    fn apply_edits(
-        &self,
-        buffer_edits: Vec<buffer::Edit<usize>>,
-        cx: &AppContext,
-    ) -> Vec<FoldEdit> {
+    fn apply_edits(&self, buffer_edits: Vec<text::Edit<usize>>, cx: &AppContext) -> Vec<FoldEdit> {
         let buffer = self.buffer.read(cx).snapshot();
         let mut buffer_edits_iter = buffer_edits.iter().cloned().peekable();
 
@@ -713,7 +709,7 @@ impl Snapshot {
 }
 
 fn intersecting_folds<'a, T>(
-    buffer: &'a buffer::Snapshot,
+    buffer: &'a text::Snapshot,
     folds: &'a SumTree<Fold>,
     range: Range<T>,
     inclusive: bool,
@@ -738,7 +734,7 @@ where
     )
 }
 
-fn consolidate_buffer_edits(edits: &mut Vec<buffer::Edit<usize>>) {
+fn consolidate_buffer_edits(edits: &mut Vec<text::Edit<usize>>) {
     edits.sort_unstable_by(|a, b| {
         a.old
             .start
@@ -864,9 +860,9 @@ impl Default for FoldSummary {
 }
 
 impl sum_tree::Summary for FoldSummary {
-    type Context = buffer::Snapshot;
+    type Context = text::Snapshot;
 
-    fn add_summary(&mut self, other: &Self, buffer: &buffer::Snapshot) {
+    fn add_summary(&mut self, other: &Self, buffer: &text::Snapshot) {
         if other.min_start.cmp(&self.min_start, buffer).unwrap() == Ordering::Less {
             self.min_start = other.min_start.clone();
         }
@@ -890,20 +886,20 @@ impl sum_tree::Summary for FoldSummary {
 }
 
 impl<'a> sum_tree::Dimension<'a, FoldSummary> for Fold {
-    fn add_summary(&mut self, summary: &'a FoldSummary, _: &buffer::Snapshot) {
+    fn add_summary(&mut self, summary: &'a FoldSummary, _: &text::Snapshot) {
         self.0.start = summary.start.clone();
         self.0.end = summary.end.clone();
     }
 }
 
 impl<'a> sum_tree::SeekTarget<'a, FoldSummary, Fold> for Fold {
-    fn cmp(&self, other: &Self, buffer: &buffer::Snapshot) -> Ordering {
+    fn cmp(&self, other: &Self, buffer: &text::Snapshot) -> Ordering {
         self.0.cmp(&other.0, buffer).unwrap()
     }
 }
 
 impl<'a> sum_tree::Dimension<'a, FoldSummary> for usize {
-    fn add_summary(&mut self, summary: &'a FoldSummary, _: &buffer::Snapshot) {
+    fn add_summary(&mut self, summary: &'a FoldSummary, _: &text::Snapshot) {
         *self += summary.count;
     }
 }
@@ -1078,9 +1074,9 @@ impl FoldEdit {
 mod tests {
     use super::*;
     use crate::{test::sample_text, ToPoint};
-    use buffer::RandomCharIter;
     use rand::prelude::*;
     use std::{env, mem};
+    use text::RandomCharIter;
     use Bias::{Left, Right};
 
     #[gpui::test]

crates/editor/src/display_map/patch.rs

@@ -1,6 +1,6 @@
 use std::{cmp, mem};
 
-type Edit = buffer::Edit<u32>;
+type Edit = text::Edit<u32>;
 
 #[derive(Default, Debug, PartialEq, Eq)]
 pub struct Patch(Vec<Edit>);

crates/editor/src/display_map/tab_map.rs

@@ -1,9 +1,9 @@
 use super::fold_map::{self, FoldEdit, FoldPoint, Snapshot as FoldSnapshot, ToFoldPoint};
-use buffer::Point;
 use language::{rope, Chunk};
 use parking_lot::Mutex;
 use std::{cmp, mem, ops::Range};
 use sum_tree::Bias;
+use text::Point;
 use theme::SyntaxTheme;
 
 pub struct TabMap(Mutex<Snapshot>);
@@ -451,9 +451,9 @@ impl<'a> Iterator for Chunks<'a> {
 mod tests {
     use super::*;
     use crate::display_map::fold_map::FoldMap;
-    use buffer::{RandomCharIter, Rope};
     use language::Buffer;
     use rand::{prelude::StdRng, Rng};
+    use text::{RandomCharIter, Rope};
 
     #[test]
     fn test_expand_tabs() {

crates/editor/src/display_map/wrap_map.rs

@@ -16,7 +16,7 @@ use sum_tree::{Bias, Cursor, SumTree};
 use theme::SyntaxTheme;
 
 pub use super::tab_map::TextSummary;
-pub type Edit = buffer::Edit<u32>;
+pub type Edit = text::Edit<u32>;
 
 pub struct WrapMap {
     snapshot: Snapshot,
@@ -991,10 +991,10 @@ mod tests {
         display_map::{fold_map::FoldMap, tab_map::TabMap},
         test::Observer,
     };
-    use buffer::Rope;
     use language::{Buffer, RandomCharIter};
     use rand::prelude::*;
     use std::{cmp, env};
+    use text::Rope;
 
     #[gpui::test(iterations = 100)]
     async fn test_random_wraps(mut cx: gpui::TestAppContext, mut rng: StdRng) {

crates/editor/src/element.rs

@@ -931,7 +931,7 @@ pub struct LayoutState {
     line_height: f32,
     em_width: f32,
     em_advance: f32,
-    selections: HashMap<ReplicaId, Vec<buffer::Selection<DisplayPoint>>>,
+    selections: HashMap<ReplicaId, Vec<text::Selection<DisplayPoint>>>,
     overscroll: Vector2F,
     text_offset: Vector2F,
     max_visible_line_width: f32,

crates/editor/src/items.rs

@@ -1,6 +1,5 @@
 use crate::{Editor, EditorSettings, Event};
 use anyhow::Result;
-use buffer::{Point, Selection, ToPoint};
 use gpui::{
     elements::*, fonts::TextStyle, AppContext, Entity, ModelContext, ModelHandle,
     MutableAppContext, RenderContext, Subscription, Task, View, ViewContext, ViewHandle,
@@ -11,6 +10,7 @@ use postage::watch;
 use project::{ProjectPath, Worktree};
 use std::fmt::Write;
 use std::path::Path;
+use text::{Point, Selection, ToPoint};
 use workspace::{
     settings, EntryOpener, ItemHandle, ItemView, ItemViewHandle, Settings, StatusItemView,
     WeakItemHandle,

crates/editor/src/lib.rs

@@ -7,7 +7,6 @@ pub mod movement;
 mod test;
 
 use aho_corasick::AhoCorasick;
-use buffer::rope::TextDimension;
 use clock::ReplicaId;
 use display_map::*;
 pub use display_map::{DisplayPoint, DisplayRow};
@@ -35,6 +34,7 @@ use std::{
     time::Duration,
 };
 use sum_tree::Bias;
+use text::rope::TextDimension;
 use theme::{DiagnosticStyle, EditorStyle, SyntaxTheme};
 use util::post_inc;
 use workspace::{EntryOpener, Workspace};
@@ -3731,7 +3731,7 @@ pub fn diagnostic_style(
 mod tests {
     use super::*;
     use crate::test::sample_text;
-    use buffer::Point;
+    use text::Point;
     use unindent::Unindent;
 
     #[gpui::test]

crates/editor/src/movement.rs

@@ -1,7 +1,7 @@
 use super::{Bias, DisplayMapSnapshot, DisplayPoint, SelectionGoal, ToDisplayPoint};
 use anyhow::Result;
-use buffer::ToPoint;
 use std::{cmp, ops::Range};
+use text::ToPoint;
 
 pub fn left(map: &DisplayMapSnapshot, mut point: DisplayPoint) -> Result<DisplayPoint> {
     if point.column() > 0 {