From 6ad6c73bc38579de03827391b0a00e1187e28430 Mon Sep 17 00:00:00 2001 From: ShikiSuen Date: Wed, 29 Jun 2022 21:18:07 +0800 Subject: [PATCH] KeyHandler // Simplify handling for associated phrases. --- .../ControllerModules/KeyHandler_HandleCandidate.swift | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/Source/Modules/ControllerModules/KeyHandler_HandleCandidate.swift b/Source/Modules/ControllerModules/KeyHandler_HandleCandidate.swift index c2fc7c21..c42ec121 100644 --- a/Source/Modules/ControllerModules/KeyHandler_HandleCandidate.swift +++ b/Source/Modules/ControllerModules/KeyHandler_HandleCandidate.swift @@ -302,12 +302,8 @@ extension KeyHandler { } var index: Int = NSNotFound - var match: String! - if state is InputState.AssociatedPhrases { - match = input.inputTextIgnoringModifiers - } else { - match = inputText - } + let match: String = + (state is InputState.AssociatedPhrases) ? input.inputTextIgnoringModifiers ?? "" : inputText ?? "" var j = 0 while j < ctlCandidateCurrent.keyLabels.count {