快打模式下簡碼加選字碼可能和非簡碼有相同碼數 #26

y1lichen · Jun 8, 2024 · 02a6a0d · 02a6a0d
1 parent 7f2757b
commit 02a6a0d
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 4 deletions.
diff --git a/Packages/ilimi_MainAssembly/Sources/ilimiMainAssembly/LangModelAssembly/DataInitilizer.swift b/Packages/ilimi_MainAssembly/Sources/ilimiMainAssembly/LangModelAssembly/DataInitilizer.swift
@@ -118,7 +118,7 @@ class DataInitializer {
                     }
                     persistenceContainer.saveContext()
                     userDefaults.set(true, forKey: "hadReadLiuJson")
-					userDefaults.set(false, forKey: "isLoadByLiuUniTab")
+                    userDefaults.set(false, forKey: "isLoadByLiuUniTab")
                     NSLog("liu.json loaded")
                 }
             }

diff --git a/...i_MainAssembly/Sources/ilimiMainAssembly/LangModelAssembly/WordDictReader/CinReader.swift b/...i_MainAssembly/Sources/ilimiMainAssembly/LangModelAssembly/WordDictReader/CinReader.swift
@@ -51,7 +51,7 @@ class CinReader {
             persistenceContainer.saveContext()
             // hadReadLiuJson就先不改名成hadReadLiu了...
             userDefaults.set(true, forKey: "hadReadLiuJson")
-			userDefaults.set(false, forKey: "isLoadByLiuUniTab")
+            userDefaults.set(false, forKey: "isLoadByLiuUniTab")
             NotifierController.notify(message: "自liu.cin讀取\(priority)個字元", stay: true)
         } catch {
             NSLog(error.localizedDescription)

diff --git a/Packages/ilimi_MainAssembly/Sources/ilimiMainAssembly/Utils/InputEngine/InputEngine.swift b/Packages/ilimi_MainAssembly/Sources/ilimiMainAssembly/Utils/InputEngine/InputEngine.swift
@@ -17,6 +17,19 @@ struct InputEngine {
         InputContext.shared.candidates = CoreDataHelper.getCharByZhuyin(text)
     }
 
+    func getPhraseExactly(_ text: String) -> [Phrase] {
+        let request = NSFetchRequest<Phrase>(entityName: "Phrase")
+        request.predicate = NSPredicate(format: "key == %@", text)
+        request.sortDescriptors = [NSSortDescriptor(key: "key_priority", ascending: true)]
+        do {
+            let response = try PersistenceController.shared.container.viewContext.fetch(request)
+            return response
+        } catch {
+            NSLog(error.localizedDescription)
+        }
+        return []
+    }
+
     func getNormalModePhrase(_ text: String) -> [Phrase] {
         let request = NSFetchRequest<Phrase>(entityName: "Phrase")
         request.predicate = settingsModel

diff --git a/Packages/ilimi_MainAssembly/Sources/ilimiMainAssembly/Utils/SpMode/SpModeManager.swift b/Packages/ilimi_MainAssembly/Sources/ilimiMainAssembly/Utils/SpMode/SpModeManager.swift
@@ -9,6 +9,8 @@ import CoreData
 import Foundation
 
 class SpModeManager {
+    // MARK: Internal
+
     static func getSpKeyOfChar(_ chr: String) -> [String] {
         let isLoadByLiu = UserDefaults.standard.bool(forKey: "isLoadByLiuUniTab")
         if isLoadByLiu {
@@ -31,6 +33,9 @@ class SpModeManager {
             return false
         }
         if !isLoadByLiu, !getSpOfCharWithoutLiuTab(text).contains(input) {
+            if handleMultipleSp(text, isLoadByLiu) {
+                return true
+            }
             return false
         }
         return true
@@ -123,6 +128,20 @@ class SpModeManager {
         }
         return []
     }
-
-
+
+    // MARK: Private
+	// 快打模式下簡碼加選字碼可能和非簡碼有相同碼數
+	// 使用.tab時不用特別處理，因使用.tab時簡碼判斷是直接讀字根檔
+    // https://github.com/y1lichen/ilimi-inputmethod/issues/26
+    private static func handleMultipleSp(_ text: String, _ isLoadByLiu: Bool) -> Bool {
+        let sps: [String] = isLoadByLiu ? getSpOfCharWithLiuTab(text) : getSpOfCharWithoutLiuTab(text)
+        if !sps.isEmpty {
+            let minLen = sps.first!.count
+            if InputEngine.shared.getPhraseExactly(sps.first!).first?.value != text,
+               InputContext.shared.getCurrentInput().count == minLen + 1 {
+                return true
+            }
+        }
+        return false
+    }
 }