Pass text wrapping configurations through to CodeEditTextView

Author: ben-p-commits

Sources/CodeEditTextView/CodeEditTextView.swift

@@ -20,6 +20,8 @@ public struct CodeEditTextView: NSViewControllerRepresentable {
     ///   - font: The default font
     ///   - tabWidth: The tab width
     ///   - lineHeight: The line height multiplier (e.g. `1.2`)
+    ///   - wrapLines: Whether lines wrap to the width of the editor
+    ///   - wrappedIndent: The number of spaces to indent wrapped lines
     ///   - editorOverscroll: The percentage for overscroll, between 0-1 (default: `0.0`)
     public init(
         _ text: Binding<String>,
@@ -28,6 +30,8 @@ public struct CodeEditTextView: NSViewControllerRepresentable {
         font: Binding<NSFont>,
         tabWidth: Binding<Int>,
         lineHeight: Binding<Double>,
+        wrapLines: Binding<Bool>,
+        wrappedIndent: Binding<Int>,
         editorOverscroll: Binding<Double> = .constant(0.0),
         cursorPosition: Published<(Int, Int)>.Publisher? = nil
     ) {
@@ -37,6 +41,8 @@ public struct CodeEditTextView: NSViewControllerRepresentable {
         self._font = font
         self._tabWidth = tabWidth
         self._lineHeight = lineHeight
+        self._wrapLines = wrapLines
+        self._wrappedIndent = wrappedIndent
         self._editorOverscroll = editorOverscroll
         self.cursorPosition = cursorPosition
     }
@@ -47,6 +53,8 @@ public struct CodeEditTextView: NSViewControllerRepresentable {
     @Binding private var font: NSFont
     @Binding private var tabWidth: Int
     @Binding private var lineHeight: Double
+    @Binding private var wrapLines: Bool
+    @Binding private var wrappedIndent: Int
     @Binding private var editorOverscroll: Double
     private var cursorPosition: Published<(Int, Int)>.Publisher?
 
@@ -59,6 +67,8 @@ public struct CodeEditTextView: NSViewControllerRepresentable {
             font: font,
             theme: theme,
             tabWidth: tabWidth,
+            wrapLines: wrapLines,
+            wrappedIndent: wrappedIndent,
             cursorPosition: cursorPosition,
             editorOverscroll: editorOverscroll
         )
@@ -71,6 +81,8 @@ public struct CodeEditTextView: NSViewControllerRepresentable {
         controller.language = language
         controller.theme = theme
         controller.tabWidth = tabWidth
+        controller.wrapLines = wrapLines
+        controller.wrappedIndent = wrappedIndent
         controller.lineHeightMultiple = lineHeight
         controller.editorOverscroll = editorOverscroll
         controller.reloadUI()

Sources/CodeEditTextView/STTextViewController.swift

@@ -44,6 +44,12 @@ public class STTextViewController: NSViewController, STTextViewDelegate, ThemeAt
 
     /// The editorOverscroll to use for the textView over scroll
     public var editorOverscroll: Double
+    
+    /// Whether lines wrap to the width of the editor
+    public var wrapLines: Bool
+    
+    /// The number of spaces to indent wrapped lines
+    public var wrappedIndent: Int
 
     // MARK: - Highlighting
 
@@ -58,6 +64,8 @@ public class STTextViewController: NSViewController, STTextViewDelegate, ThemeAt
         font: NSFont,
         theme: EditorTheme,
         tabWidth: Int,
+        wrapLines: Bool,
+        wrappedIndent: Int,
         cursorPosition: Published<(Int, Int)>.Publisher? = nil,
         editorOverscroll: Double
     ) {
@@ -66,6 +74,8 @@ public class STTextViewController: NSViewController, STTextViewDelegate, ThemeAt
         self.font = font
         self.theme = theme
         self.tabWidth = tabWidth
+        self.wrapLines = wrapLines
+        self.wrappedIndent = wrappedIndent
         self.cursorPosition = cursorPosition
         self.editorOverscroll = editorOverscroll
         super.init(nibName: nil, bundle: nil)
@@ -83,7 +93,7 @@ public class STTextViewController: NSViewController, STTextViewDelegate, ThemeAt
 
         // By default this is always null but is required for a couple operations
         // during highlighting so we make a new one manually.
-        textView.textContainer.replaceLayoutManager(NSLayoutManager())
+        // textView.textContainer.replaceLayoutManager(NSLayoutManager())
 
         scrollView.translatesAutoresizingMaskIntoConstraints = false
         scrollView.hasVerticalScroller = true