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

InputHandler // Deduplicate `%quick` results for IMKCandidates.

This commit is contained in:
ShikiSuen 2023-06-24 22:42:53 +08:00
parent b33d89abec
commit 723437d085
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Source/Modules/InputHandler_HandleComposition.swift
View File

@ -271,8 +271,13 @@ extension InputHandler {
if !isStrokesFull {
var result = generateStateOfInputting()
if !calligrapher.isEmpty, let fetched = currentLM.cassetteQuickSetsFor(key: calligrapher) {
result.candidates = fetched.map { (keyArray: [""], value: $0.description) }
if !calligrapher.isEmpty, var fetched = currentLM.cassetteQuickSetsFor(key: calligrapher) {
if prefs.useIMKCandidateWindow {
fetched = fetched.deduplicated.filter { $0.description != currentLM.nullCandidateInCassette }
}
result.candidates = fetched.enumerated().map {
(keyArray: [$0.offset.description], value: $0.element.description)
}
}
delegate.switchState(result)
return true

9
Source/Modules/InputHandler_HandleStates.swift
View File

@ -507,8 +507,13 @@ extension InputHandler {
switch isConsideredEmptyForNow {
case false:
var result = generateStateOfInputting()
if prefs.cassetteEnabled, let fetched = currentLM.cassetteQuickSetsFor(key: calligrapher) {
result.candidates = fetched.map { (keyArray: [""], value: $0.description) }
if prefs.cassetteEnabled, var fetched = currentLM.cassetteQuickSetsFor(key: calligrapher) {
if prefs.useIMKCandidateWindow {
fetched = fetched.deduplicated.filter { $0.description != currentLM.nullCandidateInCassette }
}
result.candidates = fetched.enumerated().map {
(keyArray: [$0.offset.description], value: $0.element.description)
}
}
delegate.switchState(result)
case true: delegate.switchState(IMEState.ofAbortion())