From 3544af20c0f279081452c1718a98cdb434dc5499 Mon Sep 17 00:00:00 2001
From: ShikiSuen <shikisuen@outlook.com>
Date: Thu, 18 Aug 2022 00:26:59 +0800
Subject: [PATCH] ctlIME // Show Shift-key modifier notification with
 AssociatedPhrases.

---
 .../ControllerModules/ctlInputMethod_Core.swift   | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/Source/Modules/ControllerModules/ctlInputMethod_Core.swift b/Source/Modules/ControllerModules/ctlInputMethod_Core.swift
index abe92d1c..ead68d37 100644
--- a/Source/Modules/ControllerModules/ctlInputMethod_Core.swift
+++ b/Source/Modules/ControllerModules/ctlInputMethod_Core.swift
@@ -281,24 +281,25 @@ class ctlInputMethod: IMKInputController {
     _ = sender  // 防止格式整理工具毀掉與此對應的參數。
     var arrResult = [String]()
 
-    func handleCandidatesPrepared(_ candidates: [(String, String)]) {
+    func handleCandidatesPrepared(_ candidates: [(String, String)], prefix: String = "") {
       for theCandidate in candidates {
         let theConverted = IME.kanjiConversionIfRequired(theCandidate.1)
         var result = (theCandidate.1 == theConverted) ? theCandidate.1 : "\(theConverted)(\(theCandidate.1))"
         if arrResult.contains(result) {
           result = "\(result)(\(theCandidate.0))"
         }
-        arrResult.append(result)
+        arrResult.append(prefix + result)
       }
     }
 
     if let state = state as? InputState.AssociatedPhrases {
-      handleCandidatesPrepared(state.candidates)
+      handleCandidatesPrepared(state.candidates, prefix: "⇧")
     } else if let state = state as? InputState.SymbolTable {
       handleCandidatesPrepared(state.candidates)
     } else if let state = state as? InputState.ChoosingCandidate {
       handleCandidatesPrepared(state.candidates)
     }
+
     return arrResult
   }
 
@@ -326,16 +327,16 @@ class ctlInputMethod: IMKInputController {
 
     var indexDeducted = 0
 
-    func handleCandidatesSelected(_ candidates: [(String, String)]) {
+    func handleCandidatesSelected(_ candidates: [(String, String)], prefix: String = "") {
       for (i, neta) in candidates.enumerated() {
         let theConverted = IME.kanjiConversionIfRequired(neta.1)
         let netaShown = (neta.1 == theConverted) ? neta.1 : "\(theConverted)(\(neta.1))"
         let netaShownWithPronunciation = "\(theConverted)(\(neta.0))"
-        if candidateString.string == netaShownWithPronunciation {
+        if candidateString.string == prefix + netaShownWithPronunciation {
           indexDeducted = i
           break
         }
-        if candidateString.string == netaShown {
+        if candidateString.string == prefix + netaShown {
           indexDeducted = i
           break
         }
@@ -343,7 +344,7 @@ class ctlInputMethod: IMKInputController {
     }
 
     if let state = state as? InputState.AssociatedPhrases {
-      handleCandidatesSelected(state.candidates)
+      handleCandidatesSelected(state.candidates, prefix: "⇧")
     } else if let state = state as? InputState.SymbolTable {
       handleCandidatesSelected(state.candidates)
     } else if let state = state as? InputState.ChoosingCandidate {