From ebf59b594c4880d01e99cbd1ab21508fc72d58af Mon Sep 17 00:00:00 2001 From: ShikiSuen Date: Fri, 19 Aug 2022 18:40:16 +0800 Subject: [PATCH] IME // Refactor kanjiConversionIfRequired(). --- Source/Modules/IMEModules/IME.swift | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/Source/Modules/IMEModules/IME.swift b/Source/Modules/IMEModules/IME.swift index 400bfab3..ea7a76dd 100644 --- a/Source/Modules/IMEModules/IME.swift +++ b/Source/Modules/IMEModules/IME.swift @@ -40,16 +40,14 @@ public enum IME { static var currentInputMode: InputMode = .init(rawValue: mgrPrefs.mostRecentInputMode) ?? .imeModeNULL static func kanjiConversionIfRequired(_ text: String) -> String { - if currentInputMode == InputMode.imeModeCHT { - switch (mgrPrefs.chineseConversionEnabled, mgrPrefs.shiftJISShinjitaiOutputEnabled) { - case (false, true): return ChineseConverter.cnvTradToJIS(text) - case (true, false): return ChineseConverter.cnvTradToKangXi(text) - // 本來這兩個開關不該同時開啟的，但萬一被同時開啟了的話就這樣處理： - case (true, true): return ChineseConverter.cnvTradToJIS(text) - case (false, false): return text - } + guard currentInputMode == InputMode.imeModeCHT else { return text } + switch (mgrPrefs.chineseConversionEnabled, mgrPrefs.shiftJISShinjitaiOutputEnabled) { + case (false, true): return ChineseConverter.cnvTradToJIS(text) + case (true, false): return ChineseConverter.cnvTradToKangXi(text) + // 本來這兩個開關不該同時開啟的，但萬一被同時開啟了的話就這樣處理： + case (true, true): return ChineseConverter.cnvTradToJIS(text) + case (false, false): return text } - return text } // MARK: - 自 ctlInputMethod 讀取當前輸入法的簡繁體模式