Rearrange Break Strategy into DisplayData

Author: thecoolwinter

Sources/CodeEditTextView/TextLayoutManager/TextLayoutManager+Layout.swift

@@ -167,7 +167,8 @@ extension TextLayoutManager {
         let lineDisplayData = TextLine.DisplayData(
             maxWidth: layoutData.maxWidth,
             lineHeightMultiplier: lineHeightMultiplier,
-            estimatedLineHeight: estimateLineHeight()
+            estimatedLineHeight: estimateLineHeight(),
+            breakStrategy: lineBreakStrategy
         )
 
         let line = position.data
@@ -187,7 +188,6 @@ extension TextLayoutManager {
                 range: position.range,
                 stringRef: textStorage,
                 markedRanges: markedTextManager.markedRanges(in: position.range),
-                breakStrategy: lineBreakStrategy,
                 attachments: attachments.get(startingIn: position.range)
             )
         }

Sources/CodeEditTextView/TextLayoutManager/TextLayoutManagerRenderDelegate.swift

@@ -44,7 +44,6 @@ public extension TextLayoutManagerRenderDelegate {
             range: range,
             stringRef: stringRef,
             markedRanges: markedRanges,
-            breakStrategy: breakStrategy,
             attachments: attachments
         )
     }

Sources/CodeEditTextView/TextLine/TextLine.swift

@@ -48,13 +48,12 @@ public final class TextLine: Identifiable, Equatable {
     ///   - range: The range this text range represents in the entire document.
     ///   - stringRef: A reference to the string storage for the document.
     ///   - markedRanges: Any marked ranges in the line.
-    ///   - breakStrategy: Determines how line breaks are calculated.
+    ///   - attachments: Any attachments overlapping the line range.
     public func prepareForDisplay(
         displayData: DisplayData,
         range: NSRange,
         stringRef: NSTextStorage,
         markedRanges: MarkedRanges?,
-        breakStrategy: LineBreakStrategy,
         attachments: [TextAttachmentBox]
     ) {
         let string = stringRef.attributedSubstring(from: range)
@@ -63,7 +62,6 @@ public final class TextLine: Identifiable, Equatable {
             string,
             documentRange: range,
             displayData: displayData,
-            breakStrategy: breakStrategy,
             markedRanges: markedRanges,
             attachments: attachments
         )
@@ -79,11 +77,18 @@ public final class TextLine: Identifiable, Equatable {
         public let maxWidth: CGFloat
         public let lineHeightMultiplier: CGFloat
         public let estimatedLineHeight: CGFloat
+        public let breakStrategy: LineBreakStrategy
 
-        public init(maxWidth: CGFloat, lineHeightMultiplier: CGFloat, estimatedLineHeight: CGFloat) {
+        public init(
+            maxWidth: CGFloat,
+            lineHeightMultiplier: CGFloat,
+            estimatedLineHeight: CGFloat,
+            breakStrategy: LineBreakStrategy = .character
+        ) {
             self.maxWidth = maxWidth
             self.lineHeightMultiplier = lineHeightMultiplier
             self.estimatedLineHeight = estimatedLineHeight
+            self.breakStrategy = breakStrategy
         }
     }
 }

Sources/CodeEditTextView/TextLine/Typesetter/Typesetter.swift

@@ -31,7 +31,6 @@ final public class Typesetter {
         _ string: NSAttributedString,
         documentRange: NSRange,
         displayData: TextLine.DisplayData,
-        breakStrategy: LineBreakStrategy,
         markedRanges: MarkedRanges?,
         attachments: [TextAttachmentBox] = []
     ) {
@@ -46,7 +45,6 @@ final public class Typesetter {
         let (lines, maxHeight) = typesetLineFragments(
             documentRange: documentRange,
             displayData: displayData,
-            breakStrategy: breakStrategy,
             attachments: attachments
         )
         lineFragments.build(from: lines, estimatedLineHeight: maxHeight)
@@ -121,7 +119,6 @@ final public class Typesetter {
     func typesetLineFragments(
         documentRange: NSRange,
         displayData: TextLine.DisplayData,
-        breakStrategy: LineBreakStrategy,
         attachments: [TextAttachmentBox]
     ) -> (lines: [TextLineStorage<LineFragment>.BuildItem], maxHeight: CGFloat) {
         let contentRuns = createContentRuns(documentRange: documentRange, attachments: attachments)
@@ -136,8 +133,7 @@ final public class Typesetter {
                     context: &context,
                     range: run.range,
                     typesetter: typesetter,
-                    displayData: displayData,
-                    breakStrategy: breakStrategy
+                    displayData: displayData
                 )
             }
         }
@@ -155,16 +151,15 @@ final public class Typesetter {
         context: inout TypesetContext,
         range: NSRange,
         typesetter: CTTypesetter,
-        displayData: TextLine.DisplayData,
-        breakStrategy: LineBreakStrategy
+        displayData: TextLine.DisplayData
     ) {
         // Layout as many fragments as possible in this content run
         while context.currentPosition < range.max {
             // The line break indicates the distance from the range we’re typesetting on that should be broken at.
             // It's relative to the range being typeset, not the line
             let lineBreak = typesetter.suggestLineBreak(
                 using: string,
-                strategy: breakStrategy,
+                strategy: displayData.breakStrategy,
                 startingOffset: context.currentPosition - range.location,
                 constrainingWidth: displayData.maxWidth - context.fragmentContext.width
             )