From 39336fe844fc2f148fc60cf7453a6cb1bca7deed Mon Sep 17 00:00:00 2001 From: aiongg Date: Mon, 26 Oct 2026 19:50:57 +0000 Subject: [PATCH] refactor(engine): move session::snapshot_types to the crate root as snapshot --- crates/engine/src/lib.rs | 1 + crates/engine/src/session.rs | 4 ++-- .../engine/src/{session/snapshot_types.rs => snapshot.rs} | 7 +++++-- 3 files changed, 8 insertions(+), 4 deletions(-) rename crates/engine/src/{session/snapshot_types.rs => snapshot.rs} (94%) diff --git a/crates/engine/src/lib.rs b/crates/engine/src/lib.rs index 223f2ba90..b456abcd8 100644 --- a/crates/engine/src/lib.rs +++ b/crates/engine/src/lib.rs @@ -21,6 +21,7 @@ pub mod recovery; pub mod ribbon; pub mod sample; mod session; +pub(crate) mod snapshot; pub mod speech; pub(crate) mod view; diff --git a/crates/engine/src/session.rs b/crates/engine/src/session.rs index 459b1b8d3..5a2a58ac3 100644 --- a/crates/engine/src/session.rs +++ b/crates/engine/src/session.rs @@ -6,7 +6,7 @@ use serde_json::Value; use wordcraft_doc::edit::Fragment; use wordcraft_doc::props::CharProps; use wordcraft_doc::{Document, PartKind, Path, Pos, StoryRef}; -use wordcraft_layout::{DocLayout, LayoutCache, LayoutOptions, NumeralMode, ViewMode}; +use wordcraft_layout::{DocLayout, LayoutCache, LayoutOptions, ViewMode}; use crate::{CmdError, ImeEditOutcome, Registry}; @@ -23,11 +23,11 @@ mod lifecycle; mod query; mod run; mod snapshot; -mod snapshot_types; use crate::doc_state; use crate::locale; use crate::prefs; +use crate::snapshot as snapshot_types; use crate::view; pub(crate) use doc_state::Widened; pub use doc_state::{CellRange, ColumnBlock, FindState, MathEdit, Selection, UNDO_LIST_MAX, next_math_session}; diff --git a/crates/engine/src/session/snapshot_types.rs b/crates/engine/src/snapshot.rs similarity index 94% rename from crates/engine/src/session/snapshot_types.rs rename to crates/engine/src/snapshot.rs index a0709106b..72f0b6a55 100644 --- a/crates/engine/src/session/snapshot_types.rs +++ b/crates/engine/src/snapshot.rs @@ -1,5 +1,8 @@ -use super::doc_state::{ColumnBlock, Selection, Undo}; -use super::*; +use crate::doc_state::{ColumnBlock, Selection, Undo}; +use std::sync::Arc; + +use wordcraft_doc::Document; +use wordcraft_layout::{DocLayout, NumeralMode, ViewMode}; /// What [`Session::restore`] needs to take commands back exactly: the document, the selection, /// the undo and redo stacks (also the oldest undo steps the undo limit pushes out meanwhile), the