diff --git a/crates/language/src/multi_buffer.rs b/crates/language/src/multi_buffer.rs
index 300deb4487dac1f82c4dbd7267150423b7456519..eb765688561545f3b9062675c13363834959d257 100644
--- a/crates/language/src/multi_buffer.rs
+++ b/crates/language/src/multi_buffer.rs
@@ -12,6 +12,7 @@ use clock::ReplicaId;
 use collections::HashMap;
 use gpui::{AppContext, Entity, ModelContext, ModelHandle, MutableAppContext, Task};
 use parking_lot::{Mutex, MutexGuard};
+use smallvec::SmallVec;
 use std::{cmp, io, ops::Range, sync::Arc, time::SystemTime};
 use sum_tree::{Bias, Cursor, SumTree};
 use text::{
@@ -31,6 +32,7 @@ pub struct MultiBuffer {
     snapshot: Mutex<MultiBufferSnapshot>,
     buffers: HashMap<usize, BufferState>,
     subscriptions: Topic,
+    selection_sets: HashMap<SelectionSetId, SelectionSet>,
 }
 
 pub trait ToOffset: 'static {
@@ -409,12 +411,30 @@ impl MultiBuffer {
         self.snapshot.lock().anchor_at(position, bias)
     }
 
-    pub fn anchor_range_set<E>(
+    pub fn anchor_range_map<T, E>(
         &self,
         start_bias: Bias,
         end_bias: Bias,
         entries: E,
-    ) -> AnchorRangeSet
+    ) -> AnchorRangeMap<T>
+    where
+        E: IntoIterator<Item = (Range<usize>, T)>,
+    {
+        let entries = entries.into_iter().peekable();
+        let mut child_maps = SmallVec::new();
+        if let Some((range, _)) = entries.peek() {
+            let mut cursor = self.snapshot.lock().excerpts.cursor::<ExcerptSummary>();
+            cursor.seek(&range.start, Bias::Right, &());
+            let mut excerpt_end = cursor.end(&());
+
+            // child_maps.push
+
+            // for entry in entries {}
+        }
+        AnchorRangeMap { child_maps }
+    }
+
+    pub fn anchor_range_set<E>(&self, start_bias: Bias, end_bias: Bias, ranges: E) -> AnchorRangeSet
     where
         E: IntoIterator<Item = Range<usize>>,
     {
diff --git a/crates/language/src/multi_buffer/anchor.rs b/crates/language/src/multi_buffer/anchor.rs
index 752308604b284e084674bda7ea0a5b8205bb4f24..5f5173925f40626ddb473d30e25f9c00c4be270c 100644
--- a/crates/language/src/multi_buffer/anchor.rs
+++ b/crates/language/src/multi_buffer/anchor.rs
@@ -14,9 +14,9 @@ pub struct Anchor {
     text_anchor: text::Anchor,
 }
 
-#[derive(Clone, Debug, PartialEq, Eq)]
+#[derive(Clone, Debug, Default, PartialEq, Eq)]
 pub struct AnchorRangeMap<T> {
-    entries: SmallVec<[(ExcerptId, text::AnchorRangeMap<T>); 1]>,
+    pub(crate) child_maps: SmallVec<[(ExcerptId, text::AnchorRangeMap<T>); 1]>,
 }
 
 #[derive(Clone, Debug, PartialEq, Eq)]
@@ -99,7 +99,7 @@ impl Anchor {
 
 impl<T> AnchorRangeMap<T> {
     pub fn len(&self) -> usize {
-        self.entries
+        self.child_maps
             .iter()
             .map(|(_, text_map)| text_map.len())
             .sum()
@@ -113,7 +113,7 @@ impl<T> AnchorRangeMap<T> {
         D: TextDimension + Clone,
     {
         let mut cursor = snapshot.excerpts.cursor::<ExcerptSummary>();
-        self.entries
+        self.child_maps
             .iter()
             .filter_map(move |(excerpt_id, text_map)| {
                 cursor.seek_forward(excerpt_id, Bias::Left, &());
@@ -154,14 +154,14 @@ impl<T> AnchorRangeMap<T> {
         cursor.seek(&start_offset, start_bias, &());
         let start_excerpt_id = &cursor.start().excerpt_id;
         let start_ix = match self
-            .entries
+            .child_maps
             .binary_search_by_key(&start_excerpt_id, |e| &e.0)
         {
             Ok(ix) | Err(ix) => ix,
         };
 
         let mut entry_ranges = None;
-        let mut entries = self.entries[start_ix..].iter();
+        let mut entries = self.child_maps[start_ix..].iter();
         std::iter::from_fn(move || loop {
             match &mut entry_ranges {
                 None => {
@@ -265,7 +265,7 @@ impl<T> AnchorRangeMap<T> {
     {
         let mut cursor = snapshot.excerpts.cursor::<ExcerptSummary>();
         let mut max = None;
-        for (excerpt_id, text_map) in &self.entries {
+        for (excerpt_id, text_map) in &self.child_maps {
             cursor.seek(excerpt_id, Bias::Left, &());
             if let Some(excerpt) = cursor.item() {
                 if excerpt.id == *excerpt_id {
diff --git a/crates/text/src/text.rs b/crates/text/src/text.rs
index 597649af49d03f13007b4a84d06a41468f515bcc..3c1a8aac16dbd2da87ba3c17557594f48bb9a844 100644
--- a/crates/text/src/text.rs
+++ b/crates/text/src/text.rs
@@ -40,7 +40,7 @@ pub struct Buffer {
     snapshot: BufferSnapshot,
     last_edit: clock::Local,
     history: History,
-    selections: HashMap<SelectionSetId, SelectionSet>,
+    selection_sets: HashMap<SelectionSetId, SelectionSet>,
     deferred_ops: OperationQueue,
     deferred_replicas: HashSet<ReplicaId>,
     replica_id: ReplicaId,
@@ -482,7 +482,7 @@ impl Buffer {
             },
             last_edit: clock::Local::default(),
             history,
-            selections: Default::default(),
+            selection_sets: Default::default(),
             deferred_ops: OperationQueue::new(),
             deferred_replicas: HashSet::default(),
             replica_id,
@@ -735,10 +735,10 @@ impl Buffer {
                 selections,
                 lamport_timestamp,
             } => {
-                if let Some(set) = self.selections.get_mut(&set_id) {
+                if let Some(set) = self.selection_sets.get_mut(&set_id) {
                     set.selections = selections;
                 } else {
-                    self.selections.insert(
+                    self.selection_sets.insert(
                         set_id,
                         SelectionSet {
                             id: set_id,
@@ -753,14 +753,14 @@ impl Buffer {
                 set_id,
                 lamport_timestamp,
             } => {
-                self.selections.remove(&set_id);
+                self.selection_sets.remove(&set_id);
                 self.lamport_clock.observe(lamport_timestamp);
             }
             Operation::SetActiveSelections {
                 set_id,
                 lamport_timestamp,
             } => {
-                for (id, set) in &mut self.selections {
+                for (id, set) in &mut self.selection_sets {
                     if id.replica_id == lamport_timestamp.replica_id {
                         if Some(*id) == set_id {
                             set.active = true;
@@ -1063,7 +1063,7 @@ impl Buffer {
                 }
                 Operation::RemoveSelections { .. } => true,
                 Operation::SetActiveSelections { set_id, .. } => {
-                    set_id.map_or(true, |set_id| self.selections.contains_key(&set_id))
+                    set_id.map_or(true, |set_id| self.selection_sets.contains_key(&set_id))
                 }
                 #[cfg(test)]
                 Operation::Test(_) => true,
@@ -1091,7 +1091,7 @@ impl Buffer {
             .into_iter()
             .map(|set_id| {
                 let set = self
-                    .selections
+                    .selection_sets
                     .get(&set_id)
                     .expect("invalid selection set id");
                 (set_id, set.selections.clone())
@@ -1115,7 +1115,7 @@ impl Buffer {
             .into_iter()
             .map(|set_id| {
                 let set = self
-                    .selections
+                    .selection_sets
                     .get(&set_id)
                     .expect("invalid selection set id");
                 (set_id, set.selections.clone())
@@ -1132,7 +1132,7 @@ impl Buffer {
     }
 
     pub fn remove_peer(&mut self, replica_id: ReplicaId) {
-        self.selections
+        self.selection_sets
             .retain(|set_id, _| set_id.replica_id != replica_id)
     }
 
@@ -1194,13 +1194,13 @@ impl Buffer {
     }
 
     pub fn selection_set(&self, set_id: SelectionSetId) -> Result<&SelectionSet> {
-        self.selections
+        self.selection_sets
             .get(&set_id)
             .ok_or_else(|| anyhow!("invalid selection set id {:?}", set_id))
     }
 
     pub fn selection_sets(&self) -> impl Iterator<Item = (&SelectionSetId, &SelectionSet)> {
-        self.selections.iter()
+        self.selection_sets.iter()
     }
 
     fn build_selection_anchor_range_map<T: ToOffset>(
@@ -1231,7 +1231,7 @@ impl Buffer {
     ) -> Result<Operation> {
         let selections = self.build_selection_anchor_range_map(selections);
         let set = self
-            .selections
+            .selection_sets
             .get_mut(&set_id)
             .ok_or_else(|| anyhow!("invalid selection set id {:?}", set_id))?;
         set.selections = selections.clone();
@@ -1248,7 +1248,7 @@ impl Buffer {
         selections: Arc<AnchorRangeMap<SelectionState>>,
     ) -> Result<Operation> {
         let set = self
-            .selections
+            .selection_sets
             .get_mut(&set_id)
             .ok_or_else(|| anyhow!("invalid selection set id {:?}", set_id))?;
         set.selections = selections.clone();
@@ -1262,7 +1262,7 @@ impl Buffer {
     pub fn add_selection_set<T: ToOffset>(&mut self, selections: &[Selection<T>]) -> Operation {
         let selections = self.build_selection_anchor_range_map(selections);
         let set_id = self.lamport_clock.tick();
-        self.selections.insert(
+        self.selection_sets.insert(
             set_id,
             SelectionSet {
                 id: set_id,
@@ -1278,7 +1278,7 @@ impl Buffer {
     }
 
     pub fn add_raw_selection_set(&mut self, id: SelectionSetId, selections: SelectionSet) {
-        self.selections.insert(id, selections);
+        self.selection_sets.insert(id, selections);
     }
 
     pub fn set_active_selection_set(
@@ -1289,7 +1289,7 @@ impl Buffer {
             assert_eq!(set_id.replica_id, self.replica_id());
         }
 
-        for (id, set) in &mut self.selections {
+        for (id, set) in &mut self.selection_sets {
             if id.replica_id == self.local_clock.replica_id {
                 if Some(*id) == set_id {
                     set.active = true;
@@ -1306,7 +1306,7 @@ impl Buffer {
     }
 
     pub fn remove_selection_set(&mut self, set_id: SelectionSetId) -> Result<Operation> {
-        self.selections
+        self.selection_sets
             .remove(&set_id)
             .ok_or_else(|| anyhow!("invalid selection set id {:?}", set_id))?;
         Ok(Operation::RemoveSelections {
@@ -1469,7 +1469,7 @@ impl Buffer {
     where
         D: TextDimension,
     {
-        self.selections
+        self.selection_sets
             .keys()
             .map(move |set_id| (*set_id, self.selection_ranges(*set_id).unwrap()))
     }