変換候補選択時にxキーで前候補に戻れるようにする (#101)

mtgto · Jan 24, 2024 · de888d8 · de888d8
1 parent c90234e
commit de888d8
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 1 deletion.
diff --git a/macSKK/StateMachine.swift b/macSKK/StateMachine.swift
@@ -815,7 +815,7 @@ class StateMachine {
             state.inputMethod = .normal
             addFixedText(selecting.fixedText)
             return true
-        case .backspace, .up:
+        case .backspace, .up, .printable("x"):
             let diff: Int
             if selecting.candidateIndex >= inlineCandidateCount && action.keyEvent == .backspace {
                 // 前ページの先頭

diff --git a/macSKKTests/StateMachineTests.swift b/macSKKTests/StateMachineTests.swift
@@ -1829,6 +1829,31 @@ final class StateMachineTests: XCTestCase {
         wait(for: [expectation], timeout: 1.0)
     }
 
+    func testHandleSelectingPrev() {
+        dictionary.setEntries(["と": [Word("戸"), Word("都"), Word("徒"), Word("途"), Word("斗")]])
+
+        let expectation = XCTestExpectation()
+        stateMachine.inputMethodEvent.collect(7).sink { events in
+            XCTAssertEqual(events[0], .markedText(MarkedText([.markerCompose, .plain("t")])))
+            XCTAssertEqual(events[1], .markedText(MarkedText([.markerCompose, .plain("と")])))
+            XCTAssertEqual(events[2], .markedText(MarkedText([.markerSelect, .emphasized("戸")])))
+            XCTAssertEqual(events[3], .markedText(MarkedText([.markerSelect, .emphasized("都")])))
+            XCTAssertEqual(events[4], .markedText(MarkedText([.markerSelect, .emphasized("戸")])))
+            XCTAssertEqual(events[5], .markedText(MarkedText([.markerSelect, .emphasized("都")])))
+            XCTAssertEqual(events[6], .markedText(MarkedText([.markerSelect, .emphasized("戸")])))
+            expectation.fulfill()
+        }.store(in: &cancellables)
+        XCTAssertTrue(stateMachine.handle(printableKeyEventAction(character: "t", withShift: true)))
+        XCTAssertTrue(stateMachine.handle(printableKeyEventAction(character: "o")))
+        XCTAssertTrue(stateMachine.handle(Action(keyEvent: .space, originalEvent: nil, cursorPosition: .zero)))
+        XCTAssertTrue(stateMachine.handle(Action(keyEvent: .space, originalEvent: nil, cursorPosition: .zero)))
+        XCTAssertTrue(stateMachine.handle(Action(keyEvent: .up, originalEvent: nil, cursorPosition: .zero)))
+        XCTAssertTrue(stateMachine.handle(Action(keyEvent: .space, originalEvent: nil, cursorPosition: .zero)))
+        XCTAssertTrue(stateMachine.handle(printableKeyEventAction(character: "x")))
+        XCTAssertTrue(stateMachine.handle(Action(keyEvent: .space, originalEvent: nil, cursorPosition: .zero)))
+        wait(for: [expectation], timeout: 1.0)
+    }
+
     func testHandleSelectingCtrlY() {
         dictionary.setEntries(["と": [Word("戸")]])