Finish Merge from Main

Author: thecoolwinter

Sources/CodeEditSourceEditor/Controller/TextViewController+Lifecycle.swift

@@ -16,6 +16,16 @@ extension TextViewController {
         minimapView.layout()
     }
 
+    override public func viewDidAppear() {
+        super.viewDidAppear()
+        textCoordinators.forEach { $0.val?.controllerDidAppear(controller: self) }
+    }
+
+    override public func viewDidDisappear() {
+        super.viewDidDisappear()
+        textCoordinators.forEach { $0.val?.controllerDidDisappear(controller: self) }
+    }
+
     override public func loadView() {
         super.loadView()
 
@@ -24,7 +34,7 @@ extension TextViewController {
 
         gutterView = GutterView(
             configuration: configuration,
-            textView: textView,
+            controller: self,
             delegate: self
         )
         gutterView.updateWidthIfNeeded()
@@ -136,7 +146,7 @@ extension TextViewController {
             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?.gutterView.foldingRibbon.needsDisplay = true
+            self.gutterView.foldingRibbon.needsDisplay = true
             self.reformattingGuideView?.updatePosition(in: self)
             self.scrollView.needsLayout = true
         }

Sources/CodeEditSourceEditor/Controller/TextViewController.swift

@@ -48,6 +48,9 @@ public class TextViewController: NSViewController {
     var localEvenMonitor: Any?
     var isPostingCursorNotification: Bool = false
 
+    /// A default `NSParagraphStyle` with a set `lineHeight`
+    lazy var paragraphStyle: NSMutableParagraphStyle = generateParagraphStyle()
+
     // MARK: - Public Variables
 
     /// Passthrough value for the `textView`s string
@@ -170,21 +173,21 @@ public class TextViewController: NSViewController {
     /// This will be `nil` if another highlighter provider is passed to the source editor.
     internal(set) public var treeSitterClient: TreeSitterClient?
 
-    package var fontCharWidth: CGFloat { (" " as NSString).size(withAttributes: [.font: font]).width }
+    var fontCharWidth: CGFloat { (" " as NSString).size(withAttributes: [.font: font]).width }
 
     /// Filters used when applying edits..
-    internal var textFilters: [TextFormation.Filter] = []
+    var textFilters: [TextFormation.Filter] = []
 
-    internal var cancellables = Set<AnyCancellable>()
+    var cancellables = Set<AnyCancellable>()
 
     /// The trailing inset for the editor. Grows when line wrapping is disabled or when the minimap is shown.
-    package var textViewTrailingInset: CGFloat {
+    var textViewTrailingInset: CGFloat {
         // See https://github.com/CodeEditApp/CodeEditTextView/issues/66
         // wrapLines ? 1 : 48
         (minimapView?.isHidden ?? false) ? 0 : (minimapView?.frame.width ?? 0.0)
     }
 
-    package var textViewInsets: HorizontalEdgeInsets {
+    var textViewInsets: HorizontalEdgeInsets {
         HorizontalEdgeInsets(
             left: showGutter ? gutterView.frame.width : 0.0,
             right: textViewTrailingInset
@@ -249,28 +252,6 @@ public class TextViewController: NSViewController {
         self.gutterView.setNeedsDisplay(self.gutterView.frame)
     }
 
-    // MARK: Paragraph Style
-
-    /// A default `NSParagraphStyle` with a set `lineHeight`
-    package lazy var paragraphStyle: NSMutableParagraphStyle = generateParagraphStyle()
-
-    override public func viewWillAppear() {
-        super.viewWillAppear()
-        // The calculation this causes cannot be done until the view knows it's final position
-        updateTextInsets()
-        minimapView.layout()
-    }
-
-    override public func viewDidAppear() {
-        super.viewDidAppear()
-        textCoordinators.forEach { $0.val?.controllerDidAppear(controller: self) }
-    }
-
-    override public func viewDidDisappear() {
-        super.viewDidDisappear()
-        textCoordinators.forEach { $0.val?.controllerDidDisappear(controller: self) }
-    }
-
     deinit {
         if let highlighter {
             textView.removeStorageDelegate(highlighter)

Sources/CodeEditSourceEditor/Gutter/GutterView.swift

@@ -135,14 +135,14 @@ public class GutterView: NSView {
 
     public convenience init(
         configuration: borrowing SourceEditorConfiguration,
-        textView: TextView,
+        controller: TextViewController,
         delegate: GutterViewDelegate? = nil
     ) {
         self.init(
             font: configuration.appearance.font,
             textColor: configuration.appearance.theme.text.color,
             selectedTextColor: configuration.appearance.theme.selection,
-            textView: textView,
+            controller: controller,
             delegate: delegate
         )
     }

Sources/CodeEditSourceEditor/LineFolding/Model/LineFoldCalculator.swift

@@ -61,7 +61,7 @@ actor LineFoldCalculator {
         // Depth: Open range
         var openFolds: [Int: LineFoldStorage.RawFold] = [:]
         var currentDepth: Int = 0
-        var lineIterator = await ChunkedLineIterator(
+        let lineIterator = await ChunkedLineIterator(
             controller: controller,
             foldProvider: foldProvider,
             textIterator: await controller.textView.layoutManager.lineStorage.makeIterator()

Sources/CodeEditSourceEditor/LineFolding/Model/LineFoldingModel.swift

@@ -21,7 +21,6 @@ import Combine
 class LineFoldingModel: NSObject, NSTextStorageDelegate, ObservableObject {
     static let emphasisId = "lineFolding"
 
-
     /// An ordered tree of fold ranges in a document. Can be traversed using ``FoldRange/parent``
     /// and ``FoldRange/subFolds``.
     @Published var foldCache: LineFoldStorage = LineFoldStorage(documentLength: 0)

Sources/CodeEditSourceEditor/SourceEditorConfiguration/SourceEditorConfiguration+Peripherals.swift

@@ -16,6 +16,9 @@ extension SourceEditorConfiguration {
         /// Whether to show the reformatting guide.
         public var showReformattingGuide: Bool
 
+        /// Whether to show the folding ribbon. Only available if ``showGutter`` is `true`.
+        public var showFoldingRibbon: Bool
+
         /// Configuration for drawing invisible characters.
         ///
         /// See ``InvisibleCharactersConfiguration`` for more details.
@@ -29,12 +32,14 @@ extension SourceEditorConfiguration {
             showGutter: Bool = true,
             showMinimap: Bool = true,
             showReformattingGuide: Bool = false,
+            showFoldingRibbon: Bool = true,
             invisibleCharactersConfiguration: InvisibleCharactersConfiguration = .empty,
             warningCharacters: Set<UInt16> = []
         ) {
             self.showGutter = showGutter
             self.showMinimap = showMinimap
             self.showReformattingGuide = showReformattingGuide
+            self.showFoldingRibbon = showFoldingRibbon
             self.invisibleCharactersConfiguration = invisibleCharactersConfiguration
             self.warningCharacters = warningCharacters
         }
@@ -58,6 +63,10 @@ extension SourceEditorConfiguration {
                 controller.reformattingGuideView.updatePosition(in: controller)
             }
 
+            if oldConfig?.showFoldingRibbon != showFoldingRibbon {
+                controller.gutterView.showFoldingRibbon = showFoldingRibbon
+            }
+
             if oldConfig?.invisibleCharactersConfiguration != invisibleCharactersConfiguration {
                 controller.invisibleCharactersCoordinator.configuration = invisibleCharactersConfiguration
             }