Update Selections, Remove Demo Menu Item

Author: thecoolwinter

Example/CodeEditTextViewExample/CodeEditTextViewExample/Views/ContentView.swift

@@ -17,12 +17,6 @@ struct ContentView: View {
             HStack {
                 Toggle("Wrap Lines", isOn: $wrapLines)
                 Toggle("Inset Edges", isOn: $enableEdgeInsets)
-                Button {
-
-                } label: {
-                    Text("Insert Attachment")
-                }
-
             }
             Divider()
             SwiftUITextView(

Sources/CodeEditTextView/TextLayoutManager/TextAttachments/TextAttachmentManager.swift

@@ -28,7 +28,7 @@ public final class TextAttachmentManager {
                 layoutManager?.lineStorage.update(atOffset: $0.range.location, delta: 0, deltaHeight: -$0.height)
             }
         }
-        layoutManager?.invalidateLayoutForRange(range)
+        layoutManager?.setNeedsLayout()
     }
 
     public func remove(atOffset offset: Int) {

Sources/CodeEditTextView/TextLayoutManager/TextLayoutManager+Layout.swift

@@ -61,11 +61,12 @@ extension TextLayoutManager {
     /// to re-enter.
     /// - Warning: This is probably not what you're looking for. If you need to invalidate layout, or update lines, this
     ///            is not the way to do so. This should only be called when macOS performs layout.
-    public func layoutLines(in rect: NSRect? = nil) { // swiftlint:disable:this function_body_length
+    @discardableResult
+    public func layoutLines(in rect: NSRect? = nil) -> Set<TextLine.ID> { // swiftlint:disable:this function_body_length
         guard let visibleRect = rect ?? delegate?.visibleRect,
               !isInTransaction,
               let textStorage else {
-            return
+            return []
         }
 
         // The macOS may call `layout` on the textView while we're laying out fragment views. This ensures the view
@@ -83,6 +84,10 @@ extension TextLayoutManager {
         var yContentAdjustment: CGFloat = 0
         var maxFoundLineWidth = maxLineWidth
 
+#if DEBUG
+        var laidOutLines: Set<TextLine.ID> = []
+#endif
+
         // Layout all lines, fetching lines lazily as they are laid out.
         for linePosition in linesStartingAt(minY, until: maxY).lazy {
             guard linePosition.yPos < maxY else { continue }
@@ -115,6 +120,9 @@ extension TextLayoutManager {
                 if maxFoundLineWidth < lineSize.width {
                     maxFoundLineWidth = lineSize.width
                 }
+#if DEBUG
+                laidOutLines.insert(linePosition.data.id)
+#endif
             } else {
                 // Make sure the used fragment views aren't dequeued.
                 usedFragmentIDs.formUnion(linePosition.data.lineFragments.map(\.data.id))
@@ -147,6 +155,12 @@ extension TextLayoutManager {
         if originalHeight != lineStorage.height || layoutView?.frame.size.height != lineStorage.height {
             delegate?.layoutManagerHeightDidUpdate(newHeight: lineStorage.height)
         }
+
+#if DEBUG
+        return laidOutLines
+#else
+        return []
+#endif
     }
 
     // MARK: - Layout Single Line

Sources/CodeEditTextView/TextSelectionManager/SelectionManipulation/TextSelectionManager+SelectionManipulation.swift

@@ -25,36 +25,46 @@ public extension TextSelectionManager {
         decomposeCharacters: Bool = false,
         suggestedXPos: CGFloat? = nil
     ) -> NSRange {
+        var range: NSRange
         switch direction {
         case .backward:
             guard offset > 0 else { return NSRange(location: offset, length: 0) } // Can't go backwards beyond 0
-            return extendSelectionHorizontal(
+            range = extendSelectionHorizontal(
                 from: offset,
                 destination: destination,
                 delta: -1,
                 decomposeCharacters: decomposeCharacters
             )
         case .forward:
-            return extendSelectionHorizontal(
+            range = extendSelectionHorizontal(
                 from: offset,
                 destination: destination,
                 delta: 1,
                 decomposeCharacters: decomposeCharacters
             )
         case .up:
-            return extendSelectionVertical(
+            range = extendSelectionVertical(
                 from: offset,
                 destination: destination,
                 up: true,
                 suggestedXPos: suggestedXPos
             )
         case .down:
-            return extendSelectionVertical(
+            range = extendSelectionVertical(
                 from: offset,
                 destination: destination,
                 up: false,
                 suggestedXPos: suggestedXPos
             )
         }
+
+        // Extend ranges to include attachments.
+        if let attachments = layoutManager?.attachments.get(overlapping: range) {
+            attachments.forEach { textAttachment in
+                range.formUnion(textAttachment.range)
+            }
+        }
+
+        return range
     }
 }

Sources/CodeEditTextView/TextView/TextView+Menu.swift

@@ -25,20 +25,9 @@ extension TextView {
         menu.items = [
             NSMenuItem(title: "Cut", action: #selector(cut(_:)), keyEquivalent: "x"),
             NSMenuItem(title: "Copy", action: #selector(copy(_:)), keyEquivalent: "c"),
-            NSMenuItem(title: "Paste", action: #selector(paste(_:)), keyEquivalent: "v"),
-            NSMenuItem(title: "Attach", action: #selector(buh), keyEquivalent: "b")
+            NSMenuItem(title: "Paste", action: #selector(paste(_:)), keyEquivalent: "v")
         ]
 
         return menu
     }
-
-    @objc func buh() {
-        if layoutManager.attachments.get(
-            startingIn: selectedRange()
-        ).first?.range.location == selectedRange().location {
-            layoutManager.attachments.remove(atOffset: selectedRange().location)
-        } else {
-            layoutManager.attachments.add(Buh(), for: selectedRange())
-        }
-    }
 }

Tests/CodeEditTextViewTests/LayoutManager/TextLayoutManagerTests.swift

@@ -43,6 +43,7 @@ struct TextLayoutManagerTests {
     init() throws {
         textView = TextView(string: "A\nB\nC\nD")
         textView.frame = NSRect(x: 0, y: 0, width: 1000, height: 1000)
+        textView.updateFrameIfNeeded()
         textStorage = textView.textStorage
         layoutManager = try #require(textView.layoutManager)
     }
@@ -181,4 +182,29 @@ struct TextLayoutManagerTests {
             lastLineIndex = lineIndex
         }
     }
+
+    @Test
+    func afterLayoutDoesntNeedLayout() {
+        layoutManager.layoutLines(in: NSRect(x: 0, y: 0, width: 1000, height: 1000))
+        #expect(layoutManager.needsLayout == false)
+    }
+
+    @Test
+    func invalidatingRangeLaysOutLines() {
+        layoutManager.layoutLines(in: NSRect(x: 0, y: 0, width: 1000, height: 1000))
+
+        let lineIds = Set(layoutManager.linesInRange(NSRange(start: 2, end: 4)).map { $0.data.id })
+        layoutManager.invalidateLayoutForRange(NSRange(start: 2, end: 4))
+
+        #expect(layoutManager.needsLayout == false) // No forced layout
+        #expect(
+            layoutManager
+                .linesInRange(NSRange(start: 2, end: 4))
+                .allSatisfy({ $0.data.needsLayout(maxWidth: .infinity) })
+        )
+
+        let invalidatedLineIds = layoutManager.layoutLines()
+
+        #expect(invalidatedLineIds == lineIds, "Invalidated lines != lines that were laid out in next pass.")
+    }
 }