すべての辞書から検索する設定をGlobalに保持するように修正

mtgto · mtgto · commit c3fad973014d · 2025-10-30T22:09:17.000+09:00
diff --git a/macSKK/Global.swift b/macSKK/Global.swift
@@ -25,7 +25,7 @@ import Combine
     /// 1文字目を常に未確定扱いするワークアラウンドを適用するBundle Identifierの集合
     static let treatFirstCharacterAsMarkedTextBundleIdentifiers = CurrentValueSubject<[String], Never>([])
     /// ユーザー辞書だけでなくすべての辞書から補完候補を検索するか？
-    static let findCompletionFromAllDicts = CurrentValueSubject<Bool, Never>(false)
+    static var findCompletionFromAllDicts = false
     /// 現在のローマ字かな変換ルール
     static var kanaRule: Romaji!
     /// デフォルトでもってるローマ字かな変換ルール
diff --git a/macSKK/InputController.swift b/macSKK/InputController.swift
@@ -184,12 +184,12 @@ class InputController: IMKInputController {
             }
             .receive(on: DispatchQueue.global())
             .compactMap { (yomi, cursorPosition) -> (String, Completion, NSRect)? in
+                let skkservDict = Global.searchCompletionsSkkserv ? Global.skkservDict : nil
                 if Global.showCandidateForCompletion {
-                     let candidates = Global.dictionary.candidatesForCompletion(prefix: yomi)
+                    let candidates = Global.dictionary.candidatesForCompletion(prefix: yomi, skkservDict: skkservDict, findFromAllDicts: Global.findCompletionFromAllDicts)
                      return (yomi, .candidates(candidates), cursorPosition)
                  } else {
-                     let skkservDict = Global.searchCompletionsSkkserv ? Global.skkservDict : nil
-                     let completions = Global.dictionary.findCompletionsDicts(prefix: yomi, skkservDict: skkservDict, findFromAllDicts: Global.findCompletionFromAllDicts.value)
+                     let completions = Global.dictionary.findCompletionsDicts(prefix: yomi, skkservDict: skkservDict, findFromAllDicts: Global.findCompletionFromAllDicts)
                      return (yomi, .yomi(completions, 0), cursorPosition)
                 }
             }
@@ -268,12 +268,6 @@ class InputController: IMKInputController {
                     self?.stateMachine.inlineCandidateCount = inlineCandidateCount
                 }
             }.store(in: &cancellables)
-        NotificationCenter.default.publisher(for: notificationNameFindCompletionFromAllDicts)
-            .sink { notification in
-                if let findCompletionFromAllDicts = notification.object as? Bool {
-                    Global.findCompletionFromAllDicts.send(findCompletionFromAllDicts)
-                }
-            }.store(in: &cancellables)
     }
 
     @MainActor override func handle(_ event: NSEvent!, client sender: Any!) -> Bool {
diff --git a/macSKK/Settings/SettingsViewModel.swift b/macSKK/Settings/SettingsViewModel.swift
@@ -286,7 +286,7 @@ final class SettingsViewModel: ObservableObject {
         Global.punctuation = Punctuation(comma: comma, period: period)
         Global.ignoreUserDictInPrivateMode.send(ignoreUserDictInPrivateMode)
         Global.candidateListDirection.send(candidateListDirection)
-        Global.findCompletionFromAllDicts.send(findCompletionFromAllDicts)
+        Global.findCompletionFromAllDicts = findCompletionFromAllDicts
 
         // SKK-JISYO.Lのようなファイルの読み込みが遅いのでバックグラウンドで処理
         $dictSettings.filter({ !$0.isEmpty }).receive(on: DispatchQueue.global()).sink { dictSettings in
@@ -452,7 +452,7 @@ final class SettingsViewModel: ObservableObject {
 
         $findCompletionFromAllDicts.dropFirst().sink { findCompletionFromAllDicts in
             UserDefaults.app.set(findCompletionFromAllDicts, forKey: UserDefaultsKeys.findCompletionFromAllDicts)
-            NotificationCenter.default.post(name: notificationNameFindCompletionFromAllDicts, object: findCompletionFromAllDicts)
+            Global.findCompletionFromAllDicts = findCompletionFromAllDicts
             logger.log("一般の辞書を使って補完するかを\(findCompletionFromAllDicts)に変更しました")
         }.store(in: &cancellables)
 
diff --git a/macSKK/UserDict.swift b/macSKK/UserDict.swift
@@ -29,20 +29,17 @@ class UserDict: NSObject, DictProtocol {
     private let privateMode: CurrentValueSubject<Bool, Never>
     /// プライベートモード時に変換候補にユーザー辞書を無視するかどうか
     private let ignoreUserDictInPrivateMode: CurrentValueSubject<Bool, Never>
-    // ユーザー辞書だけでなくすべての辞書から補完候補を検索するか？
-    private let findCompletionFromAllDicts: CurrentValueSubject<Bool, Never>
     private var cancellables: Set<AnyCancellable> = []
     let saveToUserDict = true
 
     // MARK: NSFilePresenter
     let presentedItemURL: URL?
     let presentedItemOperationQueue: OperationQueue = OperationQueue()
 
-    init(dicts: [any DictProtocol], userDictEntries: [String: [Word]]? = nil, privateMode: CurrentValueSubject<Bool, Never>, ignoreUserDictInPrivateMode: CurrentValueSubject<Bool, Never>, findCompletionFromAllDicts: CurrentValueSubject<Bool, Never>, dateYomis: [DateConversion.Yomi], dateConversions: [DateConversion]) throws {
+    init(dicts: [any DictProtocol], userDictEntries: [String: [Word]]? = nil, privateMode: CurrentValueSubject<Bool, Never>, ignoreUserDictInPrivateMode: CurrentValueSubject<Bool, Never>, dateYomis: [DateConversion.Yomi], dateConversions: [DateConversion]) throws {
         self.dicts = dicts
         self.privateMode = privateMode
         self.ignoreUserDictInPrivateMode = ignoreUserDictInPrivateMode
-        self.findCompletionFromAllDicts = findCompletionFromAllDicts
         self.dateYomis = dateYomis
         self.dateConversions = dateConversions
         dictionariesDirectoryURL = try FileManager.default.url(
@@ -365,20 +362,20 @@ class UserDict: NSObject, DictProtocol {
      * asyncにするかも? (skkservとかで便利そう)
      * AsyncStreamにするかも?
      */
-    func candidatesForCompletion(prefix: String) -> [Candidate] {
+    func candidatesForCompletion(prefix: String, skkservDict: SKKServDict?, findFromAllDicts: Bool) -> [Candidate] {
         // 1文字のときは全探索するとめちゃくちゃ量が多いので完全一致だけ探す
         if prefix.count == 1 {
-            return referDicts(prefix, option: nil, skkservDict: nil, findFromAllDicts: findCompletionFromAllDicts.value)
+            return referDicts(prefix, option: nil, skkservDict: skkservDict, findFromAllDicts: findFromAllDicts)
                 .map { candidate in
                     candidate.withOriginal(Candidate.Original(midashi: prefix, word: candidate.word))
                 }
         }
         // あとでいろいろ拡張するけどひとまずfindCompletionsの結果を[Candidate]にするだけ
         // 別スレッドから実行したいのでひとまずskkserv以外を検索する
-        return findCompletions(prefix: prefix).flatMap { midashi in
+        return findCompletionsDicts(prefix: prefix, skkservDict: skkservDict, findFromAllDicts: findFromAllDicts).flatMap { midashi in
             // NOTE: 多すぎても役に立たないだろうと思うのでひとまず先頭100件に制限。設定項目にしてもよさそう
             // FIXME: Candidateの配列じゃなくて、(String, Candidate) のように見出し語と変換候補のタプルの配列を返すほうがよさそう
-            referDicts(midashi, option: nil, skkservDict: nil, findFromAllDicts: findCompletionFromAllDicts.value)
+            referDicts(midashi, option: nil, skkservDict: nil, findFromAllDicts: findFromAllDicts)
                 .prefix(100)
                 .map { candidate in
                     candidate.withOriginal(Candidate.Original(midashi: midashi, word: candidate.word))
diff --git a/macSKK/macSKKApp.swift b/macSKK/macSKKApp.swift
@@ -18,8 +18,6 @@ let notificationNameToggleTreatFirstCharacterAsMarkedText = Notification.Name("t
 let notificationNameOpenSettings = Notification.Name("openSettings")
 // インラインで表示する変換候補の数を変更したときに通知される通知の名前
 let notificationNameInlineCandidateCount = Notification.Name("inlineCandidateCount")
-// 一般辞書を補完で検索するかが変更されたときに通知される通知の名前
-let notificationNameFindCompletionFromAllDicts =  Notification.Name("findCompletionFromAllDicts")
 
 func isTest() -> Bool {
     return ProcessInfo.processInfo.environment["MACSKK_IS_TEST"] == "1"
@@ -61,7 +59,6 @@ struct macSKKApp: App {
             Global.dictionary = try UserDict(dicts: [],
                                              privateMode: Global.privateMode,
                                              ignoreUserDictInPrivateMode: Global.ignoreUserDictInPrivateMode,
-                                             findCompletionFromAllDicts: Global.findCompletionFromAllDicts,
                                              dateYomis: settingsViewModel.dateYomis,
                                              dateConversions: settingsViewModel.dateConversions)
             settingsWindowController = NSWindowController(window: settingsWindow)
diff --git a/macSKKTests/SKKServDictTests.swift b/macSKKTests/SKKServDictTests.swift
@@ -12,6 +12,10 @@ final class SKKServDictTests: XCTestCase {
             return response
         }
 
+        func completion(yomi: String, destination: macSKK.SKKServDestination, timeout: TimeInterval) throws -> String {
+            return response
+        }
+
         func disconnect() throws {}
     }
 
diff --git a/macSKKTests/StateMachineTests.swift b/macSKKTests/StateMachineTests.swift
@@ -2962,7 +2962,6 @@ final class StateMachineTests: XCTestCase {
         Global.dictionary = try UserDict(dicts: [dict],
                                          privateMode: CurrentValueSubject<Bool, Never>(false),
                                          ignoreUserDictInPrivateMode: CurrentValueSubject<Bool, Never>(false),
-                                         findCompletionFromAllDicts: CurrentValueSubject<Bool, Never>(false),
                                          dateYomis: [],
                                          dateConversions: [])
         Global.dictionary.setEntries([:])
@@ -2988,7 +2987,6 @@ final class StateMachineTests: XCTestCase {
         Global.dictionary = try UserDict(dicts: [dict],
                                          privateMode: CurrentValueSubject<Bool, Never>(false),
                                          ignoreUserDictInPrivateMode: CurrentValueSubject<Bool, Never>(false),
-                                         findCompletionFromAllDicts: CurrentValueSubject<Bool, Never>(false),
                                          dateYomis: [],
                                          dateConversions: [])
         Global.dictionary.setEntries([:])
@@ -3017,7 +3015,6 @@ final class StateMachineTests: XCTestCase {
         Global.dictionary = try UserDict(dicts: [dict],
                                          privateMode: CurrentValueSubject<Bool, Never>(false),
                                          ignoreUserDictInPrivateMode: CurrentValueSubject<Bool, Never>(false),
-                                         findCompletionFromAllDicts: CurrentValueSubject<Bool, Never>(false),
                                          dateYomis: [],
                                          dateConversions: [])
         Global.dictionary.setEntries([:])
@@ -3062,7 +3059,6 @@ final class StateMachineTests: XCTestCase {
         Global.dictionary = try UserDict(dicts: [dict],
                                          privateMode: CurrentValueSubject<Bool, Never>(false),
                                          ignoreUserDictInPrivateMode: CurrentValueSubject<Bool, Never>(false),
-                                         findCompletionFromAllDicts: CurrentValueSubject<Bool, Never>(false),
                                          dateYomis: [],
                                          dateConversions: [])
         Global.dictionary.setEntries([:])
@@ -3094,7 +3090,6 @@ final class StateMachineTests: XCTestCase {
         Global.dictionary = try UserDict(dicts: [dict],
                                          privateMode: CurrentValueSubject<Bool, Never>(false),
                                          ignoreUserDictInPrivateMode: CurrentValueSubject<Bool, Never>(false),
-                                         findCompletionFromAllDicts: CurrentValueSubject<Bool, Never>(false),
                                          dateYomis: [],
                                          dateConversions: [])
         Global.dictionary.setEntries([:])
@@ -3621,7 +3616,6 @@ final class StateMachineTests: XCTestCase {
                                          userDictEntries: [:],
                                          privateMode: privateMode,
                                          ignoreUserDictInPrivateMode: CurrentValueSubject<Bool, Never>(false),
-                                         findCompletionFromAllDicts: CurrentValueSubject<Bool, Never>(false),
                                          dateYomis: [],
                                          dateConversions: [])
 
diff --git a/macSKKTests/UserDictTests.swift b/macSKKTests/UserDictTests.swift

Original file line number	Diff line number	Diff line change
`@@ -184,12 +184,12 @@ class InputController: IMKInputController {`
`184`	`184`	`}`
`185`	`185`	`.receive(on: DispatchQueue.global())`
`186`	`186`	`.compactMap { (yomi, cursorPosition) -> (String, Completion, NSRect)? in`
	`187`	`+ let skkservDict = Global.searchCompletionsSkkserv ? Global.skkservDict : nil`
`187`	`188`	`if Global.showCandidateForCompletion {`
`188`		`- let candidates = Global.dictionary.candidatesForCompletion(prefix: yomi)`
	`189`	`+ let candidates = Global.dictionary.candidatesForCompletion(prefix: yomi, skkservDict: skkservDict, findFromAllDicts: Global.findCompletionFromAllDicts)`
`189`	`190`	`return (yomi, .candidates(candidates), cursorPosition)`
`190`	`191`	`} else {`
`191`		`- let skkservDict = Global.searchCompletionsSkkserv ? Global.skkservDict : nil`
`192`		`- let completions = Global.dictionary.findCompletionsDicts(prefix: yomi, skkservDict: skkservDict, findFromAllDicts: Global.findCompletionFromAllDicts.value)`
	`192`	`+ let completions = Global.dictionary.findCompletionsDicts(prefix: yomi, skkservDict: skkservDict, findFromAllDicts: Global.findCompletionFromAllDicts)`
`193`	`193`	`return (yomi, .yomi(completions, 0), cursorPosition)`
`194`	`194`	`}`
`195`	`195`	`}`
`@@ -268,12 +268,6 @@ class InputController: IMKInputController {`
`268`	`268`	`self?.stateMachine.inlineCandidateCount = inlineCandidateCount`
`269`	`269`	`}`
`270`	`270`	`}.store(in: &cancellables)`
`271`		`- NotificationCenter.default.publisher(for: notificationNameFindCompletionFromAllDicts)`
`272`		`- .sink { notification in`
`273`		`- if let findCompletionFromAllDicts = notification.object as? Bool {`
`274`		`- Global.findCompletionFromAllDicts.send(findCompletionFromAllDicts)`
`275`		`- }`
`276`		`- }.store(in: &cancellables)`
`277`	`271`	`}`
`278`	`272`
`279`	`273`	`@MainActor override func handle(_ event: NSEvent!, client sender: Any!) -> Bool {`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,10 @@ final class SKKServDictTests: XCTestCase {`
`12`	`12`	`return response`
`13`	`13`	`}`
`14`	`14`
	`15`	`+ func completion(yomi: String, destination: macSKK.SKKServDestination, timeout: TimeInterval) throws -> String {`
	`16`	`+ return response`
	`17`	`+ }`
	`18`	`+`
`15`	`19`	`func disconnect() throws {}`
`16`	`20`	`}`
`17`	`21`