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

Move operation serialization off the main thread

Browse source
This commit is contained in:
Antonio Scandurra 2022-08-23 16:34:25 +02:00
parent 954695f5fe
commit f0d35ccc50
5 changed files with 57 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -45,7 +45,7 @@ use std::{
};
pub use subscription::*;
pub use sum_tree::Bias;
use sum_tree::{FilterCursor, SumTree};
use sum_tree::{FilterCursor, SumTree, TreeMap};
lazy_static! {
static ref CARRIAGE_RETURNS_REGEX: Regex = Regex::new("\r\n|\r").unwrap();
@ -109,7 +109,7 @@ impl HistoryEntry {
struct History {
// TODO: Turn this into a String or Rope, maybe.
base_text: Arc<str>,
operations: HashMap<clock::Local, Operation>,
operations: TreeMap<clock::Local, Operation>,
insertion_slices: HashMap<clock::Local, Vec<InsertionSlice>>,
undo_stack: Vec<HistoryEntry>,
redo_stack: Vec<HistoryEntry>,
@ -1213,8 +1213,8 @@ impl Buffer {
&self.history.base_text
}
pub fn history(&self) -> impl Iterator<Item = &Operation> {
self.history.operations.values()
pub fn operations(&self) -> &TreeMap<clock::Local, Operation> {
&self.history.operations
}
pub fn undo_history(&self) -> impl Iterator<Item = (&clock::Local, &[(clock::Local, u32)])> {