JavaScript Highlighter: Throttle rehighlighting to improve performance

while typing
This commit is contained in:
Shadowfacts 2020-04-09 21:58:53 -04:00
parent 6b39e90ea4
commit 4c65ff612d
Signed by: shadowfacts
GPG Key ID: 94A5AB95422746E5
1 changed files with 13 additions and 2 deletions

View File

@ -7,12 +7,13 @@
//
import AppKit
import Combine
class JavaScriptEditorView: NSTextView {
var highlighter = JavaScriptHighlighter()
private var isRehighlighting = false
override var string: String {
get {
super.string
@ -23,6 +24,9 @@ class JavaScriptEditorView: NSTextView {
rehighlight()
}
}
private let rehighlightSubject = PassthroughSubject<Void, Never>()
private var debouncedRehighlightCancellable: AnyCancellable!
func rehighlight() {
isRehighlighting = true
@ -34,6 +38,13 @@ class JavaScriptEditorView: NSTextView {
super.awakeFromNib()
textStorage!.delegate = self
typingAttributes = [
.font: NSFont.monospacedSystemFont(ofSize: 13, weight: .regular),
.foregroundColor: NSColor.textColor
]
debouncedRehighlightCancellable = rehighlightSubject.throttle(for: .milliseconds(40), scheduler: RunLoop.main, latest: false).sink(receiveValue: rehighlight)
}
override func shouldChangeText(in affectedCharRange: NSRange, replacementString: String?) -> Bool {
@ -117,6 +128,6 @@ extension JavaScriptEditorView: NSTextStorageDelegate {
}
}
rehighlight()
rehighlightSubject.send()
}
}