From 309cd032918a008cb03d615cf5744a63146cbf61 Mon Sep 17 00:00:00 2001
From: ShikiSuen <shikisuen@outlook.com>
Date: Fri, 23 Jun 2023 18:08:15 +0800
Subject: [PATCH] Repo // Update certain symbol names.

---
 .../LangModelAssembly/LMInstantiator_CassetteExtension.swift  | 2 +-
 .../Sources/LangModelAssembly/SubLMs/lmCassette.swift         | 4 ++--
 Source/Modules/InputHandler_HandleCandidate.swift             | 2 +-
 Source/Modules/InputHandler_HandleComposition.swift           | 2 +-
 Source/Modules/SessionCtl_HandleDisplay.swift                 | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Packages/vChewing_LangModelAssembly/Sources/LangModelAssembly/LMInstantiator_CassetteExtension.swift b/Packages/vChewing_LangModelAssembly/Sources/LangModelAssembly/LMInstantiator_CassetteExtension.swift
index ed9d70c6..ee596e79 100644
--- a/Packages/vChewing_LangModelAssembly/Sources/LangModelAssembly/LMInstantiator_CassetteExtension.swift
+++ b/Packages/vChewing_LangModelAssembly/Sources/LangModelAssembly/LMInstantiator_CassetteExtension.swift
@@ -18,7 +18,7 @@ public extension vChewingLM.LMInstantiator {
   /// 磁帶模式專用：指定 `%quick` 快速候選結果當中要過濾掉的無效候選字符號。
   var nullCandidateInCassette: String { Self.lmCassette.nullCandidate }
   /// 磁帶模式專用：選字鍵是否需要敲 Shift 才會生效。
-  var areCassetteCandidateKeysShiftPressed: Bool { Self.lmCassette.areCandidateKeysShiftPressed }
+  var areCassetteCandidateKeysShiftHeld: Bool { Self.lmCassette.areCandidateKeysShiftHeld }
   /// 磁帶模式專用：選字鍵，在威注音輸入法當中僅優先用於快速模式。
   var cassetteSelectionKey: String? {
     let result = Self.lmCassette.selectionKeys
diff --git a/Packages/vChewing_LangModelAssembly/Sources/LangModelAssembly/SubLMs/lmCassette.swift b/Packages/vChewing_LangModelAssembly/Sources/LangModelAssembly/SubLMs/lmCassette.swift
index 15aafc5a..0155f2bc 100644
--- a/Packages/vChewing_LangModelAssembly/Sources/LangModelAssembly/SubLMs/lmCassette.swift
+++ b/Packages/vChewing_LangModelAssembly/Sources/LangModelAssembly/SubLMs/lmCassette.swift
@@ -36,7 +36,7 @@ public extension vChewingLM {
     public private(set) var octagramMap: [String: Int] = [:]
     /// 音韻輸入法專用八股文：[字詞:(頻次, 讀音)]。
     public private(set) var octagramDividedMap: [String: (Int, String)] = [:]
-    public private(set) var areCandidateKeysShiftPressed: Bool = false
+    public private(set) var areCandidateKeysShiftHeld: Bool = false
 
     /// 計算頻率時要用到的東西
     private static let fscale = 2.7
@@ -194,7 +194,7 @@ public extension vChewingLM {
           // Post process.
           if CandidateKey.validate(keys: selectionKeys) != nil { selectionKeys = "1234567890" }
           if !keysUsedInCharDef.intersection(selectionKeys.map(\.description)).isEmpty {
-            areCandidateKeysShiftPressed = true
+            areCandidateKeysShiftHeld = true
           }
           maxKeyLength = theMaxKeyLength
           keyNameMap[wildcardKey] = keyNameMap[wildcardKey] ?? "？"
diff --git a/Source/Modules/InputHandler_HandleCandidate.swift b/Source/Modules/InputHandler_HandleCandidate.swift
index 22d4ed3d..9ac12335 100644
--- a/Source/Modules/InputHandler_HandleCandidate.swift
+++ b/Source/Modules/InputHandler_HandleCandidate.swift
@@ -153,7 +153,7 @@ extension InputHandler {
     var index: Int?
     var shaltShiftHold = [.ofAssociates].contains(state.type)
     if [.ofInputting].contains(state.type) {
-      let cassetteShift = currentLM.areCassetteCandidateKeysShiftPressed
+      let cassetteShift = currentLM.areCassetteCandidateKeysShiftHeld
       shaltShiftHold = shaltShiftHold || cassetteShift
     }
     let matched: String = shaltShiftHold ? input.inputTextIgnoringModifiers ?? "" : input.text
diff --git a/Source/Modules/InputHandler_HandleComposition.swift b/Source/Modules/InputHandler_HandleComposition.swift
index 152ff882..9e75b80d 100644
--- a/Source/Modules/InputHandler_HandleComposition.swift
+++ b/Source/Modules/InputHandler_HandleComposition.swift
@@ -24,7 +24,7 @@ extension InputHandler {
     if prefs.cassetteEnabled {
       // 準備處理 `%quick` 選字行為。
       var handleQuickCandidate = true
-      if currentLM.areCassetteCandidateKeysShiftPressed { handleQuickCandidate = input.isShiftHold }
+      if currentLM.areCassetteCandidateKeysShiftHeld { handleQuickCandidate = input.isShiftHold }
       let hasQuickCandidates: Bool = delegate.state.type == .ofInputting && delegate.state.isCandidateContainer
 
       // 處理 `%symboldef` 選字行為。
diff --git a/Source/Modules/SessionCtl_HandleDisplay.swift b/Source/Modules/SessionCtl_HandleDisplay.swift
index 8e0963bd..1cc16b00 100644
--- a/Source/Modules/SessionCtl_HandleDisplay.swift
+++ b/Source/Modules/SessionCtl_HandleDisplay.swift
@@ -106,7 +106,7 @@ public extension SessionCtl {
       candidateUI?.tooltip =
         singleLine ? "⇧" : NSLocalizedString("Hold ⇧ to choose associates.", comment: "")
     } else if state.type == .ofInputting, state.isCandidateContainer {
-      let useShift = LMMgr.currentLM.areCassetteCandidateKeysShiftPressed
+      let useShift = LMMgr.currentLM.areCassetteCandidateKeysShiftHeld
       let theEmoji = useShift ? "⬆️" : "⚡️"
       candidateUI?.tooltip =
         singleLine ? theEmoji : "\(theEmoji) " + NSLocalizedString("Quick Candidates", comment: "")