From 254934b219c178a4048c301e1d4ac42b3b0f92a2 Mon Sep 17 00:00:00 2001
From: ShikiSuen <shikisuen@outlook.com>
Date: Sat, 27 Aug 2022 15:10:43 +0800
Subject: [PATCH] ctlIME // Simplify symbol menu processings for IMKCandidates.

---
 .../ctlInputMethod_Core.swift                 | 29 ++++++++++++++++---
 1 file changed, 25 insertions(+), 4 deletions(-)

diff --git a/Source/Modules/ControllerModules/ctlInputMethod_Core.swift b/Source/Modules/ControllerModules/ctlInputMethod_Core.swift
index 6ad18b88..99cf1603 100644
--- a/Source/Modules/ControllerModules/ctlInputMethod_Core.swift
+++ b/Source/Modules/ControllerModules/ctlInputMethod_Core.swift
@@ -313,9 +313,15 @@ class ctlInputMethod: IMKInputController {
     if let state = state as? InputState.AssociatedPhrases {
       handleCandidatesPrepared(state.candidates, prefix: "⇧")
     } else if let state = state as? InputState.SymbolTable {
-      handleCandidatesPrepared(state.candidates)
+      // 分類符號選單不會出現同符異音項、不需要康熙 / JIS 轉換，所以使用簡化過的處理方式。
+      arrResult = state.candidates.map(\.1)
     } else if let state = state as? InputState.ChoosingCandidate {
-      handleCandidatesPrepared(state.candidates)
+      guard !state.candidates.isEmpty else { return .init() }
+      if state.candidates[0].0.contains("_punctuation") {
+        arrResult = state.candidates.map(\.1)  // 標點符號選單處理。
+      } else {
+        handleCandidatesPrepared(state.candidates)
+      }
     }
 
     return arrResult
@@ -372,12 +378,27 @@ class ctlInputMethod: IMKInputController {
       }
     }
 
+    // 分類符號選單不會出現同符異音項、不需要康熙 / JIS 轉換，所以使用簡化過的處理方式。
+    func handleSymbolCandidatesSelected(_ candidates: [(String, String)]) {
+      for (i, neta) in candidates.enumerated() {
+        if candidateString.string == neta.1 {
+          indexDeducted = i
+          break
+        }
+      }
+    }
+
     if let state = state as? InputState.AssociatedPhrases {
       handleCandidatesSelected(state.candidates, prefix: "⇧")
     } else if let state = state as? InputState.SymbolTable {
-      handleCandidatesSelected(state.candidates)
+      handleSymbolCandidatesSelected(state.candidates)
     } else if let state = state as? InputState.ChoosingCandidate {
-      handleCandidatesSelected(state.candidates)
+      guard !state.candidates.isEmpty else { return }
+      if state.candidates[0].0.contains("_punctuation") {
+        handleSymbolCandidatesSelected(state.candidates)  // 標點符號選單處理。
+      } else {
+        handleCandidatesSelected(state.candidates)
+      }
     }
     keyHandler(
       keyHandler,