check assistchar before check is sp #22

Author: y1lichen

Packages/ilimi_MainAssembly/Sources/ilimiMainAssembly/IlimiInputController.swift

@@ -247,7 +247,7 @@ extension IlimiInputController {
 
     func commitText(client sender: Any!, text: String) {
         // 在快打模式下如果不是最簡碼不會輸出，並且會要求使用重新最簡碼重打
-        if !isASCIIMode, InputContext.shared.isSpMode, !SpModeManager.checkInputIsSp(text) {
+        if !isASCIIMode, InputContext.shared.isSpMode, !SpModeManager.checkInputIsSp(text, assistSelectChar.chr) {
             cleanComposition()
             let res = SpModeManager.getSpKeyOfChar(text).joined(separator: "、")
             NotifierController.notify(message: "\(text)的簡碼為\(res)", stay: true)

Packages/ilimi_MainAssembly/Sources/ilimiMainAssembly/Utils/SpMode/SpModeManager.swift

@@ -17,9 +17,12 @@ class SpModeManager {
         return getSpOfCharWithoutLiuTab(chr)
     }
 
-    static func checkInputIsSp(_ text: String) -> Bool {
+    static func checkInputIsSp(_ text: String, _ assistChar: String) -> Bool {
         let isLoadByLiu = UserDefaults.standard.bool(forKey: "isLoadByLiuUniTab")
-        let input = InputContext.shared.getCurrentInput()
+        var input = InputContext.shared.getCurrentInput()
+        if !assistChar.isEmpty {
+            input.removeLast()
+        }
         if isLoadByLiu, !getSpOfCharWithLiuTab(text).contains(input) {
             return false
         }