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

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

@ -1221,28 +1221,34 @@ impl Buffer {
self.history.ops.values()
}
pub fn undo(&mut self) -> Vec<Operation> {
let mut ops = Vec::new();
pub fn undo(&mut self) -> Option<(TransactionId, Vec<Operation>)> {
if let Some(transaction) = self.history.pop_undo().cloned() {
let transaction_id = transaction.id;
let selections = transaction.selections_before.clone();
let mut ops = Vec::new();
ops.push(self.undo_or_redo(transaction).unwrap());
for (set_id, selections) in selections {
ops.extend(self.restore_selection_set(set_id, selections));
}
Some((transaction_id, ops))
} else {
None
}
ops
}
pub fn redo(&mut self) -> Vec<Operation> {
let mut ops = Vec::new();
pub fn redo(&mut self) -> Option<(TransactionId, Vec<Operation>)> {
if let Some(transaction) = self.history.pop_redo().cloned() {
let transaction_id = transaction.id;
let selections = transaction.selections_after.clone();
let mut ops = Vec::new();
ops.push(self.undo_or_redo(transaction).unwrap());
for (set_id, selections) in selections {
ops.extend(self.restore_selection_set(set_id, selections));
}
Some((transaction_id, ops))
} else {
None
}
ops
}
fn undo_or_redo(&mut self, transaction: Transaction) -> Result<Operation> {