From 6f22a028f19af8c706e90fdc80dd5833e34e13e9 Mon Sep 17 00:00:00 2001
From: Khan Winter <35942988+thecoolwinter@users.noreply.github.com>
Date: Tue, 27 May 2025 10:45:57 -0500
Subject: [PATCH] [chore:] Update CodeEditTextView to `0.11.0`

---
 Package.swift                                        |  2 +-
 .../Controller/TextViewController+LoadView.swift     |  5 +----
 .../Minimap/MinimapLineRenderer.swift                | 12 +++++++++---
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/Package.swift b/Package.swift
index 524d4b609..751fc8829 100644
--- a/Package.swift
+++ b/Package.swift
@@ -17,7 +17,7 @@ let package = Package(
         // A fast, efficient, text view for code.
         .package(
             url: "https://github.com/CodeEditApp/CodeEditTextView.git",
-            from: "0.10.1"
+            from: "0.11.0"
         ),
         // tree-sitter languages
         .package(
diff --git a/Sources/CodeEditSourceEditor/Controller/TextViewController+LoadView.swift b/Sources/CodeEditSourceEditor/Controller/TextViewController+LoadView.swift
index be71427a7..9b7028a9e 100644
--- a/Sources/CodeEditSourceEditor/Controller/TextViewController+LoadView.swift
+++ b/Sources/CodeEditSourceEditor/Controller/TextViewController+LoadView.swift
@@ -106,9 +106,7 @@ extension TextViewController {
             object: scrollView.contentView,
             queue: .main
         ) { [weak self] notification in
-            guard let clipView = notification.object as? NSClipView,
-                  let textView = self?.textView else { return }
-            textView.updatedViewport(self?.scrollView.documentVisibleRect ?? .zero)
+            guard let clipView = notification.object as? NSClipView else { return }
             self?.gutterView.needsDisplay = true
             self?.minimapXConstraint?.constant = clipView.bounds.origin.x
         }
@@ -120,7 +118,6 @@ extension TextViewController {
             object: scrollView.contentView,
             queue: .main
         ) { [weak self] _ in
-            self?.textView.updatedViewport(self?.scrollView.documentVisibleRect ?? .zero)
             self?.gutterView.needsDisplay = true
             self?.emphasisManager?.removeEmphases(for: EmphasisGroup.brackets)
             self?.updateTextInsets()
diff --git a/Sources/CodeEditSourceEditor/Minimap/MinimapLineRenderer.swift b/Sources/CodeEditSourceEditor/Minimap/MinimapLineRenderer.swift
index f4de2e376..94f32e69f 100644
--- a/Sources/CodeEditSourceEditor/Minimap/MinimapLineRenderer.swift
+++ b/Sources/CodeEditSourceEditor/Minimap/MinimapLineRenderer.swift
@@ -21,7 +21,7 @@ final class MinimapLineRenderer: TextLayoutManagerRenderDelegate {
         range: NSRange,
         stringRef: NSTextStorage,
         markedRanges: MarkedRanges?,
-        breakStrategy: LineBreakStrategy
+        lineBreakStrategy: LineBreakStrategy
     ) {
         let maxWidth: CGFloat = if let textView, textView.wrapLines {
             textView.layoutManager.maxLineLayoutWidth
@@ -34,7 +34,7 @@ final class MinimapLineRenderer: TextLayoutManagerRenderDelegate {
             range: range,
             stringRef: stringRef,
             markedRanges: markedRanges,
-            breakStrategy: breakStrategy
+            attachments: []
         )
 
         // Make all fragments 2px tall
@@ -62,6 +62,12 @@ final class MinimapLineRenderer: TextLayoutManagerRenderDelegate {
 
     func characterXPosition(in lineFragment: LineFragment, for offset: Int) -> CGFloat {
         // Offset is relative to the whole line, the CTLine is too.
-        return 8 + (CGFloat(offset - CTLineGetStringRange(lineFragment.ctLine).location) * 1.5)
+        guard let content = lineFragment.contents.first else { return 0.0 }
+        switch content.data {
+        case .text(let ctLine):
+            return 8 + (CGFloat(offset - CTLineGetStringRange(ctLine).location) * 1.5)
+        case .attachment:
+            return 0.0
+        }
     }
 }