From 38f85e491553e95169018fc6c475fac70f57bacf Mon Sep 17 00:00:00 2001
From: ShikiSuen <shikisuen@outlook.com>
Date: Wed, 15 Jun 2022 12:23:41 +0800
Subject: [PATCH] ctlIME // Simplify switches of kanji conversion modes.

---
 Source/Modules/IMEModules/ctlInputMethod.swift | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/Source/Modules/IMEModules/ctlInputMethod.swift b/Source/Modules/IMEModules/ctlInputMethod.swift
index 872aa82d..2c4b3d74 100644
--- a/Source/Modules/IMEModules/ctlInputMethod.swift
+++ b/Source/Modules/IMEModules/ctlInputMethod.swift
@@ -231,18 +231,13 @@ extension ctlInputMethod {
   private func commit(text: String) {
     func kanjiConversionIfRequired(_ text: String) -> String {
       if keyHandler.inputMode == InputMode.imeModeCHT {
-        if !mgrPrefs.chineseConversionEnabled, mgrPrefs.shiftJISShinjitaiOutputEnabled {
-          return vChewingKanjiConverter.cnvTradToJIS(text)
+        switch (mgrPrefs.chineseConversionEnabled, mgrPrefs.shiftJISShinjitaiOutputEnabled) {
+          case (false, true): return vChewingKanjiConverter.cnvTradToJIS(text)
+          case (true, false): return vChewingKanjiConverter.cnvTradToKangXi(text)
+          // 本來這兩個開關不該同時開啟的，但萬一被開啟了的話就這樣處理：
+          case (true, true): return vChewingKanjiConverter.cnvTradToJIS(text)
+          case (false, false): return text
         }
-        if mgrPrefs.chineseConversionEnabled, !mgrPrefs.shiftJISShinjitaiOutputEnabled {
-          return vChewingKanjiConverter.cnvTradToKangXi(text)
-        }
-        // 本來這兩個開關不該同時開啟的，但萬一被開啟了的話就這樣處理：
-        if mgrPrefs.chineseConversionEnabled, mgrPrefs.shiftJISShinjitaiOutputEnabled {
-          return vChewingKanjiConverter.cnvTradToJIS(text)
-        }
-        // if (!mgrPrefs.chineseConversionEnabled && !mgrPrefs.shiftJISShinjitaiOutputEnabled) || (keyHandler.inputMode != InputMode.imeModeCHT);
-        return text
       }
       return text
     }