変換候補を補完する場合にSKKServが有効なら問い合わせする

Author: mtgto

macSKK/InputController.swift

@@ -187,10 +187,10 @@ class InputController: IMKInputController {
                 let skkservDict = Global.searchCompletionsSkkserv ? Global.skkservDict : nil
                 if Global.showCandidateForCompletion {
                     let candidates = Global.dictionary.candidatesForCompletion(prefix: yomi, skkservDict: skkservDict, findFromAllDicts: Global.findCompletionFromAllDicts)
-                     return (yomi, .candidates(candidates), cursorPosition)
-                 } else {
-                     let completions = Global.dictionary.findCompletionsDicts(prefix: yomi, skkservDict: skkservDict, findFromAllDicts: Global.findCompletionFromAllDicts)
-                     return (yomi, .yomi(completions, 0), cursorPosition)
+                    return (yomi, .candidates(candidates), cursorPosition)
+                } else {
+                    let completions = Global.dictionary.findCompletionsDicts(prefix: yomi, skkservDict: skkservDict, findFromAllDicts: Global.findCompletionFromAllDicts)
+                    return (yomi, .yomi(completions, 0), cursorPosition)
                 }
             }
             .receive(on: DispatchQueue.main)

macSKK/UserDict.swift

@@ -375,7 +375,7 @@ class UserDict: NSObject, DictProtocol {
         return findCompletionsDicts(prefix: prefix, skkservDict: skkservDict, findFromAllDicts: findFromAllDicts).flatMap { midashi in
             // NOTE: 多すぎても役に立たないだろうと思うのでひとまず先頭100件に制限。設定項目にしてもよさそう
             // FIXME: Candidateの配列じゃなくて、(String, Candidate) のように見出し語と変換候補のタプルの配列を返すほうがよさそう
-            referDicts(midashi, option: nil, skkservDict: nil, findFromAllDicts: findFromAllDicts)
+            referDicts(midashi, option: nil, skkservDict: skkservDict, findFromAllDicts: findFromAllDicts)
                 .prefix(100)
                 .map { candidate in
                     candidate.withOriginal(Candidate.Original(midashi: midashi, word: candidate.word))