Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 21 additions & 2 deletions src/editor/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -408,7 +408,6 @@ impl Editor {
pub fn cancel_selecting(&mut self) -> Result<(), EditorError> {
if self.is_selecting() {
self.shared.cancel_selecting();
self.shared.last_key_behavior = EditorKeyBehavior::Absorb;
self.state = Box::new(Entering);
Ok(())
} else {
Expand All @@ -417,7 +416,6 @@ impl Editor {
}
pub fn cancel_entering_syllable(&mut self) {
self.shared.syl.clear();
self.shared.last_key_behavior = EditorKeyBehavior::Absorb;
self.state = Box::new(Entering);
}
pub fn last_key_behavior(&self) -> EditorKeyBehavior {
Expand Down Expand Up @@ -1599,6 +1597,7 @@ mod tests {
use super::collect_new_phrases;
use super::estimate::LaxUserFreqEstimate;
use super::{BasicEditor, Editor};
use crate::editor::LanguageMode;
use crate::{
conversion::{ChewingEngine, Interval, Symbol},
dictionary::{Layered, TrieBuf},
Expand Down Expand Up @@ -1871,6 +1870,26 @@ mod tests {
assert_eq!("冊", editor.display());
}

#[test]
fn editing_mode_input_switch_mode_behavior() {
let dict = TrieBuf::new_in_memory();
let dict = Layered::new(vec![Box::new(dict)], Box::new(TrieBuf::new_in_memory()));
let conversion_engine = Box::new(ChewingEngine::new());
let estimate = LaxUserFreqEstimate::new(0);
let abbrev = AbbrevTable::new();
let sym_sel = SymbolSelector::default();
let mut editor = Editor::new(conversion_engine, dict, estimate, abbrev, sym_sel);

editor.set_editor_options(|opt| opt.language_mode = LanguageMode::English);

editor.process_keyevent(map_ascii(&QWERTY_MAP, b'X'));

editor.set_editor_options(|opt| opt.language_mode = LanguageMode::Chinese);

assert_eq!(EditorKeyBehavior::Commit, editor.last_key_behavior());
assert_eq!("X", editor.display_commit());
}

#[test]
fn editing_chinese_mode_input_special_symbol() {
let dict = TrieBuf::from([(
Expand Down
Loading