cdf833935a
Fix cold-start overlay recursion that overflowed the main-thread stack when recording began while the ready overlay was still up; also remove temporary on-screen Flow DEBUG panels after the orange-mic investigation, and land the macOS overlay/catalog/layout polish plus related Flow recovery hardening.
113 lines
4.7 KiB
Swift
113 lines
4.7 KiB
Swift
// DictationTextComposer.swift
|
|
// OSGKeyboard · Shared
|
|
//
|
|
// Merges pre-dictation anchor text with a live cumulative transcript.
|
|
|
|
import Foundation
|
|
|
|
public enum DictationTextComposer {
|
|
/// Combine text that existed before dictation with the current live transcript.
|
|
public static func compose(anchor: String, live: String) -> String {
|
|
let trimmed = live.trimmingCharacters(in: .whitespacesAndNewlines)
|
|
guard !trimmed.isEmpty else { return anchor }
|
|
if anchor.isEmpty { return trimmed }
|
|
if let merged = mergeOverlapping(anchor: anchor, live: trimmed) {
|
|
return merged
|
|
}
|
|
if shouldConcatenateWithoutSpace(anchor: anchor, live: trimmed) {
|
|
return anchor + trimmed
|
|
}
|
|
if anchor.last == " " || anchor.last == "\n" { return anchor + trimmed }
|
|
return anchor + " " + trimmed
|
|
}
|
|
|
|
/// Drop duplicated suffix/prefix overlap before falling back to spaced composition.
|
|
/// This catches progressive ASR revisions such as "可用性" + "可用性已经".
|
|
private static func mergeOverlapping(anchor: String, live: String) -> String? {
|
|
let anchorChars = Array(anchor)
|
|
let liveChars = Array(live)
|
|
let maxProbe = min(64, anchorChars.count, liveChars.count)
|
|
if maxProbe > 0 {
|
|
for length in stride(from: maxProbe, through: 2, by: -1) {
|
|
if anchorChars.suffix(length).elementsEqual(liveChars.prefix(length)) {
|
|
return anchor + String(liveChars.dropFirst(length))
|
|
}
|
|
}
|
|
}
|
|
|
|
let normalizedAnchor = normalizeForOverlap(anchor)
|
|
let normalizedLive = normalizeForOverlap(live)
|
|
let anchorNormChars = Array(normalizedAnchor)
|
|
let liveNormChars = Array(normalizedLive)
|
|
let normProbe = min(64, anchorNormChars.count, liveNormChars.count)
|
|
if normProbe > 0 {
|
|
for length in stride(from: normProbe, through: 3, by: -1) {
|
|
if anchorNormChars.suffix(length).elementsEqual(liveNormChars.prefix(length)) {
|
|
let drop = rawDropCount(in: live, normalizedPrefixLength: length)
|
|
return anchor + String(live.dropFirst(drop))
|
|
}
|
|
}
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
private static func shouldConcatenateWithoutSpace(anchor: String, live: String) -> Bool {
|
|
guard let last = anchor.unicodeScalars.last,
|
|
let first = live.unicodeScalars.first else {
|
|
return false
|
|
}
|
|
return isCJK(last) && isCJK(first)
|
|
}
|
|
|
|
/// Separator to place between existing document text and an inserted
|
|
/// transcript. Inserting at a cursor that sits right after "Hello" must
|
|
/// produce "Hello world", not "Helloworld" — but CJK, whitespace, and
|
|
/// opening-punctuation boundaries take no space.
|
|
public static func insertionSeparator(previousContext: String?, insertion: String) -> String {
|
|
guard let previousContext,
|
|
let last = previousContext.unicodeScalars.last,
|
|
let first = insertion.unicodeScalars.first else {
|
|
return ""
|
|
}
|
|
if CharacterSet.whitespacesAndNewlines.contains(last) { return "" }
|
|
if isCJK(last) || isCJK(first) { return "" }
|
|
// No space after opening brackets/quotes ("(", "[", "「", """…).
|
|
if CharacterSet(charactersIn: "([{\u{201C}\u{2018}\u{300C}\u{300E}\u{3010}\u{FF08}").contains(last) {
|
|
return ""
|
|
}
|
|
// No space before closing/clause punctuation (".", ",", ")", "!"…).
|
|
if CharacterSet.punctuationCharacters.contains(first) { return "" }
|
|
return " "
|
|
}
|
|
|
|
static func normalizeForOverlap(_ text: String) -> String {
|
|
text.unicodeScalars.filter {
|
|
!CharacterSet.whitespacesAndNewlines.contains($0)
|
|
&& !CharacterSet.punctuationCharacters.contains($0)
|
|
}.map { Character($0) }.reduce(into: "") { $0.append($1) }
|
|
}
|
|
|
|
private static func rawDropCount(in text: String, normalizedPrefixLength: Int) -> Int {
|
|
var normalizedCount = 0
|
|
var rawIndex = text.startIndex
|
|
while rawIndex < text.endIndex, normalizedCount < normalizedPrefixLength {
|
|
let character = text[rawIndex]
|
|
if !character.isWhitespace, !character.isPunctuation {
|
|
normalizedCount += 1
|
|
}
|
|
rawIndex = text.index(after: rawIndex)
|
|
}
|
|
return text.distance(from: text.startIndex, to: rawIndex)
|
|
}
|
|
|
|
private static func isCJK(_ scalar: UnicodeScalar) -> Bool {
|
|
switch scalar.value {
|
|
case 0x3400...0x4DBF, 0x4E00...0x9FFF, 0xF900...0xFAFF:
|
|
return true
|
|
default:
|
|
return false
|
|
}
|
|
}
|
|
}
|