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

InputState // Exact Begin / End -> Literal Begin / End.

This commit is contained in:
ShikiSuen 2022-06-03 09:15:01 +08:00
parent 75978da72f
commit 327b401595
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Source/Modules/ControllerModules/InputState.swift
View File

@ -194,9 +194,9 @@ class InputState {
) )
} }
let exactBegin = composingBuffer.charIndexLiteral(from: markedRange.lowerBound) let literalBegin = composingBuffer.charIndexLiteral(from: markedRange.lowerBound)
let exactEnd = composingBuffer.charIndexLiteral(from: markedRange.upperBound) let literalEnd = composingBuffer.charIndexLiteral(from: markedRange.upperBound)
let selectedReadings = readings[exactBegin..<exactEnd] let selectedReadings = readings[literalBegin..<literalEnd]
let joined = selectedReadings.joined(separator: "-") let joined = selectedReadings.joined(separator: "-")
let exist = mgrLangModel.checkIfUserPhraseExist( let exist = mgrLangModel.checkIfUserPhraseExist(
userPhrase: text, mode: ctlInputMethod.currentKeyHandler.inputMode, key: joined userPhrase: text, mode: ctlInputMethod.currentKeyHandler.inputMode, key: joined
@ -295,9 +295,9 @@ class InputState {
var chkIfUserPhraseExists: Bool { var chkIfUserPhraseExists: Bool {
let text = composingBuffer.utf16SubString(with: markedRange) let text = composingBuffer.utf16SubString(with: markedRange)
let exactBegin = composingBuffer.charIndexLiteral(from: markedRange.lowerBound) let literalBegin = composingBuffer.charIndexLiteral(from: markedRange.lowerBound)
let exactEnd = composingBuffer.charIndexLiteral(from: markedRange.upperBound) let literalEnd = composingBuffer.charIndexLiteral(from: markedRange.upperBound)
let selectedReadings = readings[exactBegin..<exactEnd] let selectedReadings = readings[literalBegin..<literalEnd]
let joined = selectedReadings.joined(separator: "-") let joined = selectedReadings.joined(separator: "-")
return mgrLangModel.checkIfUserPhraseExist( return mgrLangModel.checkIfUserPhraseExist(
userPhrase: text, mode: ctlInputMethod.currentKeyHandler.inputMode, key: joined userPhrase: text, mode: ctlInputMethod.currentKeyHandler.inputMode, key: joined
@ -306,9 +306,9 @@ class InputState {
var userPhrase: String { var userPhrase: String {
let text = composingBuffer.utf16SubString(with: markedRange) let text = composingBuffer.utf16SubString(with: markedRange)
let exactBegin = composingBuffer.charIndexLiteral(from: markedRange.lowerBound) let literalBegin = composingBuffer.charIndexLiteral(from: markedRange.lowerBound)
let exactEnd = composingBuffer.charIndexLiteral(from: markedRange.upperBound) let literalEnd = composingBuffer.charIndexLiteral(from: markedRange.upperBound)
let selectedReadings = readings[exactBegin..<exactEnd] let selectedReadings = readings[literalBegin..<literalEnd]
let joined = selectedReadings.joined(separator: "-") let joined = selectedReadings.joined(separator: "-")
return "\(text) \(joined)" return "\(text) \(joined)"
} }
@ -316,9 +316,9 @@ class InputState {
var userPhraseConverted: String { var userPhraseConverted: String {
let text = let text =
OpenCCBridge.crossConvert(composingBuffer.utf16SubString(with: markedRange)) ?? "" OpenCCBridge.crossConvert(composingBuffer.utf16SubString(with: markedRange)) ?? ""
let exactBegin = composingBuffer.charIndexLiteral(from: markedRange.lowerBound) let literalBegin = composingBuffer.charIndexLiteral(from: markedRange.lowerBound)
let exactEnd = composingBuffer.charIndexLiteral(from: markedRange.upperBound) let literalEnd = composingBuffer.charIndexLiteral(from: markedRange.upperBound)
let selectedReadings = readings[exactBegin..<exactEnd] let selectedReadings = readings[literalBegin..<literalEnd]
let joined = selectedReadings.joined(separator: "-") let joined = selectedReadings.joined(separator: "-")
let convertedMark = "#𝙊𝙥𝙚𝙣𝘾𝘾" let convertedMark = "#𝙊𝙥𝙚𝙣𝘾𝘾"
return "\(text) \(joined)\t\(convertedMark)" return "\(text) \(joined)\t\(convertedMark)"