Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

WIP

Browse source
This commit is contained in:
Nathan Sobo 2021-12-08 20:04:30 -07:00
parent 4ee404a0af
commit 98f726974e
3 changed files with 48 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

24
crates/language/src/multi_buffer.rs
View file

@ -12,6 +12,7 @@ use clock::ReplicaId;
use collections::HashMap; use collections::HashMap;
use gpui::{AppContext, Entity, ModelContext, ModelHandle, MutableAppContext, Task}; use gpui::{AppContext, Entity, ModelContext, ModelHandle, MutableAppContext, Task};
use parking_lot::{Mutex, MutexGuard}; use parking_lot::{Mutex, MutexGuard};
use smallvec::SmallVec;
use std::{cmp, io, ops::Range, sync::Arc, time::SystemTime}; use std::{cmp, io, ops::Range, sync::Arc, time::SystemTime};
use sum_tree::{Bias, Cursor, SumTree}; use sum_tree::{Bias, Cursor, SumTree};
use text::{ use text::{
@ -31,6 +32,7 @@ pub struct MultiBuffer {
snapshot: Mutex<MultiBufferSnapshot>, snapshot: Mutex<MultiBufferSnapshot>,
buffers: HashMap<usize, BufferState>, buffers: HashMap<usize, BufferState>,
subscriptions: Topic, subscriptions: Topic,
selection_sets: HashMap<SelectionSetId, SelectionSet>,
} }
pub trait ToOffset: 'static { pub trait ToOffset: 'static {
@ -409,12 +411,30 @@ impl MultiBuffer {
self.snapshot.lock().anchor_at(position, bias) self.snapshot.lock().anchor_at(position, bias)
} }
pub fn anchor_range_set<E>( pub fn anchor_range_map<T, E>(
&self, &self,
start_bias: Bias, start_bias: Bias,
end_bias: Bias, end_bias: Bias,
entries: E, 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 where
E: IntoIterator<Item = Range<usize>>, E: IntoIterator<Item = Range<usize>>,
{ {

14
crates/language/src/multi_buffer/anchor.rs
View file

@ -14,9 +14,9 @@ pub struct Anchor {
text_anchor: text::Anchor, text_anchor: text::Anchor,
} }
#[derive(Clone, Debug, PartialEq, Eq)] #[derive(Clone, Debug, Default, PartialEq, Eq)]
pub struct AnchorRangeMap<T> { 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)] #[derive(Clone, Debug, PartialEq, Eq)]
@ -99,7 +99,7 @@ impl Anchor {
impl<T> AnchorRangeMap<T> { impl<T> AnchorRangeMap<T> {
pub fn len(&self) -> usize { pub fn len(&self) -> usize {
self.entries self.child_maps
.iter() .iter()
.map(|(_, text_map)| text_map.len()) .map(|(_, text_map)| text_map.len())
.sum() .sum()
@ -113,7 +113,7 @@ impl<T> AnchorRangeMap<T> {
D: TextDimension + Clone, D: TextDimension + Clone,
{ {
let mut cursor = snapshot.excerpts.cursor::<ExcerptSummary>(); let mut cursor = snapshot.excerpts.cursor::<ExcerptSummary>();
self.entries self.child_maps
.iter() .iter()
.filter_map(move |(excerpt_id, text_map)| { .filter_map(move |(excerpt_id, text_map)| {
cursor.seek_forward(excerpt_id, Bias::Left, &()); cursor.seek_forward(excerpt_id, Bias::Left, &());
@ -154,14 +154,14 @@ impl<T> AnchorRangeMap<T> {
cursor.seek(&start_offset, start_bias, &()); cursor.seek(&start_offset, start_bias, &());
let start_excerpt_id = &cursor.start().excerpt_id; let start_excerpt_id = &cursor.start().excerpt_id;
let start_ix = match self let start_ix = match self
.entries .child_maps
.binary_search_by_key(&start_excerpt_id, |e| &e.0) .binary_search_by_key(&start_excerpt_id, |e| &e.0)
{ {
Ok(ix) | Err(ix) => ix, Ok(ix) | Err(ix) => ix,
}; };
let mut entry_ranges = None; 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 { std::iter::from_fn(move || loop {
match &mut entry_ranges { match &mut entry_ranges {
None => { None => {
@ -265,7 +265,7 @@ impl<T> AnchorRangeMap<T> {
{ {
let mut cursor = snapshot.excerpts.cursor::<ExcerptSummary>(); let mut cursor = snapshot.excerpts.cursor::<ExcerptSummary>();
let mut max = None; 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, &()); cursor.seek(excerpt_id, Bias::Left, &());
if let Some(excerpt) = cursor.item() { if let Some(excerpt) = cursor.item() {
if excerpt.id == *excerpt_id { if excerpt.id == *excerpt_id {

38
crates/text/src/text.rs
View file

@ -40,7 +40,7 @@ pub struct Buffer {
snapshot: BufferSnapshot, snapshot: BufferSnapshot,
last_edit: clock::Local, last_edit: clock::Local,
history: History, history: History,
selections: HashMap<SelectionSetId, SelectionSet>, selection_sets: HashMap<SelectionSetId, SelectionSet>,
deferred_ops: OperationQueue, deferred_ops: OperationQueue,
deferred_replicas: HashSet<ReplicaId>, deferred_replicas: HashSet<ReplicaId>,
replica_id: ReplicaId, replica_id: ReplicaId,
@ -482,7 +482,7 @@ impl Buffer {
}, },
last_edit: clock::Local::default(), last_edit: clock::Local::default(),
history, history,
selections: Default::default(), selection_sets: Default::default(),
deferred_ops: OperationQueue::new(), deferred_ops: OperationQueue::new(),
deferred_replicas: HashSet::default(), deferred_replicas: HashSet::default(),
replica_id, replica_id,
@ -735,10 +735,10 @@ impl Buffer {
selections, selections,
lamport_timestamp, 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; set.selections = selections;
} else { } else {
self.selections.insert( self.selection_sets.insert(
set_id, set_id,
SelectionSet { SelectionSet {
id: set_id, id: set_id,
@ -753,14 +753,14 @@ impl Buffer {
set_id, set_id,
lamport_timestamp, lamport_timestamp,
} => { } => {
self.selections.remove(&set_id); self.selection_sets.remove(&set_id);
self.lamport_clock.observe(lamport_timestamp); self.lamport_clock.observe(lamport_timestamp);
} }
Operation::SetActiveSelections { Operation::SetActiveSelections {
set_id, set_id,
lamport_timestamp, 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 id.replica_id == lamport_timestamp.replica_id {
if Some(*id) == set_id { if Some(*id) == set_id {
set.active = true; set.active = true;
@ -1063,7 +1063,7 @@ impl Buffer {
} }
Operation::RemoveSelections { .. } => true, Operation::RemoveSelections { .. } => true,
Operation::SetActiveSelections { set_id, .. } => { 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)] #[cfg(test)]
Operation::Test(_) => true, Operation::Test(_) => true,
@ -1091,7 +1091,7 @@ impl Buffer {
.into_iter() .into_iter()
.map(|set_id| { .map(|set_id| {
let set = self let set = self
.selections .selection_sets
.get(&set_id) .get(&set_id)
.expect("invalid selection set id"); .expect("invalid selection set id");
(set_id, set.selections.clone()) (set_id, set.selections.clone())
@ -1115,7 +1115,7 @@ impl Buffer {
.into_iter() .into_iter()
.map(|set_id| { .map(|set_id| {
let set = self let set = self
.selections .selection_sets
.get(&set_id) .get(&set_id)
.expect("invalid selection set id"); .expect("invalid selection set id");
(set_id, set.selections.clone()) (set_id, set.selections.clone())
@ -1132,7 +1132,7 @@ impl Buffer {
} }
pub fn remove_peer(&mut self, replica_id: ReplicaId) { pub fn remove_peer(&mut self, replica_id: ReplicaId) {
self.selections self.selection_sets
.retain(|set_id, _| set_id.replica_id != replica_id) .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> { pub fn selection_set(&self, set_id: SelectionSetId) -> Result<&SelectionSet> {
self.selections self.selection_sets
.get(&set_id) .get(&set_id)
.ok_or_else(|| anyhow!("invalid selection set id {:?}", set_id)) .ok_or_else(|| anyhow!("invalid selection set id {:?}", set_id))
} }
pub fn selection_sets(&self) -> impl Iterator<Item = (&SelectionSetId, &SelectionSet)> { 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>( fn build_selection_anchor_range_map<T: ToOffset>(
@ -1231,7 +1231,7 @@ impl Buffer {
) -> Result<Operation> { ) -> Result<Operation> {
let selections = self.build_selection_anchor_range_map(selections); let selections = self.build_selection_anchor_range_map(selections);
let set = self let set = self
.selections .selection_sets
.get_mut(&set_id) .get_mut(&set_id)
.ok_or_else(|| anyhow!("invalid selection set id {:?}", set_id))?; .ok_or_else(|| anyhow!("invalid selection set id {:?}", set_id))?;
set.selections = selections.clone(); set.selections = selections.clone();
@ -1248,7 +1248,7 @@ impl Buffer {
selections: Arc<AnchorRangeMap<SelectionState>>, selections: Arc<AnchorRangeMap<SelectionState>>,
) -> Result<Operation> { ) -> Result<Operation> {
let set = self let set = self
.selections .selection_sets
.get_mut(&set_id) .get_mut(&set_id)
.ok_or_else(|| anyhow!("invalid selection set id {:?}", set_id))?; .ok_or_else(|| anyhow!("invalid selection set id {:?}", set_id))?;
set.selections = selections.clone(); set.selections = selections.clone();
@ -1262,7 +1262,7 @@ impl Buffer {
pub fn add_selection_set<T: ToOffset>(&mut self, selections: &[Selection<T>]) -> Operation { pub fn add_selection_set<T: ToOffset>(&mut self, selections: &[Selection<T>]) -> Operation {
let selections = self.build_selection_anchor_range_map(selections); let selections = self.build_selection_anchor_range_map(selections);
let set_id = self.lamport_clock.tick(); let set_id = self.lamport_clock.tick();
self.selections.insert( self.selection_sets.insert(
set_id, set_id,
SelectionSet { SelectionSet {
id: set_id, id: set_id,
@ -1278,7 +1278,7 @@ impl Buffer {
} }
pub fn add_raw_selection_set(&mut self, id: SelectionSetId, selections: SelectionSet) { 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( pub fn set_active_selection_set(
@ -1289,7 +1289,7 @@ impl Buffer {
assert_eq!(set_id.replica_id, self.replica_id()); 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 id.replica_id == self.local_clock.replica_id {
if Some(*id) == set_id { if Some(*id) == set_id {
set.active = true; set.active = true;
@ -1306,7 +1306,7 @@ impl Buffer {
} }
pub fn remove_selection_set(&mut self, set_id: SelectionSetId) -> Result<Operation> { pub fn remove_selection_set(&mut self, set_id: SelectionSetId) -> Result<Operation> {
self.selections self.selection_sets
.remove(&set_id) .remove(&set_id)
.ok_or_else(|| anyhow!("invalid selection set id {:?}", set_id))?; .ok_or_else(|| anyhow!("invalid selection set id {:?}", set_id))?;
Ok(Operation::RemoveSelections { Ok(Operation::RemoveSelections {
@ -1469,7 +1469,7 @@ impl Buffer {
where where
D: TextDimension, D: TextDimension,
{ {
self.selections self.selection_sets
.keys() .keys()
.map(move |set_id| (*set_id, self.selection_ranges(*set_id).unwrap())) .map(move |set_id| (*set_id, self.selection_ranges(*set_id).unwrap()))
} }