Fix Infinite Rect Bug, Remove Warnings

Author: thecoolwinter

Example/CodeEditTextViewExample/CodeEditTextViewExample/Documents/CodeEditTextViewExampleDocument.swift

@@ -25,7 +25,7 @@ struct CodeEditTextViewExampleDocument: FileDocument {
         guard let data = configuration.file.regularFileContents else {
             throw CocoaError(.fileReadCorruptFile)
         }
-        text = String(bytes: data, encoding: .utf8)
+        text = String(bytes: data, encoding: .utf8) ?? ""
     }
 
     func fileWrapper(configuration: WriteConfiguration) throws -> FileWrapper {

Sources/CodeEditTextView/TextLine/LineFragment.swift

@@ -45,7 +45,6 @@ public final class LineFragment: Identifiable, Equatable {
     /// - Parameter offset: The offset, relative to the start of the *line*.
     /// - Returns: The x position of the character in the drawn line, from the left.
     public func xPos(for offset: Int) -> CGFloat {
-        let lineRange = CTLineGetStringRange(ctLine)
         return CTLineGetOffsetForStringIndex(ctLine, offset, nil)
     }
 
@@ -72,7 +71,7 @@ public final class LineFragment: Identifiable, Equatable {
         context.textMatrix = .init(scaleX: 1, y: -1)
         context.textPosition = CGPoint(
             x: 0,
-            y: height - descent + (heightDifference/2)
+            y: yPos + height - descent + (heightDifference/2)
         ).pixelAligned
 
         CTLineDraw(ctLine, context)

Sources/CodeEditTextView/TextView/DraggingTextRenderer.swift

@@ -25,17 +25,11 @@ class DraggingTextRenderer: NSView {
 
         assert(!ranges.isEmpty, "Empty ranges not allowed")
 
-        guard let lastRange = ranges.last else { return nil }
-
         var minY: CGFloat = .infinity
         var maxY: CGFloat = 0.0
 
         for range in ranges {
             for line in layoutManager.lineStorage.linesInRange(range) {
-                guard layoutManager.visibleLineIds.contains(line.data.id), // Only grab visible text
-                      let width = line.data.maxWidth else {
-                    break
-                }
                 minY = min(minY, line.yPos)
                 maxY = max(maxY, line.yPos + line.height)
             }

Sources/CodeEditTextView/TextView/TextView+Drag.swift

@@ -8,11 +8,12 @@
 import Foundation
 import AppKit
 
-fileprivate let pasteboardObjects = [NSString.self, NSURL.self]
+private let pasteboardObjects = [NSString.self, NSURL.self]
 
 extension TextView: NSDraggingSource {
     // MARK: - Drag Gesture
 
+    /// Custom press gesture recognizer that fails if it does not click into a selected range.
     private class DragSelectionGesture: NSPressGestureRecognizer {
         override func mouseDown(with event: NSEvent) {
             guard isEnabled, let view = self.view as? TextView, event.type == .leftMouseDown else {
@@ -38,7 +39,12 @@ extension TextView: NSDraggingSource {
         addGestureRecognizer(dragGesture)
     }
 
-    @objc private func dragGestureHandler(_ sender: Any) {
+    @objc private func dragGestureHandler(_ sender: DragSelectionGesture) {
+        guard sender.state == .began else { return }
+        defer {
+            sender.state = .ended
+        }
+
         guard let visibleTextRange,
               let draggingView = DraggingTextRenderer(
                 ranges: selectionManager.textSelections
@@ -65,7 +71,7 @@ extension TextView: NSDraggingSource {
             .textSelections
             .sorted(by: { $0.range.location < $1.range.location })
             .map { textStorage.attributedSubstring(from: $0.range) }
-        var attributedString = NSMutableAttributedString()
+        let attributedString = NSMutableAttributedString()
         for (idx, string) in attributedStrings.enumerated() {
             attributedString.append(string)
             if idx < attributedStrings.count - 1 {
@@ -184,6 +190,7 @@ extension TextView: NSDraggingSource {
             return false
         }
 
+        undoManager?.beginUndoGrouping()
         if let source = sender.draggingSource as? TextView, source === self {
             // Offset the insertion location so that we can remove the text first before pasting it into the editor.
             var updatedInsertionOffset = insertionOffset
@@ -200,6 +207,8 @@ extension TextView: NSDraggingSource {
         }
 
         replaceCharacters(in: [NSRange(location: insertionOffset, length: 0)], with: insertionString)
+        undoManager?.endUndoGrouping()
+
         selectionManager.setSelectedRange(
             NSRange(location: insertionOffset, length: NSString(string: insertionString).length)
         )

Sources/CodeEditTextView/TextView/TextView.swift

@@ -244,7 +244,7 @@ public class TextView: NSView, NSTextContent {
     /// - Warning: Do not update the text storage object directly. Doing so will very likely break the text view's
     ///            layout system. Use methods like ``TextView/replaceCharacters(in:with:)-58mt7`` or
     ///            ``TextView/insertText(_:)`` to modify content.
-    private(set) public var textStorage: NSTextStorage!
+    package(set) public var textStorage: NSTextStorage!
 
     /// The layout manager for the text view.
     private(set) public var layoutManager: TextLayoutManager!