diff options
author | Blaž Hrastnik | 2022-11-08 12:03:54 +0000 |
---|---|---|
committer | Blaž Hrastnik | 2022-11-08 12:03:54 +0000 |
commit | c94feed83d746e71fb030639d740af85162b0763 (patch) | |
tree | afe451cc4d61415282e063c670dd78f67f10ccc2 /helix-core/src/history.rs | |
parent | 13126823f83cb90a3aabfc2326c0907d1ca2d921 (diff) |
core: Move state into the history module
Diffstat (limited to 'helix-core/src/history.rs')
-rw-r--r-- | helix-core/src/history.rs | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/helix-core/src/history.rs b/helix-core/src/history.rs index 5cd72b07..51174c02 100644 --- a/helix-core/src/history.rs +++ b/helix-core/src/history.rs @@ -1,9 +1,15 @@ -use crate::{Assoc, ChangeSet, Range, Rope, State, Transaction}; +use crate::{Assoc, ChangeSet, Range, Rope, Selection, Transaction}; use once_cell::sync::Lazy; use regex::Regex; use std::num::NonZeroUsize; use std::time::{Duration, Instant}; +#[derive(Debug, Clone)] +pub struct State { + pub doc: Rope, + pub selection: Selection, +} + /// Stores the history of changes to a buffer. /// /// Currently the history is represented as a vector of revisions. The vector @@ -366,12 +372,16 @@ impl std::str::FromStr for UndoKind { #[cfg(test)] mod test { use super::*; + use crate::Selection; #[test] fn test_undo_redo() { let mut history = History::default(); let doc = Rope::from("hello"); - let mut state = State::new(doc); + let mut state = State { + doc, + selection: Selection::point(0), + }; let transaction1 = Transaction::change(&state.doc, vec![(5, 5, Some(" world!".into()))].into_iter()); @@ -420,7 +430,10 @@ mod test { fn test_earlier_later() { let mut history = History::default(); let doc = Rope::from("a\n"); - let mut state = State::new(doc); + let mut state = State { + doc, + selection: Selection::point(0), + }; fn undo(history: &mut History, state: &mut State) { if let Some(transaction) = history.undo() { |