Highlight Minimap Visible Region

Author: thecoolwinter

Sources/CodeEditSourceEditor/Controller/TextViewController+Highlighter.swift

@@ -17,6 +17,7 @@ extension TextViewController {
 
         let highlighter = Highlighter(
             textView: textView,
+            minimapView: minimapView,
             providers: highlightProviders,
             attributeProvider: self,
             language: language

Sources/CodeEditSourceEditor/Highlighting/Highlighter.swift

@@ -85,6 +85,7 @@ class Highlighter: NSObject {
 
     init(
         textView: TextView,
+        minimapView: MinimapView,
         providers: [HighlightProviding],
         attributeProvider: ThemeAttributesProviding,
         language: CodeLanguage
@@ -93,7 +94,7 @@ class Highlighter: NSObject {
         self.textView = textView
         self.attributeProvider = attributeProvider
 
-        self.visibleRangeProvider = VisibleRangeProvider(textView: textView)
+        self.visibleRangeProvider = VisibleRangeProvider(textView: textView, minimapView: minimapView)
 
         let providerIds = providers.indices.map({ $0 })
         self.styleContainer = StyledRangeContainer(documentLength: textView.length, providers: providerIds)
@@ -244,7 +245,7 @@ extension Highlighter: NSTextStorageDelegate {
             visibleRangeProvider.visibleSet.insert(range: editedRange)
         }
 
-        visibleRangeProvider.updateVisibleSet(textView: textView)
+        visibleRangeProvider.visibleTextChanged()
 
         let providerRange = NSRange(location: editedRange.location, length: editedRange.length - delta)
         highlightProviders.forEach { $0.storageDidUpdate(range: providerRange, delta: delta) }

Sources/CodeEditSourceEditor/Highlighting/VisibleRangeProvider.swift

@@ -18,6 +18,7 @@ protocol VisibleRangeProviderDelegate: AnyObject {
 @MainActor
 class VisibleRangeProvider {
     private weak var textView: TextView?
+    private weak var minimapView: MinimapView?
     weak var delegate: VisibleRangeProviderDelegate?
 
     var documentRange: NSRange {
@@ -29,56 +30,44 @@ class VisibleRangeProvider {
         return IndexSet(integersIn: textView?.visibleTextRange ?? NSRange())
     }()
 
-    init(textView: TextView) {
+    init(textView: TextView, minimapView: MinimapView) {
         self.textView = textView
+        self.minimapView = minimapView
 
         if let scrollView = textView.enclosingScrollView {
             NotificationCenter.default.addObserver(
                 self,
-                selector: #selector(visibleTextChanged(_:)),
+                selector: #selector(visibleTextChanged),
                 name: NSView.frameDidChangeNotification,
                 object: scrollView
             )
 
             NotificationCenter.default.addObserver(
                 self,
-                selector: #selector(visibleTextChanged(_:)),
+                selector: #selector(visibleTextChanged),
                 name: NSView.boundsDidChangeNotification,
                 object: scrollView.contentView
             )
-        } else {
-            NotificationCenter.default.addObserver(
-                self,
-                selector: #selector(visibleTextChanged(_:)),
-                name: NSView.frameDidChangeNotification,
-                object: textView
-            )
         }
-    }
 
-    func updateVisibleSet(textView: TextView) {
-        if let newVisibleRange = textView.visibleTextRange {
-            visibleSet = IndexSet(integersIn: newVisibleRange)
-        }
+        NotificationCenter.default.addObserver(
+            self,
+            selector: #selector(visibleTextChanged),
+            name: NSView.frameDidChangeNotification,
+            object: textView
+        )
     }
 
     /// Updates the view to highlight newly visible text when the textview is scrolled or bounds change.
-    @objc func visibleTextChanged(_ notification: Notification) {
-        let textView: TextView
-        if let clipView = notification.object as? NSClipView,
-           let documentView = clipView.enclosingScrollView?.documentView as? TextView {
-            textView = documentView
-        } else if let scrollView = notification.object as? NSScrollView,
-                  let documentView = scrollView.documentView as? TextView {
-            textView = documentView
-        } else if let documentView = notification.object as? TextView {
-            textView = documentView
-        } else {
+    @objc func visibleTextChanged() {
+        guard let textViewVisibleRange = textView?.visibleTextRange else {
             return
         }
-
-        updateVisibleSet(textView: textView)
-
+        var visibleSet = IndexSet(integersIn: textViewVisibleRange)
+        if !(minimapView?.isHidden ?? true), let minimapVisibleRange = minimapView?.visibleTextRange {
+            visibleSet.formUnion(IndexSet(integersIn: minimapVisibleRange))
+        }
+        self.visibleSet = visibleSet
         delegate?.visibleSetDidUpdate(visibleSet)
     }
 

Sources/CodeEditSourceEditor/Minimap/MinimapView+DocumentVisibleView.swift

@@ -58,6 +58,8 @@ extension MinimapView {
         if minimapHeight > containerHeight {
             setScrollViewPosition(scrollPercentage: scrollPercentage)
         }
+
+        contentView.needsLayout = true
     }
 
     private func setScrollViewPosition(scrollPercentage: CGFloat) {

Sources/CodeEditSourceEditor/Minimap/MinimapView+TextSelectionManagerDelegate.swift

@@ -10,8 +10,8 @@ import CodeEditTextView
 
 extension MinimapView: TextSelectionManagerDelegate {
     public var visibleTextRange: NSRange? {
-        let minY = max(visibleRect.minY, 0)
-        let maxY = min(visibleRect.maxY, layoutManager?.estimatedHeight() ?? 3.0)
+        let minY = max(visibleRect.minY - 12, 0)
+        let maxY = min(visibleRect.maxY + 12, layoutManager?.estimatedHeight() ?? 3.0)
         guard let minYLine = layoutManager?.textLineForPosition(minY),
               let maxYLine = layoutManager?.textLineForPosition(maxY) else {
             return nil