mii/AzooKeyKanaKanjiConverter
1
0
Fork 0
mirror of https://github.com/mii443/AzooKeyKanaKanjiConverter.git synced 2025-08-22 15:05:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Equatableの実装の柔軟性を改善

Browse Source
This commit is contained in:
Miwa / Ensan
2025-07-21 22:09:16 +09:00
parent 30044f4d9c
commit 7f1b991f0a
1 changed files with 50 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
Sources/KanaKanjiConverterModule/ConverterAPI/Candidate.swift
View File

@ -67,7 +67,7 @@ public enum CompleteAction: Equatable, Sendable {
case moveCursor(Int)
}
public enum ComposingCount: Equatable, Sendable {
public enum ComposingCount: Sendable, Equatable {
/// composingText.inputにおいて対応する文字数。
case inputCount(Int)
/// composingText.convertTargeにおいて対応する文字数。
@ -86,6 +86,55 @@ public enum ComposingCount: Equatable, Sendable {
.composite(lhs: lhs, rhs: rhs)
}
}
private struct FlatComposingCount: Equatable {
enum Kind {
case inputCount
case surfaceCount
}
var kind: Kind
var value: Int
static func inputCount(_ value: Int) -> Self {
.init(kind: .inputCount, value: value)
}
static func surfaceCount(_ value: Int) -> Self {
.init(kind: .surfaceCount, value: value)
}
}
private var flatten: [FlatComposingCount] {
switch self {
case .inputCount(let value):
if value == 0 {
[]
} else {
[.inputCount(value)]
}
case .surfaceCount(let value):
if value == 0 {
[]
} else {
[.surfaceCount(value)]
}
case .composite(let lhs, let rhs):
{
let lFlatten = lhs.flatten
let rFlatten = rhs.flatten
return switch (lFlatten.last?.kind, rFlatten.first?.kind) {
case (.inputCount, .inputCount):
lFlatten.dropLast() + [.inputCount(lFlatten.last!.value + rFlatten.first!.value)] + rFlatten.dropFirst()
case (.surfaceCount, .surfaceCount):
lFlatten.dropLast() + [.surfaceCount(lFlatten.last!.value + rFlatten.first!.value)] + rFlatten.dropFirst()
default:
lFlatten + rFlatten
}
}()
}
}
public static func == (lhs: Self, rhs: Self) -> Bool {
lhs.flatten == rhs.flatten
}
}
/// 変換候補のデータ