Remove Unnecessary LineFragment Variables

Author: thecoolwinter

Sources/CodeEditTextView/Extensions/NSRange+/NSRange+translate.swift

@@ -0,0 +1,14 @@
+//
+//  NSRange+translate.swift
+//  CodeEditTextView
+//
+//  Created by Khan Winter on 7/21/25.
+//
+
+import Foundation
+
+extension NSRange {
+    func translate(location: Int) -> NSRange {
+        NSRange(location: self.location + location, length: length)
+    }
+}

Sources/CodeEditTextView/TextLayoutManager/TextLayoutManager+Layout.swift

@@ -263,8 +263,13 @@ extension TextLayoutManager {
 //        ) {
         for lineFragmentPosition in line.lineFragments {
             let lineFragment = lineFragmentPosition.data
+            lineFragment.documentRange = lineFragmentPosition.range.translate(location: position.range.location)
 
-            layoutFragmentView(for: lineFragmentPosition, at: position.yPos + lineFragmentPosition.yPos)
+            layoutFragmentView(
+                inLine: position,
+                for: lineFragmentPosition,
+                at: position.yPos + lineFragmentPosition.yPos
+            )
 
             width = max(width, lineFragment.width)
             height += lineFragment.scaledHeight
@@ -281,14 +286,16 @@ extension TextLayoutManager {
     ///   - lineFragment: The line fragment position to lay out a view for.
     ///   - yPos: The y value at which the line should begin.
     private func layoutFragmentView(
+        inLine line: TextLineStorage<TextLine>.TextLinePosition,
         for lineFragment: TextLineStorage<LineFragment>.TextLinePosition,
         at yPos: CGFloat
     ) {
+        let fragmentRange = lineFragment.range.translate(location: line.range.location)
         let view = viewReuseQueue.getOrCreateView(forKey: lineFragment.data.id) {
             renderDelegate?.lineFragmentView(for: lineFragment.data) ?? LineFragmentView()
         }
         view.translatesAutoresizingMaskIntoConstraints = true // Small optimization for lots of subviews
-        view.setLineFragment(lineFragment.data, renderer: lineFragmentRenderer)
+        view.setLineFragment(lineFragment.data, fragmentRange: fragmentRange, renderer: lineFragmentRenderer)
         view.frame.origin = CGPoint(x: edgeInsets.left, y: yPos)
         layoutView?.addSubview(view, positioned: .below, relativeTo: nil)
         view.needsDisplay = true
@@ -300,7 +307,9 @@ extension TextLayoutManager {
             guard let view = viewReuseQueue.getView(forKey: lineFragmentPosition.data.id) else {
                 return true
             }
-
+            lineFragmentPosition.data.documentRange = lineFragmentPosition.range.translate(
+                location: position.range.location
+            )
             view.frame.origin = CGPoint(x: edgeInsets.left, y: position.yPos + lineFragmentPosition.yPos)
         }
         return false

Sources/CodeEditTextView/TextLayoutManager/TextLayoutManager+Public.swift

@@ -112,12 +112,13 @@ extension TextLayoutManager {
         fragmentPosition: TextLineStorage<LineFragment>.TextLinePosition,
         in linePosition: TextLineStorage<TextLine>.TextLinePosition
     ) -> Int? {
-        let endPosition = fragmentPosition.data.documentRange.max
+        let fragmentRange = fragmentPosition.range.translate(location: linePosition.range.location)
+        let endPosition = fragmentRange.max
 
         // If the endPosition is at the end of the line, and the line ends with a line ending character
         // return the index before the eol.
         if fragmentPosition.index == linePosition.data.lineFragments.count - 1,
-           let lineEnding = LineEnding(line: textStorage?.substring(from: fragmentPosition.data.documentRange) ?? "") {
+           let lineEnding = LineEnding(line: textStorage?.substring(from: fragmentRange) ?? "") {
             return endPosition - lineEnding.length
         } else if fragmentPosition.index != linePosition.data.lineFragments.count - 1 {
             // If this isn't the last fragment, we want to place the cursor at the offset right before the break
@@ -175,7 +176,7 @@ extension TextLayoutManager {
         guard let fragmentPosition = linePosition.data.typesetter.lineFragments.getLine(
             atOffset: offset - linePosition.range.location
         ) else {
-            return nil
+            return CGRect(x: edgeInsets.left, y: linePosition.yPos, width: 0, height: linePosition.height)
         }
 
         // Get the *real* length of the character at the offset. If this is a surrogate pair it'll return the correct
@@ -190,11 +191,11 @@ extension TextLayoutManager {
 
         let minXPos = characterXPosition(
             in: fragmentPosition.data,
-            for: realRange.location - fragmentPosition.data.documentRange.location
+            for: realRange.location - linePosition.range.location - fragmentPosition.range.location
         )
         let maxXPos = characterXPosition(
             in: fragmentPosition.data,
-            for: realRange.max - fragmentPosition.data.documentRange.location
+            for: realRange.max - linePosition.range.location - fragmentPosition.range.location
         )
 
         return CGRect(

Sources/CodeEditTextView/TextLine/LineFragment.swift

@@ -47,8 +47,7 @@ public final class LineFragment: Identifiable, Equatable {
     }
 
     public let id = UUID()
-    public let lineRange: NSRange
-    public let documentRange: NSRange
+    public var documentRange: NSRange = .notFound
     public var contents: [FragmentContent]
     public var width: CGFloat
     public var height: CGFloat
@@ -61,16 +60,12 @@ public final class LineFragment: Identifiable, Equatable {
     }
 
     init(
-        lineRange: NSRange,
-        documentRange: NSRange,
         contents: [FragmentContent],
         width: CGFloat,
         height: CGFloat,
         descent: CGFloat,
         lineHeightMultiplier: CGFloat
     ) {
-        self.lineRange = lineRange
-        self.documentRange = documentRange
         self.contents = contents
         self.width = width
         self.height = height

Sources/CodeEditTextView/TextLine/LineFragmentRenderer.swift

@@ -122,7 +122,7 @@ public final class LineFragmentRenderer {
             context: context
         )
 
-        let range = createTextRange(for: drawingContext)
+        let range = createTextRange(for: drawingContext).clamped(to: (textStorage.string as NSString).length)
         let string = (textStorage.string as NSString).substring(with: range)
 
         processInvisibleCharacters(
@@ -177,7 +177,7 @@ public final class LineFragmentRenderer {
         guard let style = delegate.invisibleStyle(
             for: character,
             at: NSRange(start: range.location + index, end: range.max),
-            lineRange: drawingContext.lineFragment.lineRange
+            lineRange: drawingContext.lineFragment.documentRange
         ) else {
             return
         }

Sources/CodeEditTextView/TextLine/LineFragmentView.swift

@@ -79,7 +79,7 @@ open class LineFragmentView: NSView {
 
     /// Set a new line fragment for this view, updating view size.
     /// - Parameter newFragment: The new fragment to use.
-    open func setLineFragment(_ newFragment: LineFragment, renderer: LineFragmentRenderer) {
+    open func setLineFragment(_ newFragment: LineFragment, fragmentRange: NSRange, renderer: LineFragmentRenderer) {
         self.lineFragment = newFragment
         self.renderer = renderer
         self.frame.size = CGSize(width: newFragment.width, height: newFragment.scaledHeight)

Sources/CodeEditTextView/TextLine/TextLine.swift

@@ -62,7 +62,6 @@ public final class TextLine: Identifiable, Equatable {
             markedRanges: markedRanges,
             attachments: attachments
         )
-//        self.maxWidth = min(maxWidth, displayData.maxWidth)
         self.maxWidth = displayData.maxWidth
         needsLayout = false
     }

Sources/CodeEditTextView/TextLine/Typesetter/TypesetContext.swift

@@ -16,7 +16,6 @@ struct TypesetContext {
     /// Accumulated generated line fragments.
     var lines: [TextLineStorage<LineFragment>.BuildItem] = []
     var maxHeight: CGFloat = 0
-    var maxWidth: CGFloat = 0
     /// The current fragment typesetting context.
     var fragmentContext = LineFragmentTypesetContext(start: 0, width: 0.0, height: 0.0, descent: 0.0)
 
@@ -62,11 +61,6 @@ struct TypesetContext {
     /// Pop the current fragment state into a new line fragment, and reset the fragment state.
     mutating func popCurrentData() {
         let fragment = LineFragment(
-            lineRange: documentRange,
-            documentRange: NSRange(
-                location: fragmentContext.start + documentRange.location,
-                length: currentPosition - fragmentContext.start
-            ),
             contents: fragmentContext.contents,
             width: fragmentContext.width,
             height: fragmentContext.height,
@@ -77,7 +71,6 @@ struct TypesetContext {
             .init(data: fragment, length: currentPosition - fragmentContext.start, height: fragment.scaledHeight)
         )
         maxHeight = max(maxHeight, fragment.scaledHeight)
-        maxWidth = max(maxWidth, fragment.width)
 
         fragmentContext.clear()
         fragmentContext.start = currentPosition

Sources/CodeEditTextView/TextLine/Typesetter/Typesetter.swift

@@ -33,31 +33,28 @@ final public class Typesetter {
 
     public init() { }
 
-    /// Performs the typesetting operation, returning the maximum width required for the current layout.
-    /// - Returns: The maximum width the typeset lines require.
     public func typeset(
         _ string: NSAttributedString,
         documentRange: NSRange,
         displayData: TextLine.DisplayData,
         markedRanges: MarkedRanges?,
         attachments: [AnyTextAttachment] = []
-    ) -> CGFloat {
+    ) {
         let string = makeString(string: string, markedRanges: markedRanges)
         lineFragments.removeAll()
 
         // Fast path
         if string.length == 0 || displayData.maxWidth <= 0 {
             typesetEmptyLine(displayData: displayData, string: string)
-            return 0.0
+            return
         }
-        let (lines, maxSize) = typesetLineFragments(
+        let (lines, maxHeight) = typesetLineFragments(
             string: string,
             documentRange: documentRange,
             displayData: displayData,
             attachments: attachments
         )
-        lineFragments.build(from: lines, estimatedLineHeight: maxSize.height)
-        return maxSize.width
+        lineFragments.build(from: lines, estimatedLineHeight: maxHeight)
     }
 
     private func makeString(string: NSAttributedString, markedRanges: MarkedRanges?) -> NSAttributedString {
@@ -135,7 +132,7 @@ final public class Typesetter {
         documentRange: NSRange,
         displayData: TextLine.DisplayData,
         attachments: [AnyTextAttachment]
-    ) -> (lines: [TextLineStorage<LineFragment>.BuildItem], maxSize: CGSize) {
+    ) -> (lines: [TextLineStorage<LineFragment>.BuildItem], maxHeight: CGFloat) {
         let contentRuns = createContentRuns(string: string, documentRange: documentRange, attachments: attachments)
         var context = TypesetContext(documentRange: documentRange, displayData: displayData)
 
@@ -158,7 +155,7 @@ final public class Typesetter {
             context.popCurrentData()
         }
 
-        return (context.lines, CGSize(width: context.maxWidth, height: context.maxHeight))
+        return (context.lines, context.maxHeight)
     }
 
     // MARK: - Layout Text Fragments
@@ -233,8 +230,6 @@ final public class Typesetter {
         // Insert an empty fragment
         let ctLine = CTTypesetterCreateLine(typesetter, CFRangeMake(0, 0))
         let fragment = LineFragment(
-            lineRange: documentRange ?? .zero,
-            documentRange: NSRange(location: (documentRange ?? .notFound).location, length: 0),
             contents: [.init(data: .text(line: ctLine), width: 0.0)],
             width: 0,
             height: displayData.estimatedLineHeight / displayData.lineHeightMultiplier,

Sources/CodeEditTextView/TextView/TextView+ScrollToVisible.swift

@@ -29,10 +29,11 @@ extension TextView {
             layoutManager.layoutLines()
             selectionManager.updateSelectionViews()
             selectionManager.drawSelections(in: visibleRect)
-        }
-        if lastFrame != .zero {
-            scrollView.contentView.scrollToVisible(lastFrame)
-            scrollView.reflectScrolledClipView(scrollView.contentView)
+
+            if lastFrame != .zero {
+                scrollView.contentView.scrollToVisible(lastFrame)
+                scrollView.reflectScrolledClipView(scrollView.contentView)
+            }
         }
     }