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

Avoid grouping transactions created by different editors

Browse source 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
This commit is contained in:
Antonio Scandurra 2022-01-27 15:51:46 +01:00
parent adf00fafdf
commit f055053fc9
5 changed files with 61 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -72,6 +72,7 @@ pub struct Transaction {
ranges: Vec<Range<FullOffset>>,
first_edit_at: Instant,
last_edit_at: Instant,
suppress_grouping: bool,
}
impl Transaction {
@ -164,6 +165,7 @@ impl History {
ranges: Vec::new(),
first_edit_at: now,
last_edit_at: now,
suppress_grouping: false,
});
Some(id)
} else {
@ -194,7 +196,9 @@ impl History {
if let Some(mut transaction) = transactions.next_back() {
while let Some(prev_transaction) = transactions.next_back() {
if transaction.first_edit_at - prev_transaction.last_edit_at <= self.group_interval
if !prev_transaction.suppress_grouping
&& transaction.first_edit_at - prev_transaction.last_edit_at
<= self.group_interval
&& transaction.start == prev_transaction.end
{
transaction = prev_transaction;
@ -223,6 +227,12 @@ impl History {
self.undo_stack.last().map(|t| t.id)
}
fn avoid_grouping_next_transaction(&mut self) {
if let Some(transaction) = self.undo_stack.last_mut() {
transaction.suppress_grouping = true;
}
}
fn push_undo(&mut self, edit_id: clock::Local) {
assert_ne!(self.transaction_depth, 0);
let last_transaction = self.undo_stack.last_mut().unwrap();
@ -1157,6 +1167,10 @@ impl Buffer {
}
}
pub fn avoid_grouping_next_transaction(&mut self) {
self.history.avoid_grouping_next_transaction()
}
pub fn base_text(&self) -> &Arc<str> {
&self.history.base_text
}