Correctly Wrap Lines, Render Line Breaks, Add to ScrollView

Author: thecoolwinter

Sources/CodeEditSourceEditor/Controller/EditorContainerView.swift

@@ -22,16 +22,31 @@ class EditorContainerView: NSView {
         addSubview(scrollView)
         addSubview(minimapView)
 
+        scrollView.hasVerticalScroller = true
+
+        let maxWidthConstraint = minimapView.widthAnchor.constraint(lessThanOrEqualToConstant: 150)
+        let relativeWidthConstraint = minimapView.widthAnchor.constraint(
+            equalTo: widthAnchor,
+            multiplier: 0.18
+        )
+        relativeWidthConstraint.priority = .defaultLow
+
+        guard let scrollerAnchor = scrollView.verticalScroller?.leadingAnchor else {
+            assertionFailure("Scroll view failed to create a scroller.")
+            return
+        }
+
         NSLayoutConstraint.activate([
             scrollView.topAnchor.constraint(equalTo: topAnchor),
             scrollView.bottomAnchor.constraint(equalTo: bottomAnchor),
             scrollView.leadingAnchor.constraint(equalTo: leadingAnchor),
             scrollView.trailingAnchor.constraint(equalTo: trailingAnchor),
 
-            minimapView.topAnchor.constraint(equalTo: safeAreaLayoutGuide.topAnchor),
+            minimapView.topAnchor.constraint(equalTo: topAnchor),
             minimapView.bottomAnchor.constraint(equalTo: bottomAnchor),
-            minimapView.trailingAnchor.constraint(equalTo: trailingAnchor),
-            minimapView.widthAnchor.constraint(equalToConstant: 150)
+            minimapView.trailingAnchor.constraint(equalTo: scrollerAnchor),
+            maxWidthConstraint,
+            relativeWidthConstraint
         ])
     }
 

Sources/CodeEditSourceEditor/Controller/TextViewController+StyleViews.swift

@@ -71,13 +71,19 @@ extension TextViewController {
         if let contentInsets {
             scrollView.automaticallyAdjustsContentInsets = false
             scrollView.contentInsets = contentInsets
+            minimapView.scrollView.contentInsets.top = contentInsets.top
+            minimapView.scrollView.contentInsets.top = contentInsets.bottom
         } else {
             scrollView.automaticallyAdjustsContentInsets = true
+            minimapView.scrollView.automaticallyAdjustsContentInsets = true
         }
 
         scrollView.contentInsets.top += additionalTextInsets?.top ?? 0
         scrollView.contentInsets.bottom += additionalTextInsets?.bottom ?? 0
 
         scrollView.contentInsets.top += (findViewController?.isShowingFindPanel ?? false) ? FindPanel.height : 0
+        minimapView.scrollView.contentInsets.top += (
+            findViewController?.isShowingFindPanel ?? false
+        ) ? FindPanel.height : 0
     }
 }

Sources/CodeEditSourceEditor/Minimap/MinimapLineFragmentView.swift

@@ -113,9 +113,9 @@ final class MinimapLineFragmentView: LineFragmentView {
         context.saveGState()
         for run in drawingRuns {
             let rect = CGRect(
-                x: 8 + (CGFloat(run.range.location) * 2),
+                x: 8 + (CGFloat(run.range.location) * 1.5),
                 y: 0,
-                width: CGFloat(run.range.length) * 2,
+                width: CGFloat(run.range.length) * 1.5,
                 height: 2.0
             )
             context.setFillColor(run.color.cgColor)

Sources/CodeEditSourceEditor/Minimap/MinimapLineRenderer.swift

@@ -24,7 +24,7 @@ final class MinimapLineRenderer: TextLayoutManagerRenderDelegate {
         breakStrategy: LineBreakStrategy
     ) {
         let maxWidth: CGFloat = if let textView, textView.wrapLines {
-            textView.frame.width
+            textView.layoutManager.maxLineLayoutWidth
         } else {
             .infinity
         }
@@ -39,10 +39,11 @@ final class MinimapLineRenderer: TextLayoutManagerRenderDelegate {
 
         // Make all fragments 2px tall
         textLine.lineFragments.forEach { fragmentPosition in
+            let remainingHeight = fragmentPosition.height - 3.0
             textLine.lineFragments.update(
-                atIndex: fragmentPosition.index,
+                atOffset: fragmentPosition.range.location,
                 delta: 0,
-                deltaHeight: -(fragmentPosition.height - 3.0)
+                deltaHeight: -remainingHeight
             )
             fragmentPosition.data.height = 2.0
             fragmentPosition.data.scaledHeight = 3.0

Sources/CodeEditSourceEditor/Minimap/MinimapView+TextLayoutManagerDelegate.swift

@@ -0,0 +1,34 @@
+//
+//  MinimapView+TextLayoutManagerDelegate.swift
+//  CodeEditSourceEditor
+//
+//  Created by Khan Winter on 4/11/25.
+//
+
+import AppKit
+import CodeEditTextView
+
+extension MinimapView: TextLayoutManagerDelegate {
+    func layoutManagerHeightDidUpdate(newHeight: CGFloat) {
+        contentView.frame.size.height = newHeight
+    }
+
+    func layoutManagerMaxWidthDidChange(newWidth: CGFloat) { }
+
+    func layoutManagerTypingAttributes() -> [NSAttributedString.Key: Any] {
+        textView?.layoutManagerTypingAttributes() ?? [:]
+    }
+
+    func textViewportSize() -> CGSize {
+        var size = scrollView.contentSize
+        size.height -= scrollView.contentInsets.top + scrollView.contentInsets.bottom
+        size.width = textView?.layoutManager.maxLineLayoutWidth ?? size.width
+        return size
+    }
+
+    func layoutManagerYAdjustment(_ yAdjustment: CGFloat) {
+        var point = scrollView.documentVisibleRect.origin
+        point.y += yAdjustment
+        scrollView.documentView?.scroll(point)
+    }
+}

Sources/CodeEditSourceEditor/Minimap/MinimapView.swift

@@ -10,6 +10,9 @@ import CodeEditTextView
 
 class MinimapView: NSView {
     weak var textView: TextView?
+
+    let scrollView: NSScrollView
+    let contentView: FlippedNSView
     var layoutManager: TextLayoutManager?
     let lineRenderer: MinimapLineRenderer
 
@@ -19,21 +22,32 @@ class MinimapView: NSView {
         }
     }
 
-    override var isFlipped: Bool { true }
-
     init(textView: TextView, theme: EditorTheme) {
         self.textView = textView
         self.theme = theme
         self.lineRenderer = MinimapLineRenderer(textView: textView)
 
+        self.scrollView = NSScrollView()
+        scrollView.translatesAutoresizingMaskIntoConstraints = false
+        scrollView.hasVerticalScroller = false
+        scrollView.hasHorizontalScroller = false
+        scrollView.drawsBackground = false
+        scrollView.verticalScrollElasticity = .none
+
+        self.contentView = FlippedNSView(frame: .zero)
+        contentView.translatesAutoresizingMaskIntoConstraints = false
+
         super.init(frame: .zero)
 
+        addSubview(scrollView)
+        scrollView.documentView = contentView
+
         self.translatesAutoresizingMaskIntoConstraints = false
         let layoutManager = TextLayoutManager(
             textStorage: textView.textStorage,
             lineHeightMultiplier: 1.0,
             wrapLines: textView.wrapLines,
-            textView: self,
+            textView: contentView,
             delegate: self,
             renderDelegate: lineRenderer
         )
@@ -42,12 +56,31 @@ class MinimapView: NSView {
 
         wantsLayer = true
         layer?.backgroundColor = theme.background.cgColor
+
+        setUpConstraints()
+    }
+
+    private func setUpConstraints() {
+        NSLayoutConstraint.activate([
+            scrollView.topAnchor.constraint(equalTo: topAnchor),
+            scrollView.bottomAnchor.constraint(equalTo: bottomAnchor),
+            scrollView.leadingAnchor.constraint(equalTo: leadingAnchor),
+            scrollView.trailingAnchor.constraint(equalTo: trailingAnchor),
+
+            contentView.widthAnchor.constraint(equalTo: widthAnchor)
+        ])
     }
 
     required init?(coder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
 
+    override public var visibleRect: NSRect {
+        var rect = scrollView.documentVisibleRect
+        rect.origin.y += scrollView.contentInsets.top
+        return rect.pixelAligned
+    }
+
     override func layout() {
         layoutManager?.layoutLines()
         super.layout()
@@ -64,26 +97,12 @@ class MinimapView: NSView {
 
         context.restoreGState()
     }
-}
-
-extension MinimapView: TextLayoutManagerDelegate {
-    func layoutManagerHeightDidUpdate(newHeight: CGFloat) {
-
-    }
-
-    func layoutManagerMaxWidthDidChange(newWidth: CGFloat) {
-
-    }
-
-    func layoutManagerTypingAttributes() -> [NSAttributedString.Key: Any] {
-        textView?.layoutManagerTypingAttributes() ?? [:]
-    }
 
-    func textViewportSize() -> CGSize {
-        self.frame.size
-    }
-
-    func layoutManagerYAdjustment(_ yAdjustment: CGFloat) {
-        // TODO: Adjust things
+    override func hitTest(_ point: NSPoint) -> NSView? {
+        if visibleRect.contains(point) {
+            return self
+        } else {
+            return super.hitTest(point)
+        }
     }
 }

Sources/CodeEditSourceEditor/Utils/FlippedNSView.swift

@@ -0,0 +1,12 @@
+//
+//  FlippedNSView.swift
+//  CodeEditSourceEditor
+//
+//  Created by Khan Winter on 4/11/25.
+//
+
+import AppKit
+
+class FlippedNSView: NSView {
+    override var isFlipped: Bool { true }
+}