diff --git a/crates/engine/src/session/ime_state.rs b/crates/engine/src/ime.rs similarity index 98% rename from crates/engine/src/session/ime_state.rs rename to crates/engine/src/ime.rs index 01c148d219..f5f86c7885 100644 --- a/crates/engine/src/session/ime_state.rs +++ b/crates/engine/src/ime.rs @@ -1,6 +1,8 @@ -use super::doc_state::Selection; +use crate::doc_state::Selection; #[cfg(test)] -use super::*; +use crate::session::*; +#[cfg(test)] +use wordcraft_doc::{Document, Pos}; /// The caret identity used for the process-monotonic IME state revision. #[derive(Clone, Debug, PartialEq, Eq)] diff --git a/crates/engine/src/lib.rs b/crates/engine/src/lib.rs index b456abcd88..529ce06485 100644 --- a/crates/engine/src/lib.rs +++ b/crates/engine/src/lib.rs @@ -10,6 +10,7 @@ pub mod catalog; pub mod cmd; pub(crate) mod doc_state; pub mod file_access; +pub(crate) mod ime; pub mod io; mod io_ext; pub mod keymap; diff --git a/crates/engine/src/session.rs b/crates/engine/src/session.rs index 5a2a58ac39..86898641d4 100644 --- a/crates/engine/src/session.rs +++ b/crates/engine/src/session.rs @@ -17,7 +17,6 @@ use documents::{document_id_mark, next_document_id, untitled_name}; pub use views::WindowView; mod history; mod ime; -mod ime_state; mod layout; mod lifecycle; mod query; @@ -25,6 +24,7 @@ mod run; mod snapshot; use crate::doc_state; +use crate::ime as ime_state; use crate::locale; use crate::prefs; use crate::snapshot as snapshot_types;