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

IMEStateData // Update isFilterable(), etc.

This commit is contained in:
ShikiSuen 2023-03-23 12:09:38 +08:00
parent 78a950e355
commit d386a93784
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Source/Modules/IMEStateData.swift
View File

@ -102,8 +102,13 @@ public struct IMEStateData: IMEStateDataProtocol {
.markedClauseSegment: 0, .markedClauseSegment: 0,
] ]
) )
public var isFilterable: Bool { public var isFilterable: Bool {
markedTargetExists ? (isMarkedLengthValid && markedRange.count > 1) : false guard isMarkedLengthValid else { return false } // 範圍長度必須合規。
guard markedTargetExists else { return false } // 必須得有在庫對象
guard markedReadings.count == 1 else { return true } // 如果幅長大於 1，則直接批准。
// 處理單個漢字的情形：當且僅當在庫量僅有一筆的時候，才禁止過濾。
return LMMgr.countPhrasePairs(keyArray: markedReadings, mode: IMEApp.currentInputMode) > 1
} }
public var isMarkedLengthValid: Bool { public var isMarkedLengthValid: Bool {
@ -236,15 +241,15 @@ public extension IMEStateData {
if markedTargetExists { if markedTargetExists {
tooltipColorState = .prompt tooltipColorState = .prompt
switch markedRange.count { switch isFilterable {
case 1: case false:
return String( return String(
format: NSLocalizedString( format: NSLocalizedString(
"\"%@\" already exists:\n ENTER to boost, SHIFT+COMMAND+ENTER to nerf.", "\"%@\" already exists:\n ENTER to boost, SHIFT+COMMAND+ENTER to nerf.",
comment: "" comment: ""
) + "\n◆ " + readingDisplay, text ) + "\n◆ " + readingDisplay, text
) )
default: case true:
return String( return String(
format: NSLocalizedString( format: NSLocalizedString(
"\"%@\" already exists:\n ENTER to boost, SHIFT+COMMAND+ENTER to nerf, \n BackSpace or Delete key to exclude.", "\"%@\" already exists:\n ENTER to boost, SHIFT+COMMAND+ENTER to nerf, \n BackSpace or Delete key to exclude.",