use paragraphContentRange for highlighting that fixes the area

krzyzanowskim · May 26, 2024 · 843330a · 843330a
1 parent 8d9779d
commit 843330a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/Sources/STTextView/LineNumberRulerView/STLineNumberRulerView.swift b/Sources/STTextView/LineNumberRulerView/STLineNumberRulerView.swift
@@ -194,7 +194,7 @@ open class STLineNumberRulerView: NSRulerView {
             let startLineIndex = textElements.count
 
             textView.textLayoutManager.enumerateTextLayoutFragments(in: viewportRange, options: [.ensuresLayout, .ensuresExtraLineFragment]) { layoutFragment in
-                let contentRangeInElement = layoutFragment.rangeInElement
+                let contentRangeInElement = (layoutFragment.textElement as? NSTextParagraph)?.paragraphContentRange ?? layoutFragment.rangeInElement
 
                 for lineFragment in layoutFragment.textLineFragments where (lineFragment.isExtraLineFragment || layoutFragment.textLineFragments.first == lineFragment) {
                     var baselineYOffset: CGFloat = 0

diff --git a/Sources/STTextView/STTextView.swift b/Sources/STTextView/STTextView.swift
@@ -825,7 +825,7 @@ import AVFoundation
         }
 
         if textLayoutManager.documentRange.isEmpty {
-            // - empty document has no layout fragments, nothing, it's empt and has to be handled explicitly.
+            // - empty document has no layout fragments, nothing, it's empty and has to be handled explicitly.
             // - there's no layout fragment at the document endLocation (technically it's out of bounds), has to be handled explicitly.
             if let selectionFrame = textLayoutManager.textSegmentFrame(at: textLayoutManager.documentRange.location, type: .standard) {
                 drawHighlight(
@@ -851,8 +851,17 @@ import AVFoundation
         // build the rectangle out of fragments rectangles
         var combinedFragmentsRect: CGRect?
 
+        // TODO some beutiful day:
+        // Don't rely on NSTextParagraph.paragraphContentRange, but that
+        // makes tricky to get all the conditions right (especially for last line)
+        // Problem is that NSTextParagraph.rangeInElement span across two lines (eg. "abc\n" are two lines) while
+        // paragraphContentRange is just one ("abc")
+        //
+        // Another idea here is to use `textLayoutManager.textLayoutFragment(for: selectionTextRange.location)`
+        // to find the layout fragment and us its frame as highlight area. It has its issue when it comes to the
+        // extra line fragment area (sic).
         textLayoutManager.enumerateTextLayoutFragments(in: viewportRange) { layoutFragment in
-            let contentRangeInElement = layoutFragment.rangeInElement
+            let contentRangeInElement = (layoutFragment.textElement as? NSTextParagraph)?.paragraphContentRange ?? layoutFragment.rangeInElement
             for lineFragment in layoutFragment.textLineFragments {
 
                 func isLineSelected() -> Bool {