Make the Shift tap a persistent English-mode toggle
A Shift tap with nothing composed now switches English mode on until the next tap, instead of forcing only the next word: space, Enter and other keys no longer drop back to automatic detection. In English mode every key goes straight to the app, so there is no composition or underline. A Shift tap while typing still flips the buffer like Tab. Windows shows "英文" / "中英自動" when toggling. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
+15
-31
@@ -194,11 +194,15 @@ class MixedSegmentTests(unittest.TestCase):
|
||||
|
||||
|
||||
class ShiftTapTests(unittest.TestCase):
|
||||
def test_forces_next_word_english_lowercase(self):
|
||||
def test_toggles_english_mode(self):
|
||||
e = make_engine()
|
||||
self.assertEqual(type_keys("⇧ru ", e), "ru ")
|
||||
self.assertFalse(e.english_armed)
|
||||
self.assertEqual(type_keys("su3cl3\n", e), "你好")
|
||||
self.assertEqual(type_keys("⇧ru su ", e), "ru su ")
|
||||
self.assertTrue(e.english_mode)
|
||||
self.assertEqual(e.marked_text, "")
|
||||
self.assertEqual(e.handle(ENTER), (False, None))
|
||||
self.assertTrue(e.english_mode)
|
||||
self.assertEqual(type_keys("⇧su3cl3\n", e), "你好")
|
||||
self.assertFalse(e.english_mode)
|
||||
|
||||
def test_tap_twice_cancels(self):
|
||||
self.assertEqual(type_keys("⇧⇧su3cl3\n", make_engine()), "你好")
|
||||
@@ -208,20 +212,20 @@ class ShiftTapTests(unittest.TestCase):
|
||||
type_keys("so", e)
|
||||
e.handle(SHIFT_TAP)
|
||||
self.assertEqual(e.mode, ZHUYIN)
|
||||
self.assertFalse(e.english_mode)
|
||||
type_keys("\n", e)
|
||||
self.assertEqual(e.classifier.learned.weights["so"], 1)
|
||||
|
||||
def test_forcing_before_typing_not_learned(self):
|
||||
def test_english_mode_not_learned(self):
|
||||
e = make_engine()
|
||||
type_keys("⇧hello ", e)
|
||||
self.assertNotIn("hello", e.classifier.learned.weights)
|
||||
self.assertEqual(e.classifier.learned.weights, {})
|
||||
|
||||
def test_arming_survives_backspace(self):
|
||||
def test_backspace_goes_to_app(self):
|
||||
e = make_engine()
|
||||
type_keys("⇧r", e)
|
||||
e.handle(BACKSPACE)
|
||||
self.assertTrue(e.english_armed)
|
||||
self.assertEqual(type_keys("ru ", e), "ru ")
|
||||
e.handle(SHIFT_TAP)
|
||||
self.assertEqual(e.handle(BACKSPACE), (False, None))
|
||||
self.assertTrue(e.english_mode)
|
||||
|
||||
def test_detector(self):
|
||||
d = ShiftTapDetector()
|
||||
@@ -267,25 +271,5 @@ class CursorTests(unittest.TestCase):
|
||||
self.assertTrue(e.showing_candidates)
|
||||
|
||||
|
||||
class DirectEnglishTests(unittest.TestCase):
|
||||
def test_forced_english_has_no_composition(self):
|
||||
e = make_engine()
|
||||
e.handle(SHIFT_TAP)
|
||||
self.assertEqual(e.handle("r"), (True, "r"))
|
||||
self.assertEqual(e.marked_text, "")
|
||||
self.assertEqual(e.handle("'"), (True, "'"))
|
||||
self.assertEqual(e.handle(BACKSPACE), (False, None))
|
||||
self.assertTrue(e.english_armed)
|
||||
self.assertEqual(e.handle(" "), (True, " "))
|
||||
self.assertFalse(e.english_armed)
|
||||
|
||||
def test_enter_ends_forced_english(self):
|
||||
e = make_engine()
|
||||
e.handle(SHIFT_TAP)
|
||||
e.handle("a")
|
||||
self.assertEqual(e.handle(ENTER), (False, None))
|
||||
self.assertFalse(e.english_armed)
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
unittest.main()
|
||||
|
||||
Reference in New Issue
Block a user