From 00f44ffbcbf1f4bdf3e0e112842b2a6419249ec9 Mon Sep 17 00:00:00 2001
From: ShikiSuen <shikisuen@outlook.com>
Date: Thu, 30 Jun 2022 18:30:03 +0800
Subject: [PATCH] KeyHandler // Refactor handlePunctuation().

---
 .../ControllerModules/KeyHandler_States.swift | 55 ++++++++++---------
 1 file changed, 28 insertions(+), 27 deletions(-)

diff --git a/Source/Modules/ControllerModules/KeyHandler_States.swift b/Source/Modules/ControllerModules/KeyHandler_States.swift
index 383d0f42..2696b2d6 100644
--- a/Source/Modules/ControllerModules/KeyHandler_States.swift
+++ b/Source/Modules/ControllerModules/KeyHandler_States.swift
@@ -295,38 +295,39 @@ extension KeyHandler {
       return false
     }
 
-    if composer.isEmpty {
-      insertToCompositorAtCursor(reading: customPunctuation)
-      let textToCommit = commitOverflownCompositionAndWalk
-      let inputting = buildInputtingState
-      inputting.textToCommit = textToCommit
-      stateCallback(inputting)
-
-      if mgrPrefs.useSCPCTypingMode, composer.isEmpty {
-        let candidateState = buildCandidate(
-          state: inputting,
-          isTypingVertical: isTypingVertical
-        )
-        if candidateState.candidates.count == 1 {
-          clear()
-          if let strtextToCommit: String = candidateState.candidates.first {
-            stateCallback(InputState.Committing(textToCommit: strtextToCommit) as InputState.Committing)
-            stateCallback(InputState.Empty())
-          } else {
-            stateCallback(candidateState)
-          }
-        } else {
-          stateCallback(candidateState)
-        }
-      }
-      return true
-    } else {
-      // If there is still unfinished bpmf reading, ignore the punctuation
+    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)
+
+    // 從這一行之後開始，就是針對逐字選字模式的單獨處理。
+    guard mgrPrefs.useSCPCTypingMode, composer.isEmpty else { return true }
+
+    let candidateState = buildCandidate(
+      state: inputting,
+      isTypingVertical: isTypingVertical
+    )
+    if candidateState.candidates.count == 1 {
+      clear()
+      if let strtextToCommit: String = candidateState.candidates.first {
+        stateCallback(InputState.Committing(textToCommit: strtextToCommit))
+        stateCallback(InputState.Empty())
+      } else {
+        stateCallback(candidateState)
+      }
+    } else {
+      stateCallback(candidateState)
+    }
+    return true
   }
 
   // MARK: - Enter 鍵的處理