floraachy
/
vChewing-macOS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

KeyHandler // candidatesArray() -> getCandidatesArray(), etc.

This commit is contained in:
ShikiSuen 2022-07-01 00:30:15 +08:00
parent 449ab61a1b
commit f768d6c603
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Modules/ControllerModules/KeyHandler_Core.swift
View File

@ -235,7 +235,7 @@ class KeyHandler {
} }
/// 獲取候選字詞陣列資料內容。 /// 獲取候選字詞陣列資料內容。
func candidatesArray(fixOrder: Bool = true) -> [String] { func getCandidatesArray(fixOrder: Bool = true) -> [String] {
var arrAnchors: [Megrez.NodeAnchor] = rawAnchorsOfNodes var arrAnchors: [Megrez.NodeAnchor] = rawAnchorsOfNodes
var arrCandidates: [String] = [] var arrCandidates: [String] = []
@ -259,13 +259,15 @@ class KeyHandler {
} }
} }
// 決定是否根據半衰記憶模組的建議來調整候選字詞的順序。 // 決定是否根據半衰記憶模組的建議來調整候選字詞的順序。
if mgrPrefs.fetchSuggestionsFromUserOverrideModel, !mgrPrefs.useSCPCTypingMode, !fixOrder { if !mgrPrefs.fetchSuggestionsFromUserOverrideModel || mgrPrefs.useSCPCTypingMode || fixOrder {
return arrCandidates
}
let arrSuggestedUnigrams: [Megrez.Unigram] = fetchSuggestedCandidates().stableSort { $0.score > $1.score } let arrSuggestedUnigrams: [Megrez.Unigram] = fetchSuggestedCandidates().stableSort { $0.score > $1.score }
let arrSuggestedCandidates: [String] = arrSuggestedUnigrams.map(\.keyValue.value) let arrSuggestedCandidates: [String] = arrSuggestedUnigrams.map(\.keyValue.value)
arrCandidates = arrSuggestedCandidates.filter { arrCandidates.contains($0) } + arrCandidates arrCandidates = arrSuggestedCandidates.filter { arrCandidates.contains($0) } + arrCandidates
arrCandidates = arrCandidates.deduplicate arrCandidates = arrCandidates.deduplicate
arrCandidates = arrCandidates.stableSort { $0.count > $1.count } arrCandidates = arrCandidates.stableSort { $0.count > $1.count }
}
return arrCandidates return arrCandidates
} }

4
Source/Modules/ControllerModules/KeyHandler_States.swift
View File

@ -168,7 +168,7 @@ extension KeyHandler {
InputState.ChoosingCandidate( InputState.ChoosingCandidate(
composingBuffer: currentState.composingBuffer, composingBuffer: currentState.composingBuffer,
cursorIndex: currentState.cursorIndex, cursorIndex: currentState.cursorIndex,
candidates: candidatesArray(fixOrder: mgrPrefs.useFixecCandidateOrderOnSelection), candidates: getCandidatesArray(fixOrder: mgrPrefs.useFixecCandidateOrderOnSelection),
isTypingVertical: isTypingVertical isTypingVertical: isTypingVertical
) )
} }
@ -771,7 +771,7 @@ extension KeyHandler {
return true return true
} }
let candidates = candidatesArray(fixOrder: true) let candidates = getCandidatesArray(fixOrder: true)
guard !candidates.isEmpty else { guard !candidates.isEmpty else {
IME.prtDebugIntel("3378A6DF") IME.prtDebugIntel("3378A6DF")
errorCallback() errorCallback()