mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-01-11 13:10:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Return the transaction id after grouping in end_transaction_at

Browse source 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
This commit is contained in:
Antonio Scandurra 2021-12-14 17:39:40 +01:00
parent 119d44caf7
commit 523cbe781b
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -189,7 +189,7 @@ impl History {
}
}
fn group(&mut self) {
fn group(&mut self) -> Option<TransactionId> {
let mut new_len = self.undo_stack.len();
let mut transactions = self.undo_stack.iter_mut();
@ -221,6 +221,7 @@ impl History {
}
self.undo_stack.truncate(new_len);
self.undo_stack.last().map(|t| t.id)
}
fn push_undo(&mut self, edit_id: clock::Local) {
@ -1081,9 +1082,8 @@ impl Buffer {
pub fn end_transaction_at(&mut self, now: Instant) -> Option<(TransactionId, clock::Global)> {
if let Some(transaction) = self.history.end_transaction(now) {
let id = transaction.id;
let since = transaction.start.clone();
self.history.group();
let id = self.history.group().unwrap();
Some((id, since))
} else {
None