Merge pull request #347 from mtgto/register-empty

単語登録確定で入力モードが変わったときに現在の未確定文字列を更新

Author: mtgto

macSKK/StateMachine.swift

@@ -104,10 +104,16 @@ final class StateMachine {
             case .hiragana:
                 state.inputMode = .katakana
                 inputMethodEventSubject.send(.modeChanged(.katakana))
+                if specialState != nil {
+                    inputMethodEventSubject.send(.markedText(state.displayText()))
+                }
                 return true
             case .katakana, .hankaku:
                 state.inputMode = .hiragana
                 inputMethodEventSubject.send(.modeChanged(.hiragana))
+                if specialState != nil {
+                    inputMethodEventSubject.send(.markedText(state.displayText()))
+                }
                 return true
             case .eisu, .direct:
                 break

macSKKTests/StateMachineTests.swift

@@ -663,25 +663,26 @@ final class StateMachineTests: XCTestCase {
     @MainActor func testHandleNormalAbbrevRegisteringPrevMode() {
         let stateMachine = StateMachine(initialState: IMEState(inputMode: .hiragana))
         let expectation = XCTestExpectation()
-        stateMachine.inputMethodEvent.collect(18).sink { events in
+        stateMachine.inputMethodEvent.collect(19).sink { events in
             XCTAssertEqual(events[0], .modeChanged(.direct))
             XCTAssertEqual(events[1], .markedText(MarkedText([.markerCompose])))
             XCTAssertEqual(events[2], .markedText(MarkedText([.markerCompose, .plain("a")])))
             XCTAssertEqual(events[3], .modeChanged(.hiragana))
             XCTAssertEqual(events[4], .markedText(MarkedText([.plain("[登録：a]")])))
             XCTAssertEqual(events[5], .modeChanged(.katakana))
-            XCTAssertEqual(events[6], .markedText(MarkedText([.plain("[登録：a]"), .plain("エ")])))
-            XCTAssertEqual(events[7], .modeChanged(.direct))
-            XCTAssertEqual(events[8], .markedText(MarkedText([.plain("[登録：a]"), .plain("エ"), .markerCompose])))
-            XCTAssertEqual(events[9], .markedText(MarkedText([.plain("[登録：a]"), .plain("エ"), .markerCompose, .plain("b")])))
-            XCTAssertEqual(events[10], .modeChanged(.hiragana))
-            XCTAssertEqual(events[11], .markedText(MarkedText([.plain("[[登録：b]]")])))
-            XCTAssertEqual(events[12], .markedText(MarkedText([.plain("[[登録：b]]"), .plain("b")])))
-            XCTAssertEqual(events[13], .markedText(MarkedText([.plain("[[登録：b]]"), .plain("び")])))
-            XCTAssertEqual(events[14], .modeChanged(.katakana))
-            XCTAssertEqual(events[15], .markedText(MarkedText([.plain("[登録：a]"), .plain("エび")])))
-            XCTAssertEqual(events[16], .modeChanged(.hiragana))
-            XCTAssertEqual(events[17], .fixedText("エび"))
+            XCTAssertEqual(events[6], .markedText(MarkedText([.plain("[登録：a]")])))
+            XCTAssertEqual(events[7], .markedText(MarkedText([.plain("[登録：a]"), .plain("エ")])))
+            XCTAssertEqual(events[8], .modeChanged(.direct))
+            XCTAssertEqual(events[9], .markedText(MarkedText([.plain("[登録：a]"), .plain("エ"), .markerCompose])))
+            XCTAssertEqual(events[10], .markedText(MarkedText([.plain("[登録：a]"), .plain("エ"), .markerCompose, .plain("b")])))
+            XCTAssertEqual(events[11], .modeChanged(.hiragana))
+            XCTAssertEqual(events[12], .markedText(MarkedText([.plain("[[登録：b]]")])))
+            XCTAssertEqual(events[13], .markedText(MarkedText([.plain("[[登録：b]]"), .plain("b")])))
+            XCTAssertEqual(events[14], .markedText(MarkedText([.plain("[[登録：b]]"), .plain("び")])))
+            XCTAssertEqual(events[15], .modeChanged(.katakana))
+            XCTAssertEqual(events[16], .markedText(MarkedText([.plain("[登録：a]"), .plain("エび")])))
+            XCTAssertEqual(events[17], .modeChanged(.hiragana))
+            XCTAssertEqual(events[18], .fixedText("エび"))
             expectation.fulfill()
         }.store(in: &cancellables)
         XCTAssertTrue(stateMachine.handle(printableKeyEventAction(character: "/")))