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

Clear multi-buffer redo stack when pushing transaction onto undo stack

Browse source
This commit is contained in:
Antonio Scandurra 2022-05-22 10:44:32 +02:00
parent 03dc7c8eb0
commit 37ca06df53
1 changed files with 12 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

12
crates/editor/src/multi_buffer.rs
View file

@ -2479,6 +2479,7 @@ impl History {
self.undo_stack.pop(); self.undo_stack.pop();
false false
} else { } else {
self.redo_stack.clear();
let transaction = self.undo_stack.last_mut().unwrap(); let transaction = self.undo_stack.last_mut().unwrap();
transaction.last_edit_at = now; transaction.last_edit_at = now;
for (buffer_id, transaction_id) in buffer_transactions { for (buffer_id, transaction_id) in buffer_transactions {
@ -2511,6 +2512,7 @@ impl History {
}; };
if !transaction.buffer_transactions.is_empty() { if !transaction.buffer_transactions.is_empty() {
self.undo_stack.push(transaction); self.undo_stack.push(transaction);
self.redo_stack.clear();
} }
} }
@ -3935,6 +3937,16 @@ mod tests {
buffer_1.update(cx, |buffer_1, cx| buffer_1.redo(cx)); buffer_1.update(cx, |buffer_1, cx| buffer_1.redo(cx));
assert_eq!(multibuffer.read(cx).text(), "ABCD1234\nAB5678"); assert_eq!(multibuffer.read(cx).text(), "ABCD1234\nAB5678");
// Redo stack gets cleared after an edit.
now += 2 * group_interval;
multibuffer.start_transaction_at(now, cx);
multibuffer.edit([(0..0, "X")], cx);
multibuffer.end_transaction_at(now, cx);
assert_eq!(multibuffer.read(cx).text(), "XABCD1234\nAB5678");
multibuffer.redo(cx);
assert_eq!(multibuffer.read(cx).text(), "XABCD1234\nAB5678");
multibuffer.undo(cx);
assert_eq!(multibuffer.read(cx).text(), "ABCD1234\nAB5678");
multibuffer.undo(cx); multibuffer.undo(cx);
assert_eq!(multibuffer.read(cx).text(), "1234\n5678"); assert_eq!(multibuffer.read(cx).text(), "1234\n5678");
}); });