mirror of
https://github.com/zed-industries/zed.git
synced 2024-09-19 18:41:56 +03:00
Implement ExcerptList::subscribe
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
This commit is contained in:
parent
a02a29944c
commit
4578938ea1
@ -28,6 +28,7 @@ use std::{
|
|||||||
time::{Duration, Instant, SystemTime, UNIX_EPOCH},
|
time::{Duration, Instant, SystemTime, UNIX_EPOCH},
|
||||||
vec,
|
vec,
|
||||||
};
|
};
|
||||||
|
use text::subscription::Subscription;
|
||||||
pub use text::{Buffer as TextBuffer, Operation as _, *};
|
pub use text::{Buffer as TextBuffer, Operation as _, *};
|
||||||
use theme::SyntaxTheme;
|
use theme::SyntaxTheme;
|
||||||
use tree_sitter::{InputEdit, Parser, QueryCursor, Tree};
|
use tree_sitter::{InputEdit, Parser, QueryCursor, Tree};
|
||||||
|
@ -1,12 +1,14 @@
|
|||||||
use crate::{buffer, Buffer, Chunk};
|
use crate::{buffer, Buffer, Chunk};
|
||||||
use collections::HashMap;
|
use collections::HashMap;
|
||||||
use gpui::{AppContext, Entity, ModelContext, ModelHandle};
|
use gpui::{AppContext, Entity, ModelContext, ModelHandle};
|
||||||
use lsp::TextDocumentSaveReason;
|
|
||||||
use parking_lot::Mutex;
|
use parking_lot::Mutex;
|
||||||
use smallvec::{smallvec, SmallVec};
|
use smallvec::{smallvec, SmallVec};
|
||||||
use std::{cmp, iter, mem, ops::Range};
|
use std::{cmp, iter, ops::Range};
|
||||||
use sum_tree::{Bias, Cursor, SumTree};
|
use sum_tree::{Bias, Cursor, SumTree};
|
||||||
use text::{Anchor, AnchorRangeExt, Patch, TextSummary};
|
use text::{
|
||||||
|
subscription::{Subscription, Topic},
|
||||||
|
Anchor, AnchorRangeExt, Edit, Patch, TextSummary,
|
||||||
|
};
|
||||||
use theme::SyntaxTheme;
|
use theme::SyntaxTheme;
|
||||||
|
|
||||||
const NEWLINES: &'static [u8] = &[b'\n'; u8::MAX as usize];
|
const NEWLINES: &'static [u8] = &[b'\n'; u8::MAX as usize];
|
||||||
@ -21,6 +23,7 @@ pub type ExcerptId = Location;
|
|||||||
pub struct ExcerptList {
|
pub struct ExcerptList {
|
||||||
snapshot: Mutex<Snapshot>,
|
snapshot: Mutex<Snapshot>,
|
||||||
buffers: HashMap<usize, BufferState>,
|
buffers: HashMap<usize, BufferState>,
|
||||||
|
subscriptions: Topic,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug)]
|
#[derive(Debug)]
|
||||||
@ -77,6 +80,10 @@ impl ExcerptList {
|
|||||||
self.snapshot.lock().clone()
|
self.snapshot.lock().clone()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn subscribe(&mut self) -> Subscription {
|
||||||
|
self.subscriptions.subscribe()
|
||||||
|
}
|
||||||
|
|
||||||
pub fn push<O>(&mut self, props: ExcerptProperties<O>, cx: &mut ModelContext<Self>) -> ExcerptId
|
pub fn push<O>(&mut self, props: ExcerptProperties<O>, cx: &mut ModelContext<Self>) -> ExcerptId
|
||||||
where
|
where
|
||||||
O: text::ToOffset,
|
O: text::ToOffset,
|
||||||
@ -89,10 +96,13 @@ impl ExcerptList {
|
|||||||
let prev_id = snapshot.excerpts.last().map(|e| &e.id);
|
let prev_id = snapshot.excerpts.last().map(|e| &e.id);
|
||||||
let id = ExcerptId::between(prev_id.unwrap_or(&ExcerptId::min()), &ExcerptId::max());
|
let id = ExcerptId::between(prev_id.unwrap_or(&ExcerptId::min()), &ExcerptId::max());
|
||||||
|
|
||||||
snapshot.excerpts.push(
|
let edit_start = snapshot.excerpts.summary().text.bytes;
|
||||||
Excerpt::new(id.clone(), buffer.snapshot(), range, props.header_height),
|
let excerpt = Excerpt::new(id.clone(), buffer.snapshot(), range, props.header_height);
|
||||||
&(),
|
let edit = Edit {
|
||||||
);
|
old: edit_start..edit_start,
|
||||||
|
new: edit_start..edit_start + excerpt.text_summary.bytes,
|
||||||
|
};
|
||||||
|
snapshot.excerpts.push(excerpt, &());
|
||||||
self.buffers
|
self.buffers
|
||||||
.entry(props.buffer.id())
|
.entry(props.buffer.id())
|
||||||
.or_insert_with(|| BufferState {
|
.or_insert_with(|| BufferState {
|
||||||
@ -103,6 +113,8 @@ impl ExcerptList {
|
|||||||
.excerpts
|
.excerpts
|
||||||
.push(id.clone());
|
.push(id.clone());
|
||||||
|
|
||||||
|
self.subscriptions.publish_mut([edit]);
|
||||||
|
|
||||||
id
|
id
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -126,8 +138,6 @@ impl ExcerptList {
|
|||||||
}
|
}
|
||||||
excerpts_to_edit.sort_unstable_by_key(|(excerpt_id, _)| *excerpt_id);
|
excerpts_to_edit.sort_unstable_by_key(|(excerpt_id, _)| *excerpt_id);
|
||||||
|
|
||||||
dbg!(&excerpts_to_edit);
|
|
||||||
|
|
||||||
let mut patch = Patch::<usize>::default();
|
let mut patch = Patch::<usize>::default();
|
||||||
let mut new_excerpts = SumTree::new();
|
let mut new_excerpts = SumTree::new();
|
||||||
let mut cursor = snapshot.excerpts.cursor::<(ExcerptId, usize)>();
|
let mut cursor = snapshot.excerpts.cursor::<(ExcerptId, usize)>();
|
||||||
@ -168,6 +178,8 @@ impl ExcerptList {
|
|||||||
|
|
||||||
drop(cursor);
|
drop(cursor);
|
||||||
snapshot.excerpts = new_excerpts;
|
snapshot.excerpts = new_excerpts;
|
||||||
|
|
||||||
|
self.subscriptions.publish(&patch);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -357,12 +369,11 @@ impl Location {
|
|||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
mod tests {
|
mod tests {
|
||||||
use std::env;
|
|
||||||
|
|
||||||
use super::*;
|
use super::*;
|
||||||
use crate::Buffer;
|
use crate::Buffer;
|
||||||
use gpui::MutableAppContext;
|
use gpui::MutableAppContext;
|
||||||
use rand::prelude::*;
|
use rand::prelude::*;
|
||||||
|
use std::{env, mem};
|
||||||
use text::{Point, RandomCharIter};
|
use text::{Point, RandomCharIter};
|
||||||
use util::test::sample_text;
|
use util::test::sample_text;
|
||||||
|
|
||||||
@ -371,12 +382,10 @@ mod tests {
|
|||||||
let buffer_1 = cx.add_model(|cx| Buffer::new(0, sample_text(6, 6, 'a'), cx));
|
let buffer_1 = cx.add_model(|cx| Buffer::new(0, sample_text(6, 6, 'a'), cx));
|
||||||
let buffer_2 = cx.add_model(|cx| Buffer::new(0, sample_text(6, 6, 'g'), cx));
|
let buffer_2 = cx.add_model(|cx| Buffer::new(0, sample_text(6, 6, 'g'), cx));
|
||||||
|
|
||||||
let list = cx.add_model(|cx| {
|
let list = cx.add_model(|cx| ExcerptList::new());
|
||||||
let mut list = ExcerptList::new();
|
|
||||||
// aaaaaa
|
let subscription = list.update(cx, |list, cx| {
|
||||||
// bbbbbb
|
let subscription = list.subscribe();
|
||||||
// cccccc
|
|
||||||
// dddddd
|
|
||||||
list.push(
|
list.push(
|
||||||
ExcerptProperties {
|
ExcerptProperties {
|
||||||
buffer: &buffer_1,
|
buffer: &buffer_1,
|
||||||
@ -385,6 +394,14 @@ mod tests {
|
|||||||
},
|
},
|
||||||
cx,
|
cx,
|
||||||
);
|
);
|
||||||
|
assert_eq!(
|
||||||
|
subscription.consume().into_inner(),
|
||||||
|
[Edit {
|
||||||
|
old: 0..0,
|
||||||
|
new: 0..12
|
||||||
|
}]
|
||||||
|
);
|
||||||
|
|
||||||
list.push(
|
list.push(
|
||||||
ExcerptProperties {
|
ExcerptProperties {
|
||||||
buffer: &buffer_1,
|
buffer: &buffer_1,
|
||||||
@ -401,7 +418,15 @@ mod tests {
|
|||||||
},
|
},
|
||||||
cx,
|
cx,
|
||||||
);
|
);
|
||||||
list
|
assert_eq!(
|
||||||
|
subscription.consume().into_inner(),
|
||||||
|
[Edit {
|
||||||
|
old: 12..12,
|
||||||
|
new: 12..26
|
||||||
|
}]
|
||||||
|
);
|
||||||
|
|
||||||
|
subscription
|
||||||
});
|
});
|
||||||
|
|
||||||
assert_eq!(
|
assert_eq!(
|
||||||
@ -425,7 +450,7 @@ mod tests {
|
|||||||
buffer.edit(
|
buffer.edit(
|
||||||
[
|
[
|
||||||
Point::new(0, 0)..Point::new(0, 0),
|
Point::new(0, 0)..Point::new(0, 0),
|
||||||
Point::new(2, 1)..Point::new(2, 2),
|
Point::new(2, 1)..Point::new(2, 3),
|
||||||
],
|
],
|
||||||
"\n",
|
"\n",
|
||||||
cx,
|
cx,
|
||||||
@ -439,7 +464,7 @@ mod tests {
|
|||||||
"\n", //
|
"\n", //
|
||||||
"bbbb\n", //
|
"bbbb\n", //
|
||||||
"c\n", //
|
"c\n", //
|
||||||
"ccc\n", //
|
"cc\n", //
|
||||||
"\n", //
|
"\n", //
|
||||||
"ddd\n", //
|
"ddd\n", //
|
||||||
"eeee\n", //
|
"eeee\n", //
|
||||||
@ -449,6 +474,14 @@ mod tests {
|
|||||||
"jj" //
|
"jj" //
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
|
|
||||||
|
assert_eq!(
|
||||||
|
subscription.consume().into_inner(),
|
||||||
|
[Edit {
|
||||||
|
old: 17..19,
|
||||||
|
new: 17..18
|
||||||
|
}]
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
#[gpui::test(iterations = 100)]
|
#[gpui::test(iterations = 100)]
|
||||||
|
@ -210,6 +210,15 @@ impl<'a, T: Clone> IntoIterator for &'a Patch<T> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
impl<'a, T: Clone> IntoIterator for &'a mut Patch<T> {
|
||||||
|
type Item = Edit<T>;
|
||||||
|
type IntoIter = std::iter::Cloned<std::slice::Iter<'a, Edit<T>>>;
|
||||||
|
|
||||||
|
fn into_iter(self) -> Self::IntoIter {
|
||||||
|
self.0.iter().cloned()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
mod tests {
|
mod tests {
|
||||||
use super::*;
|
use super::*;
|
||||||
|
48
crates/text/src/subscription.rs
Normal file
48
crates/text/src/subscription.rs
Normal file
@ -0,0 +1,48 @@
|
|||||||
|
use crate::{Edit, Patch};
|
||||||
|
use parking_lot::Mutex;
|
||||||
|
use std::{
|
||||||
|
mem,
|
||||||
|
sync::{Arc, Weak},
|
||||||
|
};
|
||||||
|
|
||||||
|
#[derive(Default)]
|
||||||
|
pub struct Topic(Mutex<Vec<Weak<Mutex<Patch<usize>>>>>);
|
||||||
|
|
||||||
|
pub struct Subscription(Arc<Mutex<Patch<usize>>>);
|
||||||
|
|
||||||
|
impl Topic {
|
||||||
|
pub fn subscribe(&mut self) -> Subscription {
|
||||||
|
let subscription = Subscription(Default::default());
|
||||||
|
self.0.get_mut().push(Arc::downgrade(&subscription.0));
|
||||||
|
subscription
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn publish(&self, edits: impl Clone + IntoIterator<Item = Edit<usize>>) {
|
||||||
|
publish(&mut *self.0.lock(), edits);
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn publish_mut(&mut self, edits: impl Clone + IntoIterator<Item = Edit<usize>>) {
|
||||||
|
publish(self.0.get_mut(), edits);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Subscription {
|
||||||
|
pub fn consume(&self) -> Patch<usize> {
|
||||||
|
mem::take(&mut *self.0.lock())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn publish(
|
||||||
|
subscriptions: &mut Vec<Weak<Mutex<Patch<usize>>>>,
|
||||||
|
edits: impl Clone + IntoIterator<Item = Edit<usize>>,
|
||||||
|
) {
|
||||||
|
subscriptions.retain(|subscription| {
|
||||||
|
if let Some(subscription) = subscription.upgrade() {
|
||||||
|
let mut patch = subscription.lock();
|
||||||
|
*patch = patch.compose(edits.clone());
|
||||||
|
true
|
||||||
|
} else {
|
||||||
|
false
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
@ -7,6 +7,7 @@ mod point_utf16;
|
|||||||
pub mod random_char_iter;
|
pub mod random_char_iter;
|
||||||
pub mod rope;
|
pub mod rope;
|
||||||
mod selection;
|
mod selection;
|
||||||
|
pub mod subscription;
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
mod tests;
|
mod tests;
|
||||||
|
|
||||||
@ -15,7 +16,6 @@ use anyhow::{anyhow, Result};
|
|||||||
use clock::ReplicaId;
|
use clock::ReplicaId;
|
||||||
use collections::{HashMap, HashSet};
|
use collections::{HashMap, HashSet};
|
||||||
use operation_queue::OperationQueue;
|
use operation_queue::OperationQueue;
|
||||||
use parking_lot::Mutex;
|
|
||||||
pub use patch::Patch;
|
pub use patch::Patch;
|
||||||
pub use point::*;
|
pub use point::*;
|
||||||
pub use point_utf16::*;
|
pub use point_utf16::*;
|
||||||
@ -29,9 +29,10 @@ use std::{
|
|||||||
iter::Iterator,
|
iter::Iterator,
|
||||||
ops::{self, Deref, Range, Sub},
|
ops::{self, Deref, Range, Sub},
|
||||||
str,
|
str,
|
||||||
sync::{Arc, Weak},
|
sync::Arc,
|
||||||
time::{Duration, Instant},
|
time::{Duration, Instant},
|
||||||
};
|
};
|
||||||
|
use subscription::{Subscription, Topic};
|
||||||
pub use sum_tree::Bias;
|
pub use sum_tree::Bias;
|
||||||
use sum_tree::{FilterCursor, SumTree};
|
use sum_tree::{FilterCursor, SumTree};
|
||||||
|
|
||||||
@ -46,7 +47,7 @@ pub struct Buffer {
|
|||||||
remote_id: u64,
|
remote_id: u64,
|
||||||
local_clock: clock::Local,
|
local_clock: clock::Local,
|
||||||
lamport_clock: clock::Lamport,
|
lamport_clock: clock::Lamport,
|
||||||
subscriptions: Vec<Weak<Mutex<Vec<Patch<usize>>>>>,
|
subscriptions: Topic,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Clone, Debug)]
|
#[derive(Clone, Debug)]
|
||||||
@ -343,20 +344,6 @@ impl<D1, D2> Edit<(D1, D2)> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Clone, Default)]
|
|
||||||
pub struct Subscription(Arc<Mutex<Vec<Patch<usize>>>>);
|
|
||||||
|
|
||||||
impl Subscription {
|
|
||||||
pub fn consume(&self) -> Patch<usize> {
|
|
||||||
let mut patches = self.0.lock();
|
|
||||||
let mut changes = Patch::default();
|
|
||||||
for patch in patches.drain(..) {
|
|
||||||
changes = changes.compose(&patch);
|
|
||||||
}
|
|
||||||
changes
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Copy, Clone, Debug, Default, Eq, PartialEq)]
|
#[derive(Copy, Clone, Debug, Default, Eq, PartialEq)]
|
||||||
pub struct InsertionTimestamp {
|
pub struct InsertionTimestamp {
|
||||||
pub replica_id: ReplicaId,
|
pub replica_id: ReplicaId,
|
||||||
@ -699,7 +686,7 @@ impl Buffer {
|
|||||||
self.snapshot.fragments = new_fragments;
|
self.snapshot.fragments = new_fragments;
|
||||||
self.snapshot.visible_text = visible_text;
|
self.snapshot.visible_text = visible_text;
|
||||||
self.snapshot.deleted_text = deleted_text;
|
self.snapshot.deleted_text = deleted_text;
|
||||||
self.update_subscriptions(edits);
|
self.subscriptions.publish_mut(&edits);
|
||||||
edit_op.new_text = new_text;
|
edit_op.new_text = new_text;
|
||||||
edit_op
|
edit_op
|
||||||
}
|
}
|
||||||
@ -955,7 +942,7 @@ impl Buffer {
|
|||||||
self.snapshot.deleted_text = deleted_text;
|
self.snapshot.deleted_text = deleted_text;
|
||||||
self.local_clock.observe(timestamp.local());
|
self.local_clock.observe(timestamp.local());
|
||||||
self.lamport_clock.observe(timestamp.lamport());
|
self.lamport_clock.observe(timestamp.lamport());
|
||||||
self.update_subscriptions(edits);
|
self.subscriptions.publish_mut(&edits);
|
||||||
}
|
}
|
||||||
|
|
||||||
fn apply_undo(&mut self, undo: &UndoOperation) -> Result<()> {
|
fn apply_undo(&mut self, undo: &UndoOperation) -> Result<()> {
|
||||||
@ -1045,7 +1032,7 @@ impl Buffer {
|
|||||||
self.snapshot.fragments = new_fragments;
|
self.snapshot.fragments = new_fragments;
|
||||||
self.snapshot.visible_text = visible_text;
|
self.snapshot.visible_text = visible_text;
|
||||||
self.snapshot.deleted_text = deleted_text;
|
self.snapshot.deleted_text = deleted_text;
|
||||||
self.update_subscriptions(edits);
|
self.subscriptions.publish_mut(&edits);
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1203,20 +1190,7 @@ impl Buffer {
|
|||||||
}
|
}
|
||||||
|
|
||||||
pub fn subscribe(&mut self) -> Subscription {
|
pub fn subscribe(&mut self) -> Subscription {
|
||||||
let subscription = Subscription(Default::default());
|
self.subscriptions.subscribe()
|
||||||
self.subscriptions.push(Arc::downgrade(&subscription.0));
|
|
||||||
subscription
|
|
||||||
}
|
|
||||||
|
|
||||||
fn update_subscriptions(&mut self, edits: Patch<usize>) {
|
|
||||||
self.subscriptions.retain(|subscription| {
|
|
||||||
if let Some(subscription) = subscription.upgrade() {
|
|
||||||
subscription.lock().push(edits.clone());
|
|
||||||
true
|
|
||||||
} else {
|
|
||||||
false
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn selection_set(&self, set_id: SelectionSetId) -> Result<&SelectionSet> {
|
pub fn selection_set(&self, set_id: SelectionSetId) -> Result<&SelectionSet> {
|
||||||
|
Loading…
Reference in New Issue
Block a user