KeyHandler // Refactor handlePunctuation().

Source/Modules/ControllerModules/KeyHandler_States.swift

@@ -295,14 +295,23 @@ extension KeyHandler {
       return false
     }
 
-    if composer.isEmpty {
+    guard composer.isEmpty else {
+      // 注音沒敲完的情況下，無視標點輸入。
+      IME.prtDebugIntel("A9B69908D")
+      errorCallback()
+      stateCallback(state)
+      return true
+    }
+
     insertToCompositorAtCursor(reading: customPunctuation)
     let textToCommit = commitOverflownCompositionAndWalk
     let inputting = buildInputtingState
     inputting.textToCommit = textToCommit
     stateCallback(inputting)
 
-      if mgrPrefs.useSCPCTypingMode, composer.isEmpty {
+    // 從這一行之後開始，就是針對逐字選字模式的單獨處理。
+    guard mgrPrefs.useSCPCTypingMode, composer.isEmpty else { return true }
+
     let candidateState = buildCandidate(
       state: inputting,
       isTypingVertical: isTypingVertical
@@ -310,7 +319,7 @@ extension KeyHandler {
     if candidateState.candidates.count == 1 {
       clear()
       if let strtextToCommit: String = candidateState.candidates.first {
-            stateCallback(InputState.Committing(textToCommit: strtextToCommit) as InputState.Committing)
+        stateCallback(InputState.Committing(textToCommit: strtextToCommit))
         stateCallback(InputState.Empty())
       } else {
         stateCallback(candidateState)
@@ -318,15 +327,7 @@ extension KeyHandler {
     } else {
       stateCallback(candidateState)
     }
-      }
     return true
-    } else {
-      // If there is still unfinished bpmf reading, ignore the punctuation
-      IME.prtDebugIntel("A9B69908D")
-      errorCallback()
-      stateCallback(state)
-      return true
-    }
   }
 
   // MARK: - Enter 鍵的處理