TudbuT/helix-mods
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

history.redo()

Browse source
This commit is contained in:
Blaž Hrastnik 2020-10-05 16:12:36 +09:00
parent 8c7bc71ede
commit 04b1546634
1 changed files with 23 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
helix-core/src/history.rs
View file

@ -1,16 +1,16 @@
use crate::{ChangeSet, Rope, State, Transaction}; use crate::{ChangeSet, Rope, State, Transaction};
use smallvec::{smallvec, SmallVec};
/// Undo-tree style history store. /// Undo-tree style history store.
pub struct History { pub struct History {
revisions: Vec<Revision>, revisions: Vec<Revision>,
cursor: usize, cursor: usize,
//
} }
#[derive(Debug)] #[derive(Debug)]
struct Revision { struct Revision {
// prev: usize,
parent: usize, parent: usize,
children: SmallVec<[(usize, Transaction); 1]>,
/// The transaction to revert to previous state. /// The transaction to revert to previous state.
revert: Transaction, revert: Transaction,
// selection before, selection after? // selection before, selection after?
@ -22,6 +22,7 @@ impl Default for History {
Self { Self {
revisions: vec![Revision { revisions: vec![Revision {
parent: 0, parent: 0,
children: SmallVec::new(),
revert: Transaction::from(ChangeSet::new(&Rope::new())), revert: Transaction::from(ChangeSet::new(&Rope::new())),
}], }],
cursor: 0, cursor: 0,
@ -31,18 +32,24 @@ impl Default for History {
impl History { impl History {
pub fn commit_revision(&mut self, transaction: &Transaction, original: &State) { pub fn commit_revision(&mut self, transaction: &Transaction, original: &State) {
// TODO: store both directions // TODO: could store a single transaction, if deletes also stored the text they delete
// TODO: could store a single set if deletes also stored the text they delete
let revert = transaction.invert(original); let revert = transaction.invert(original);
let new_cursor = self.revisions.len(); let new_cursor = self.revisions.len();
self.revisions.push(Revision { self.revisions.push(Revision {
parent: self.cursor, parent: self.cursor,
children: SmallVec::new(),
revert, revert,
}); });
self.cursor = new_cursor;
// TODO: child tracking too? // add a reference to the parent
self.revisions
.get_mut(self.cursor)
.unwrap() // TODO: get_unchecked_mut
.children
.push((new_cursor, transaction.clone()));
self.cursor = new_cursor;
} }
#[inline] #[inline]
@ -57,9 +64,8 @@ impl History {
} }
let current_revision = &self.revisions[self.cursor]; let current_revision = &self.revisions[self.cursor];
// unimplemented!("{:?}", revision);
// unimplemented!("{:?}", state.doc().len_chars()); // TODO: pass the return value through? It should always succeed
// TODO: pass the return value through?
let success = current_revision.revert.apply(state); let success = current_revision.revert.apply(state);
if !success { if !success {
@ -72,13 +78,16 @@ impl History {
pub fn redo(&mut self, state: &mut State) { pub fn redo(&mut self, state: &mut State) {
let current_revision = &self.revisions[self.cursor]; let current_revision = &self.revisions[self.cursor];
// TODO: pick the latest child // for now, simply pick the latest child (linear undo / redo)
if let Some((index, transaction)) = current_revision.children.last() {
let success = transaction.apply(state);
// if !success { if !success {
// panic!("Failed to apply undo!"); panic!("Failed to apply redo!");
// } }
unimplemented!() self.cursor = *index;
}
} }
} }