Merge branch 'main' into itembox

Author: FastestMolasses

Sources/CodeEditTextView/TextLayoutManager/TextLayoutManager+Public.swift

@@ -13,7 +13,7 @@ extension TextLayoutManager {
     }
 
     public func estimatedWidth() -> CGFloat {
-        maxLineWidth
+        maxLineWidth + edgeInsets.horizontal
     }
 
     /// Finds a text line for the given y position relative to the text view.

Sources/CodeEditTextView/TextLayoutManager/TextLayoutManager.swift

@@ -266,9 +266,12 @@ public class TextLayoutManager: NSObject {
         // Update the visible lines with the new set.
         visibleLineIds = newVisibleLines
 
-        if originalHeight != lineStorage.height || layoutView?.frame.size.height != lineStorage.height {
-            delegate?.layoutManagerHeightDidUpdate(newHeight: lineStorage.height)
-        }
+        #if DEBUG
+        isInLayout = false
+        #endif
+
+        // These are fine to update outside of `isInLayout` as our internal data structures are finalized at this point
+        // so laying out again won't break our line storage or visible line.
 
         if maxFoundLineWidth > maxLineWidth {
             maxLineWidth = maxFoundLineWidth
@@ -278,9 +281,10 @@ public class TextLayoutManager: NSObject {
             delegate?.layoutManagerYAdjustment(yContentAdjustment)
         }
 
-        #if DEBUG
-        isInLayout = false
-        #endif
+        if originalHeight != lineStorage.height || layoutView?.frame.size.height != lineStorage.height {
+            delegate?.layoutManagerHeightDidUpdate(newHeight: lineStorage.height)
+        }
+
         needsLayout = false
     }
 

Sources/CodeEditTextView/TextSelectionManager/TextSelectionManager.swift

@@ -188,6 +188,16 @@ public class TextSelectionManager: NSObject {
         if didUpdate {
             delegate?.setNeedsDisplay()
             cursorTimer.resetTimer()
+            resetSystemCursorTimers()
+        }
+    }
+
+    private func resetSystemCursorTimers() {
+        guard #available(macOS 14, *) else { return }
+        for cursorView in textSelections.compactMap({ $0.view as? NSTextInsertionIndicator }) {
+            let frame = cursorView.frame
+            cursorView.frame = .zero
+            cursorView.frame = frame
         }
     }
 

Sources/CodeEditTextView/TextView/TextView+Delete.swift

@@ -60,6 +60,7 @@ extension TextView {
             guard extendedRange.location >= 0 else { continue }
             textSelection.range.formUnion(extendedRange)
         }
+        selectionManager.textSelections.sort(by: { $0.range.location < $1.range.location })
         KillRing.shared.kill(
             strings: selectionManager.textSelections.map(\.range).compactMap({ textStorage.substring(from: $0) })
         )

Sources/CodeEditTextView/TextView/TextView+Layout.swift

@@ -58,6 +58,8 @@ extension TextView {
         inputContext?.invalidateCharacterCoordinates()
     }
 
+    /// Updates the view's frame if needed depending on wrapping lines, a new maximum width, or changed available size.
+    /// - Returns: Whether or not the view was updated.
     @discardableResult
     public func updateFrameIfNeeded() -> Bool {
         var availableSize = scrollView?.contentSize ?? .zero
@@ -83,7 +85,7 @@ extension TextView {
         if didUpdate {
             needsLayout = true
             needsDisplay = true
-            layoutManager.layoutLines()
+            layoutManager.setNeedsLayout()
         }
 
         if isSelectable {

Sources/CodeEditTextView/TextView/TextView+ReplaceCharacters.swift

@@ -42,6 +42,12 @@ extension TextView {
         layoutManager.endTransaction()
         selectionManager.notifyAfterEdit()
         NotificationCenter.default.post(name: Self.textDidChangeNotification, object: self)
+
+        // `scrollSelectionToVisible` is a little expensive to call every time. Instead we just check if the first
+        // selection is entirely visible. `.contains` checks that all points in the rect are inside. 
+        if let selection = selectionManager.textSelections.first, !visibleRect.contains(selection.boundingRect) {
+            scrollSelectionToVisible()
+        }
     }
 
     /// Replace the characters in a range with a new string.