zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-12-28 17:21:40 +03:00
Code Issues Packages Projects Releases Wiki Activity

Don't push empty transactions onto the undo stack

Browse Source 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
This commit is contained in:
Antonio Scandurra 2021-10-07 16:06:55 +02:00
parent 77af9ef902
commit d36805c464
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
crates/buffer/src/lib.rs
View File

@ -318,10 +318,15 @@ impl History {
assert_ne!(self.transaction_depth, 0);
self.transaction_depth -= 1;
if self.transaction_depth == 0 {
let transaction = self.undo_stack.last_mut().unwrap();
transaction.selections_after = selections;
transaction.last_edit_at = now;
Some(transaction)
if self.undo_stack.last().unwrap().ranges.is_empty() {
self.undo_stack.pop();
None
} else {
let transaction = self.undo_stack.last_mut().unwrap();
transaction.selections_after = selections;
transaction.last_edit_at = now;
Some(transaction)
}
} else {
None
}
@ -3933,6 +3938,11 @@ mod tests {
assert_eq!(buffer.text(), "ab2cde6");
assert_eq!(buffer.selection_ranges(set_id).unwrap(), vec![3..3]);
buffer.start_transaction_at(None, now).unwrap();
buffer.end_transaction_at(None, now, cx).unwrap();
buffer.undo(cx);
assert_eq!(buffer.text(), "12cde6");
buffer
});
}