diff options
author | Blaž Hrastnik | 2020-10-04 08:15:43 +0000 |
---|---|---|
committer | Blaž Hrastnik | 2020-10-13 14:13:56 +0000 |
commit | fd311fb8ad8792c8f21ed0bcf56d4a818715d5f7 (patch) | |
tree | d44c2771759605fac1541b2973297af3ce21a8e2 /helix-core | |
parent | 9a73d3f1b97d41aab101262ce72fc3019c4a0f91 (diff) |
Undo tree draft.
We keep a tree of transactions. This allows for persistent undo by
simply serializing the changesets.
Diffstat (limited to 'helix-core')
-rw-r--r-- | helix-core/src/history.rs | 127 | ||||
-rw-r--r-- | helix-core/src/lib.rs | 2 | ||||
-rw-r--r-- | helix-core/src/state.rs | 2 | ||||
-rw-r--r-- | helix-core/src/transaction.rs | 2 |
4 files changed, 131 insertions, 2 deletions
diff --git a/helix-core/src/history.rs b/helix-core/src/history.rs new file mode 100644 index 00000000..8d7164db --- /dev/null +++ b/helix-core/src/history.rs @@ -0,0 +1,127 @@ +use crate::{ChangeSet, Rope, State, Transaction}; + +/// Undo-tree style history store. +pub struct History { + revisions: Vec<Revision>, + cursor: usize, + // +} + +#[derive(Debug)] +struct Revision { + // prev: usize, + parent: usize, + /// The transaction to revert to previous state. + revert: Transaction, + // selection before, selection after? +} + +impl Default for History { + fn default() -> Self { + // Add a dummy root revision with empty transaction + Self { + revisions: vec![Revision { + parent: 0, + revert: Transaction::from(ChangeSet::new(&Rope::new())), + }], + cursor: 0, + } + } +} + +impl History { + pub fn commit_revision(&mut self, transaction: &Transaction, original: &State) { + // TODO: store both directions + // TODO: could store a single set if deletes also stored the text they delete + let revert = transaction.invert(original); + + let new_cursor = self.revisions.len(); + self.revisions.push(Revision { + parent: self.cursor, + revert, + }); + self.cursor = new_cursor; + + // TODO: child tracking too? + } + + #[inline] + pub fn at_root(&self) -> bool { + self.cursor == 0 + } + + pub fn undo(&mut self, state: &mut State) { + if self.at_root() { + // We're at the root of undo, nothing to do. + return; + } + + let current_revision = &self.revisions[self.cursor]; + // unimplemented!("{:?}", revision); + // unimplemented!("{:?}", state.doc().len_chars()); + // TODO: pass the return value through? + let success = current_revision.revert.apply(state); + + if !success { + panic!("Failed to apply undo!"); + } + + self.cursor = current_revision.parent; + } + + pub fn redo(&mut self, state: &mut State) { + let current_revision = &self.revisions[self.cursor]; + + // TODO: pick the latest child + + // if !success { + // panic!("Failed to apply undo!"); + // } + + unimplemented!() + } +} + +#[cfg(test)] +mod test { + use super::*; + + #[test] + fn test_undo_redo() { + let mut history = History::default(); + let doc = Rope::from("hello"); + let mut state = State::new(doc); + + let transaction1 = + Transaction::change(&state, vec![(5, 5, Some(" world!".into()))].into_iter()); + + // Need to commit before applying! + history.commit_revision(&transaction1, &state); + transaction1.apply(&mut state); + assert_eq!("hello world!", state.doc()); + + // --- + + let transaction2 = + Transaction::change(&state, vec![(6, 11, Some("世界".into()))].into_iter()); + + // Need to commit before applying! + history.commit_revision(&transaction2, &state); + transaction2.apply(&mut state); + assert_eq!("hello 世界!", state.doc()); + + // --- + + history.undo(&mut state); + assert_eq!("hello world!", state.doc()); + history.redo(&mut state); + assert_eq!("hello 世界!", state.doc()); + history.undo(&mut state); + history.undo(&mut state); + assert_eq!("hello", state.doc()); + + // undo at root is a no-op + history.undo(&mut state); + assert_eq!("hello", state.doc()); + } +} diff --git a/helix-core/src/lib.rs b/helix-core/src/lib.rs index 0f58fbbc..9bc5d003 100644 --- a/helix-core/src/lib.rs +++ b/helix-core/src/lib.rs @@ -1,5 +1,6 @@ #![allow(unused)] pub mod graphemes; +mod history; pub mod macros; mod position; pub mod selection; @@ -19,6 +20,7 @@ pub use selection::Range; pub use selection::Selection; pub use syntax::Syntax; +pub use history::History; pub use state::State; pub use transaction::{Assoc, Change, ChangeSet, Transaction}; diff --git a/helix-core/src/state.rs b/helix-core/src/state.rs index 047ff83d..9d51c8c5 100644 --- a/helix-core/src/state.rs +++ b/helix-core/src/state.rs @@ -48,8 +48,8 @@ impl State { doc, selection: Selection::single(0, 0), mode: Mode::Normal, - syntax: None, restore_cursor: false, + syntax: None, } } diff --git a/helix-core/src/transaction.rs b/helix-core/src/transaction.rs index 14cb1c41..d6b151ba 100644 --- a/helix-core/src/transaction.rs +++ b/helix-core/src/transaction.rs @@ -338,7 +338,7 @@ impl ChangeSet { /// Transaction represents a single undoable unit of changes. Several changes can be grouped into /// a single transaction. -#[derive(Clone)] +#[derive(Debug, Clone)] pub struct Transaction { /// Changes made to the buffer. pub(crate) changes: ChangeSet, |