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

Return optional transaction ids from undo/redo

Browse source 
This will allow the editor to restore selections that it associated with the start or end of a transaction.
This commit is contained in:
Nathan Sobo 2021-12-10 18:08:26 -07:00
parent 77defe6e28
commit f35c419f43
3 changed files with 32 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

28
crates/language/src/buffer.rs
View file

@ -1443,26 +1443,34 @@ impl Buffer {
cx.notify();
}
pub fn undo(&mut self, cx: &mut ModelContext<Self>) {
pub fn undo(&mut self, cx: &mut ModelContext<Self>) -> Option<TransactionId> {
let was_dirty = self.is_dirty();
let old_version = self.version.clone();
for operation in self.text.undo() {
self.send_operation(Operation::Buffer(operation), cx);
if let Some((transaction_id, operations)) = self.text.undo() {
for operation in operations {
self.send_operation(Operation::Buffer(operation), cx);
}
self.did_edit(&old_version, was_dirty, cx);
Some(transaction_id)
} else {
None
}
self.did_edit(&old_version, was_dirty, cx);
}
pub fn redo(&mut self, cx: &mut ModelContext<Self>) {
pub fn redo(&mut self, cx: &mut ModelContext<Self>) -> Option<TransactionId> {
let was_dirty = self.is_dirty();
let old_version = self.version.clone();
for operation in self.text.redo() {
self.send_operation(Operation::Buffer(operation), cx);
if let Some((transaction_id, operations)) = self.text.redo() {
for operation in operations {
self.send_operation(Operation::Buffer(operation), cx);
}
self.did_edit(&old_version, was_dirty, cx);
Some(transaction_id)
} else {
None
}
self.did_edit(&old_version, was_dirty, cx);
}
}