Skip to content

Tweaks to scroll view observation mechanics #55

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

Merged
mattmassicotte merged 4 commits into from
May 31, 2025
Merged

Tweaks to scroll view observation mechanics #55

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5de0a6d
Don't log the absence of an enclosing scroll view, since the caller m…
danielpunkass May 31, 2025
21790c6
Typo fix
danielpunkass May 31, 2025
9489419
Revert "Typo fix"
danielpunkass May 31, 2025
43b392e
Typo fix.
danielpunkass May 31, 2025
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
10 changes: 6 additions & 4 deletions Sources/Neon/TextViewHighlighter.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ public final class TextViewHighlighter {

try textView.getTextStorage().delegate = storageDelegate

observeEnclosingScrollView()
observeEnclosingScrollView(expectingScrollView: false)

invalidate(.all)
}
Expand All @@ -152,11 +152,13 @@ public final class TextViewHighlighter {
extension TextViewHighlighter {
/// Begin monitoring for containing scroll view changes.
///
/// This method sets up all the necessary monitoring so the highlighter can react to scrolling. It should be called only once the view heirarchy is fully established.
public func observeEnclosingScrollView() {
/// This method sets up all the necessary monitoring so the highlighter can react to scrolling. It should be called only once the view hierarchy is fully established.
public func observeEnclosingScrollView(expectingScrollView: Bool = true) {
#if os(macOS) && !targetEnvironment(macCatalyst)
guard let scrollView = textView.enclosingScrollView else {
print("warning: there is no enclosing scroll view")
if expectingScrollView {
assertionFailure("Tried to start observing the scroll view before the view hierarchy is fully established")
}
return
}

Expand Down
Loading