fix: delete trailing ASCII when accepting prediction (#300)

* fix: delete trailing ASCII when accepting prediction

* fix: remove stale swiftlint disable

* build: update AzooKeyKanaKanjiConverter revision

Author: ensan-hcl

Core/Package.swift

@@ -21,7 +21,7 @@ let package = Package(
         )
     ],
     dependencies: [
-        .package(url: "https://github.com/azooKey/AzooKeyKanaKanjiConverter", revision: "23544d6ea30822fd498caeff2dbc04d78b268134", traits: kanaKanjiConverterTraits),
+        .package(url: "https://github.com/azooKey/AzooKeyKanaKanjiConverter", revision: "e57b2c82cdecdeb8dc9058a8d04264e79bea1ab3", traits: kanaKanjiConverterTraits),
         .package(url: "https://github.com/apple/swift-crypto.git", from: "3.0.0"),
         .package(url: "https://github.com/weichsel/ZIPFoundation.git", from: "0.9.0")
     ],

Core/Sources/Core/InputUtils/SegmentsManager.swift

@@ -809,7 +809,6 @@ public final class SegmentsManager {
         suggestSelectionIndex = nil
     }
 
-    // swiftlint:disable:next cyclomatic_complexity
     public func requestPredictionCandidates() -> [PredictionCandidate] {
         guard Config.DebugPredictiveTyping().value else {
             return []
@@ -820,16 +819,6 @@ public final class SegmentsManager {
             return []
         }
 
-        var matchTarget = target
-        if let last = matchTarget.last,
-           last.unicodeScalars.allSatisfy({ $0.isASCII && CharacterSet.letters.contains($0) }) {
-            matchTarget.removeLast()
-        }
-        guard matchTarget.count >= 2 else {
-            return []
-        }
-        matchTarget = matchTarget.toHiragana()
-
         if let backspaceAdjustedPredictionCandidate {
             return [backspaceAdjustedPredictionCandidate]
         }
@@ -843,23 +832,51 @@ public final class SegmentsManager {
             guard !reading.isEmpty else {
                 continue
             }
-            let readingHiragana = reading.toHiragana()
-            guard readingHiragana.hasPrefix(matchTarget) else {
-                continue
-            }
-            guard matchTarget.count < readingHiragana.count else {
-                continue
-            }
-            let appendText = String(readingHiragana.dropFirst(matchTarget.count))
-            guard !appendText.isEmpty else {
-                continue
+            if let predictionCandidate = Self.makePredictionCandidate(
+                currentTarget: target,
+                candidateReading: reading,
+                displayText: candidate.text
+            ) {
+                return [predictionCandidate]
             }
-            return [.init(displayText: candidate.text, appendText: appendText)]
         }
 
         return []
     }
 
+    static func makePredictionCandidate(
+        currentTarget: String,
+        candidateReading: String,
+        displayText: String
+    ) -> PredictionCandidate? {
+        var matchTarget = currentTarget
+        var deleteCount = 0
+        if let last = matchTarget.last,
+           last.unicodeScalars.allSatisfy({ $0.isASCII && CharacterSet.letters.contains($0) }) {
+            matchTarget.removeLast()
+            deleteCount = 1
+        }
+        guard matchTarget.count >= 2 else {
+            return nil
+        }
+
+        let readingHiragana = candidateReading.toHiragana()
+        let matchTargetHiragana = matchTarget.toHiragana()
+        guard readingHiragana.hasPrefix(matchTargetHiragana) else {
+            return nil
+        }
+        guard matchTargetHiragana.count < readingHiragana.count else {
+            return nil
+        }
+
+        let appendText = String(readingHiragana.dropFirst(matchTargetHiragana.count))
+        guard !appendText.isEmpty else {
+            return nil
+        }
+
+        return .init(displayText: displayText, appendText: appendText, deleteCount: deleteCount)
+    }
+
     private func requestTypoCorrectionCandidates(composingText targetComposingText: ComposingText, inputStyle: InputStyle) -> [String] {
         guard Config.DebugTypoCorrection().value && self.hasDebugTypoCorrectionWeights() else {
             return []

Core/Tests/CoreTests/InputUtilsTests/SegmentsManagerPredictionCandidateTests.swift

@@ -0,0 +1,26 @@
+@testable import Core
+import Testing
+
+@Test func testMakePredictionCandidateDeletesTrailingASCIIUsedForMatching() async throws {
+    let candidate = SegmentsManager.makePredictionCandidate(
+        currentTarget: "おはようございm",
+        candidateReading: "おはようございます",
+        displayText: "おはようございます"
+    )
+
+    #expect(candidate?.displayText == "おはようございます")
+    #expect(candidate?.appendText == "ます")
+    #expect(candidate?.deleteCount == 1)
+}
+
+@Test func testMakePredictionCandidateKeepsDeleteCountZeroWithoutTrailingASCII() async throws {
+    let candidate = SegmentsManager.makePredictionCandidate(
+        currentTarget: "おはようござい",
+        candidateReading: "おはようございます",
+        displayText: "おはようございます"
+    )
+
+    #expect(candidate?.displayText == "おはようございます")
+    #expect(candidate?.appendText == "ます")
+    #expect(candidate?.deleteCount == 0)
+}