feat(typing): add English autocomplete and Chinese candidate expand panel

Offline English lexicon suggestions with autocapitalization, plus a same-height Chinese more-candidates grid over the key area.
2026-08-03 18:30:20 +08:00
parent d1e5fed964
commit 38e5ad570d
35 changed files with 5086 additions and 179 deletions
@@ -0,0 +1,140 @@
+// EnglishTypingTests.swift
+// OSGKeyboard · Ext unit tests
+//
+// Lexicon / accent / suggestion ranking for the English typing path.
+
+import XCTest
+@testable import OSGKeyboardShared
+
+final class EnglishTypingTests: XCTestCase {
+    func testLexiconLoadsAndCompletesPrefix() {
+        let lexicon = EnglishLexicon()
+        lexicon.prepare()
+        XCTAssertGreaterThan(lexicon.wordCount, 1_000)
+        let hits = lexicon.completions(prefix: "hel", limit: 5)
+        XCTAssertTrue(hits.contains("hello") || hits.contains("help") || hits.contains("held"))
+    }
+
+    func testCorrectionFindsNearbyWord() {
+        let lexicon = EnglishLexicon()
+        lexicon.prepare()
+        // "teh" is a classic typo for "the".
+        let correction = lexicon.bestCorrection(for: "teh")
+        XCTAssertEqual(correction, "the")
+        XCTAssertNil(lexicon.bestCorrection(for: "the"))
+    }
+
+    func testSuggestionEngineSkipsPersonalDictionaryTypos() {
+        let engine = EnglishSuggestionEngine()
+        engine.prepare()
+        let decision = engine.correctionDecision(
+            for: "teh",
+            personalTerms: ["teh"],
+            learnedBoosts: [:]
+        )
+        XCTAssertNil(decision)
+    }
+
+    func testSuggestionEngineCompletionsPreferPersonalTerms() {
+        let engine = EnglishSuggestionEngine()
+        engine.prepare()
+        let composition = engine.compositionWhileTyping(
+            EnglishSuggestionContext(
+                currentWord: "osg",
+                personalTerms: ["OSGKeyboard"],
+                learnedBoosts: [:]
+            )
+        )
+        XCTAssertEqual(composition.candidates.first?.text, "OSGKeyboard")
+    }
+
+    func testAutocapitalizationAtFieldStartAndAfterSentence() {
+        XCTAssertTrue(
+            TypingAutocapitalization.shouldCapitalize(precedingText: nil, mode: .sentences)
+        )
+        XCTAssertTrue(
+            TypingAutocapitalization.shouldCapitalize(precedingText: "", mode: .sentences)
+        )
+        XCTAssertTrue(
+            TypingAutocapitalization.shouldCapitalize(precedingText: "Hello. ", mode: .sentences)
+        )
+        XCTAssertTrue(
+            TypingAutocapitalization.shouldCapitalize(precedingText: "Hello!\n", mode: .sentences)
+        )
+        XCTAssertFalse(
+            TypingAutocapitalization.shouldCapitalize(precedingText: "Hello ", mode: .sentences)
+        )
+        XCTAssertTrue(
+            TypingAutocapitalization.shouldCapitalize(precedingText: "Hello ", mode: .words)
+        )
+        XCTAssertFalse(
+            TypingAutocapitalization.shouldCapitalize(precedingText: nil, mode: .none)
+        )
+    }
+
+    @MainActor
+    func testEnglishIdleShowsNoCandidatesUntilLetterTyped() {
+        let typing = TypingSessionController()
+        typing.suggestionsEnabled = true
+        _ = typing.setLanguage(.english)
+        typing.enterTypingMode()
+        XCTAssertTrue(typing.composition.candidates.isEmpty)
+
+        _ = typing.handleKey("h")
+        XCTAssertFalse(typing.composition.candidates.isEmpty)
+        XCTAssertEqual(typing.composition.preedit, "h")
+    }
+
+    func testEnglishTypingHotwordsFilterOutChineseTerms() {
+        var dictionary = PersonalDictionary()
+        _ = dictionary.upsertManual(term: "张三")
+        _ = dictionary.upsertManual(term: "OSGKeyboard")
+        _ = dictionary.upsertManual(term: "微信")
+        guard let wechatID = dictionary.entry(matchingTerm: "微信")?.id else {
+            return XCTFail("expected 微信 entry")
+        }
+        dictionary.updateAliases(for: wechatID, aliases: ["WeChat"])
+
+        let hotwords = dictionary.englishTypingHotwords()
+        XCTAssertTrue(hotwords.contains("OSGKeyboard"))
+        XCTAssertTrue(hotwords.contains("WeChat"))
+        XCTAssertFalse(hotwords.contains(where: { $0.contains("张") || $0.contains("微") }))
+        XCTAssertFalse(PersonalDictionary.isEnglishTypingHotword("你好"))
+        XCTAssertTrue(PersonalDictionary.isEnglishTypingHotword("GPT-4"))
+    }
+
+    @MainActor
+    func testEnglishTypingEmitsCompletionsIntoComposition() {
+        let typing = TypingSessionController()
+        typing.suggestionsEnabled = true
+        _ = typing.setLanguage(.english)
+        typing.enterTypingMode()
+
+        _ = typing.handleKey("h")
+        _ = typing.handleKey("e")
+        _ = typing.handleKey("l")
+
+        XCTAssertFalse(typing.composition.candidates.isEmpty)
+        XCTAssertEqual(typing.composition.preedit, "hel")
+    }
+
+    @MainActor
+    func testAutocorrectUndoRestoresOriginal() {
+        let typing = TypingSessionController()
+        typing.suggestionsEnabled = true
+        _ = typing.setLanguage(.english)
+        typing.enterTypingMode()
+
+        for ch in ["t", "e", "h"] {
+            _ = typing.handleKey(ch)
+        }
+        let spaced = typing.handleSpace()
+        // Either corrected to "the " or left as-is if lexicon missing in test bundle.
+        if spaced.deleteCount > 0 {
+            XCTAssertTrue(spaced.text.hasPrefix("the"))
+            let undone = typing.handleKey("⌫")
+            XCTAssertEqual(undone.text, "teh")
+            XCTAssertEqual(undone.deleteCount, spaced.text.count)
+        }
+    }
+}