Move Struct, Update Tests

Author: thecoolwinter

Sources/CodeEditTextView/MarkedTextManager/MarkedRanges.swift

@@ -0,0 +1,15 @@
+//
+//  MarkedRanges.swift
+//  CodeEditTextView
+//
+//  Created by Khan Winter on 4/17/25.
+//
+
+import AppKit
+
+/// Struct for passing attribute and range information easily down into line fragments, typesetters w/o
+/// requiring a reference to the marked text manager.
+public struct MarkedRanges {
+    let ranges: [NSRange]
+    let attributes: [NSAttributedString.Key: Any]
+}

Sources/CodeEditTextView/MarkedTextManager/MarkedTextManager.swift

@@ -7,13 +7,6 @@
 
 import AppKit
 
-/// Struct for passing attribute and range information easily down into line fragments, typesetters w/o
-/// requiring a reference to the marked text manager.
-public struct MarkedRanges {
-    let ranges: [NSRange]
-    let attributes: [NSAttributedString.Key: Any]
-}
-
 /// Manages marked ranges. Not a public API.
 class MarkedTextManager {
     /// All marked ranges being tracked.

Tests/CodeEditTextViewTests/OverridingLayoutManagerRenderingTests.swift

@@ -68,7 +68,7 @@ struct OverridingLayoutManagerRenderingTests {
             textLine.lineFragments.forEach { fragmentPosition in
                 let idealHeight: CGFloat = 2.0
                 textLine.lineFragments.update(
-                    atIndex: fragmentPosition.index,
+                    atOffset: fragmentPosition.index,
                     delta: 0,
                     deltaHeight: -(fragmentPosition.height - idealHeight)
                 )
@@ -86,6 +86,7 @@ struct OverridingLayoutManagerRenderingTests {
         // Edit some text
 
         textStorage.replaceCharacters(in: NSRange(location: 0, length: 0), with: "0\n1\r\n2\r")
+        layoutManager.layoutLines(in: NSRect(x: 0, y: 0, width: 1000, height: 1000))
 
         #expect(layoutManager.lineCount == 7)
         #expect(layoutManager.lineStorage.height == 14.0)

Tests/CodeEditTextViewTests/TypesetterTests.swift

@@ -11,6 +11,7 @@ class TypesetterTests: XCTestCase {
         let typesetter = Typesetter()
         typesetter.typeset(
             NSAttributedString(string: "testline\n"),
+            documentRange: NSRange(location: 0, length: 9),
             displayData: unlimitedLineWidthDisplayData,
             breakStrategy: .word,
             markedRanges: nil
@@ -20,6 +21,7 @@ class TypesetterTests: XCTestCase {
 
         typesetter.typeset(
             NSAttributedString(string: "testline\n"),
+            documentRange: NSRange(location: 0, length: 9),
             displayData: unlimitedLineWidthDisplayData,
             breakStrategy: .character,
             markedRanges: nil
@@ -32,6 +34,7 @@ class TypesetterTests: XCTestCase {
         let typesetter = Typesetter()
         typesetter.typeset(
             NSAttributedString(string: "testline\r"),
+            documentRange: NSRange(location: 0, length: 9),
             displayData: unlimitedLineWidthDisplayData,
             breakStrategy: .word,
             markedRanges: nil
@@ -41,6 +44,7 @@ class TypesetterTests: XCTestCase {
 
         typesetter.typeset(
             NSAttributedString(string: "testline\r"),
+            documentRange: NSRange(location: 0, length: 9),
             displayData: unlimitedLineWidthDisplayData,
             breakStrategy: .character,
             markedRanges: nil
@@ -53,6 +57,7 @@ class TypesetterTests: XCTestCase {
         let typesetter = Typesetter()
         typesetter.typeset(
             NSAttributedString(string: "testline\r\n"),
+            documentRange: NSRange(location: 0, length: 10),
             displayData: unlimitedLineWidthDisplayData,
             breakStrategy: .word,
             markedRanges: nil
@@ -62,6 +67,7 @@ class TypesetterTests: XCTestCase {
 
         typesetter.typeset(
             NSAttributedString(string: "testline\r\n"),
+            documentRange: NSRange(location: 0, length: 10),
             displayData: unlimitedLineWidthDisplayData,
             breakStrategy: .character,
             markedRanges: nil