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

SessionCtl // Refactor candidatePairSelectionConfirmed().

This commit is contained in:
ShikiSuen 2023-03-09 17:57:26 +08:00
parent 625897a744
commit 22ead33ba9
1 changed files with 18 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
Source/Modules/SessionCtl_Delegates.swift
View File

@ -112,19 +112,15 @@ extension SessionCtl: CtlCandidateDelegate {
public func candidatePairSelectionConfirmed(at index: Int) { public func candidatePairSelectionConfirmed(at index: Int) {
guard let inputHandler = inputHandler else { return } guard let inputHandler = inputHandler else { return }
if state.type == .ofSymbolTable, (0 ..< state.node.members.count).contains(index) { switch state.type {
case .ofSymbolTable where (0 ..< state.node.members.count).contains(index):
let node = state.node.members[index] let node = state.node.members[index]
if !node.members.isEmpty { if !node.members.isEmpty {
switchState(IMEState.ofEmpty()) // 防止縱橫排選字窗同時出現
switchState(IMEState.ofSymbolTable(node: node)) switchState(IMEState.ofSymbolTable(node: node))
} else { } else {
switchState(IMEState.ofCommitting(textToCommit: node.name)) switchState(IMEState.ofCommitting(textToCommit: node.name))
switchState(IMEState.ofEmpty())
} }
return case .ofCandidates where (0 ..< state.candidates.count).contains(index):
}
if [.ofCandidates, .ofSymbolTable].contains(state.type) {
let selectedValue = state.candidates[index] let selectedValue = state.candidates[index]
if state.type == .ofCandidates { if state.type == .ofCandidates {
inputHandler.consolidateNode( inputHandler.consolidateNode(
@ -132,45 +128,34 @@ extension SessionCtl: CtlCandidateDelegate {
preConsolidate: PrefMgr.shared.consolidateContextOnCandidateSelection preConsolidate: PrefMgr.shared.consolidateContextOnCandidateSelection
) )
} }
var result: IMEStateProtocol = inputHandler.generateStateOfInputting()
let inputting = inputHandler.generateStateOfInputting() defer { switchState(result) } // 這是最終輸出結果。
if PrefMgr.shared.useSCPCTypingMode { if PrefMgr.shared.useSCPCTypingMode {
switchState(IMEState.ofCommitting(textToCommit: inputting.displayedText)) switchState(IMEState.ofCommitting(textToCommit: result.displayedText))
// 此時是逐字選字模式，所以「selectedValue.value」是單個字、不用追加處理。 // 此時是逐字選字模式，所以「selectedValue.value」是單個字、不用追加處理。
if PrefMgr.shared.associatedPhrasesEnabled { if PrefMgr.shared.associatedPhrasesEnabled {
let associates = inputHandler.generateStateOfAssociates( let associates = inputHandler.generateStateOfAssociates(
withPair: .init(keyArray: selectedValue.keyArray, value: selectedValue.value) withPair: .init(keyArray: selectedValue.keyArray, value: selectedValue.value)
) )
switchState(associates.candidates.isEmpty ? IMEState.ofEmpty() : associates) result = associates.candidates.isEmpty ? IMEState.ofEmpty() : associates
} else { } else {
switchState(IMEState.ofEmpty()) result = IMEState.ofEmpty()
} }
} else {
switchState(inputting)
} }
return case .ofAssociates where (0 ..< state.candidates.count).contains(index):
}
if state.type == .ofAssociates {
let selectedValue = state.candidates[index] let selectedValue = state.candidates[index]
var result: IMEStateProtocol = IMEState.ofEmpty()
defer { switchState(result) } // 這是最終輸出結果。
switchState(IMEState.ofCommitting(textToCommit: selectedValue.value)) switchState(IMEState.ofCommitting(textToCommit: selectedValue.value))
guard PrefMgr.shared.associatedPhrasesEnabled else { return }
// 此時是聯想詞選字模式，所以「selectedValue.value」必須只保留最後一個字。 // 此時是聯想詞選字模式，所以「selectedValue.value」必須只保留最後一個字。
// 不然的話，一旦你選中了由多個字組成的聯想候選詞，則連續聯想會被打斷。 // 不然的話，一旦你選中了由多個字組成的聯想候選詞，則連續聯想會被打斷。
guard let valueKept = selectedValue.value.last else { guard let valueKept = selectedValue.value.last?.description else { return }
switchState(IMEState.ofEmpty()) let associates = inputHandler.generateStateOfAssociates(
return withPair: .init(keyArray: selectedValue.keyArray, value: valueKept)
} )
if PrefMgr.shared.associatedPhrasesEnabled { if !associates.candidates.isEmpty { result = associates }
let associates = inputHandler.generateStateOfAssociates( default: return
withPair: .init(keyArray: selectedValue.keyArray, value: String(valueKept))
)
if !associates.candidates.isEmpty {
switchState(associates)
return
}
}
switchState(IMEState.ofEmpty())
} }
} }