Skip to content

Fix Chinese IME marked text handling #53

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Pluviobyte wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix Chinese IME marked text handling #53

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions Textream/Textream/HighlightingTextEditor.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,10 @@ struct HighlightingTextEditor: NSViewRepresentable {
func updateNSView(_ scrollView: NSScrollView, context: Context) {
guard let textView = scrollView.documentView as? NSTextView else { return }

if textView.hasMarkedText() {
return
}

if textView.string != text {
let selectedRanges = textView.selectedRanges
textView.string = text
Expand Down Expand Up @@ -106,12 +110,14 @@ struct HighlightingTextEditor: NSViewRepresentable {

func textDidChange(_ notification: Notification) {
guard let textView = notification.object as? NSTextView else { return }
guard !textView.hasMarkedText() else { return }
parent.text = textView.string
applyHighlighting(textView)
}

func textViewDidChangeSelection(_ notification: Notification) {
guard let textView = notification.object as? NSTextView else { return }
guard !textView.hasMarkedText() else { return }
let pos = textView.selectedRange().location
if parent.editorCaretPosition != pos {
DispatchQueue.main.async { [weak self] in
Expand Down Expand Up @@ -141,6 +147,7 @@ struct HighlightingTextEditor: NSViewRepresentable {

func applyHighlighting(_ textView: NSTextView) {
guard let textStorage = textView.textStorage else { return }
guard !textView.hasMarkedText() else { return }
let fullRange = NSRange(location: 0, length: textStorage.length)
let text = textStorage.string

Expand Down