Fix Reformatting Guide X Position

Author: thecoolwinter

Example/CodeEditSourceEditorExample/CodeEditSourceEditorExample/Views/ContentView.swift

@@ -48,7 +48,10 @@ struct ContentView: View {
                 language: language,
                 config: SourceEditorConfiguration(
                     appearance: .init(theme: theme, font: font, wrapLines: wrapLines),
-                    behavior: .init(indentOption: indentOption),
+                    behavior: .init(
+                        indentOption: indentOption,
+                        reformatAtColumn: reformatAtColumn
+                    ),
                     layout: .init(
                         contentInsets: NSEdgeInsets(
                             top: proxy.safeAreaInsets.top,

Sources/CodeEditSourceEditor/Controller/TextViewController+LoadView.swift

@@ -124,14 +124,12 @@ extension TextViewController {
             object: textView,
             queue: .main
         ) { [weak self] _ in
-            guard let textView = self?.textView else { return }
-            self?.gutterView.frame.size.height = (self?.textView.frame.height ?? 0) + 10
-            self?.gutterView.frame.origin.y = (self?.textView.frame.origin.y ?? 0.0)
-            - (self?.scrollView.contentInsets.top ?? 0)
-
-            self?.gutterView.needsDisplay = true
-            self?.reformattingGuideView?.updatePosition(in: textView)
-            self?.scrollView.needsLayout = true
+            guard let self else { return }
+            self.gutterView.frame.size.height = self.textView.frame.height + 10
+            self.gutterView.frame.origin.y = self.textView.frame.origin.y - self.scrollView.contentInsets.top
+            self.gutterView.needsDisplay = true
+            self.reformattingGuideView?.updatePosition(in: self)
+            self.scrollView.needsLayout = true
         }
     }
 

Sources/CodeEditSourceEditor/Controller/TextViewController+ReloadUI.swift

@@ -22,7 +22,7 @@ extension TextViewController {
 
         // Update reformatting guide position
         if let guideView = textView.subviews.first(where: { $0 is ReformattingGuideView }) as? ReformattingGuideView {
-            guideView.updatePosition(in: textView)
+            guideView.updatePosition(in: self)
         }
     }
 }

Sources/CodeEditSourceEditor/Controller/TextViewController+StyleViews.swift

@@ -87,7 +87,7 @@ extension TextViewController {
     }
 
     package func styleReformattingGuideView() {
-        reformattingGuideView.updatePosition(in: textView)
+        reformattingGuideView.updatePosition(in: self)
         reformattingGuideView.isHidden = !showReformattingGuide
     }
 

Sources/CodeEditSourceEditor/ReformattingGuide/ReformattingGuideView.swift

@@ -74,13 +74,15 @@ class ReformattingGuideView: NSView {
         shadedRect.fill()
     }
 
-    func updatePosition(in textView: TextView) {
+    func updatePosition(in controller: TextViewController) {
         // Calculate the x position based on the font's character width and column number
-        let charWidth = textView.font.boundingRectForFont.width
-        let xPosition = CGFloat(column) * charWidth / 2  // Divide by 2 to account for coordinate system
+        let xPosition = (
+            CGFloat(column) * (controller.fontCharWidth / 2) // Divide by 2 to account for coordinate system
+            + (controller.textViewInsets.left / 2)
+        )
 
         // Get the scroll view's content size
-        guard let scrollView = textView.enclosingScrollView else { return }
+        guard let scrollView = controller.scrollView else { return }
         let contentSize = scrollView.documentVisibleRect.size
 
         // Ensure we don't create an invalid frame
@@ -90,7 +92,7 @@ class ReformattingGuideView: NSView {
         let newFrame = NSRect(
             x: xPosition,
             y: 0,  // Start above the visible area
-            width: maxWidth + 1000,
+            width: maxWidth,
             height: contentSize.height  // Use extended height
         ).pixelAligned
 

Sources/CodeEditSourceEditor/SourceEditorConfiguration/SourceEditorConfiguration+Behavior.swift

@@ -48,7 +48,8 @@ extension SourceEditorConfiguration {
 
             if oldConfig?.reformatAtColumn != reformatAtColumn {
                 controller.reformattingGuideView.column = reformatAtColumn
-                controller.reformattingGuideView.updatePosition(in: controller.textView)
+                controller.reformattingGuideView.updatePosition(in: controller)
+                controller.view.updateConstraintsForSubtreeIfNeeded()
             }
         }
     }

Sources/CodeEditSourceEditor/SourceEditorConfiguration/SourceEditorConfiguration+Peripherals.swift

@@ -42,7 +42,7 @@ extension SourceEditorConfiguration {
 
             if oldConfig?.showReformattingGuide != showReformattingGuide {
                 controller.reformattingGuideView.isHidden = !showReformattingGuide
-                controller.reformattingGuideView.updatePosition(in: controller.textView)
+                controller.reformattingGuideView.updatePosition(in: controller)
             }
 
             if shouldUpdateInsets && controller.scrollView != nil { // Check for view existence