Clean Up, Add Tests

Author: thecoolwinter

Sources/CodeEditSourceEditor/Extensions/NSString+TextStory.swift

@@ -0,0 +1,19 @@
+//
+//  NSString+TextStory.swift
+//  CodeEditSourceEditor
+//
+//  Created by Khan Winter on 6/3/25.
+//
+
+import AppKit
+import TextStory
+
+extension NSString: @retroactive TextStoring {
+    public func substring(from range: NSRange) -> String? {
+        self.substring(with: range)
+    }
+
+    public func applyMutation(_ mutation: TextMutation) {
+        self.replacingCharacters(in: mutation.range, with: mutation.string)
+    }
+}

Sources/CodeEditSourceEditor/Gutter/LineFolding/FoldingRibbonView+Draw.swift

@@ -6,19 +6,8 @@
 //
 
 import AppKit
-import TextStory
 import CodeEditTextView
 
-extension NSString: @retroactive TextStoring {
-    public func substring(from range: NSRange) -> String? {
-        self.substring(with: range)
-    }
-
-    public func applyMutation(_ mutation: TextMutation) {
-        self.replacingCharacters(in: mutation.range, with: mutation.string)
-    }
-}
-
 final class IndentationLineFoldProvider: LineFoldProvider {
     func indentLevelAtLine(substring: NSString) -> Int? {
         for idx in 0..<substring.length {

Sources/CodeEditSourceEditor/LineFolding/FoldProviders/IndentationLineFoldProvider.swift

@@ -31,6 +31,7 @@ enum LineFoldProviderLineInfo {
     }
 }
 
+@MainActor
 protocol LineFoldProvider: AnyObject {
     func foldLevelAtLine(
         lineNumber: Int,

Sources/CodeEditSourceEditor/LineFolding/FoldProviders/LineFoldProvider.swift

@@ -7,7 +7,6 @@
 
 import AppKit
 import CodeEditTextView
-import Combine
 
 /// A utility that calculates foldable line ranges in a text document based on indentation depth.
 ///

Sources/CodeEditSourceEditor/LineFolding/Model/LineFoldCalculator.swift

@@ -18,10 +18,10 @@ import Combine
 /// - For each line in the document, put its indent level into a list.
 /// - Loop through the list, creating nested folds as indents go up and down.
 ///
-class LineFoldingModel: NSObject, NSTextStorageDelegate {
+class LineFoldingModel: NSObject, NSTextStorageDelegate, ObservableObject {
     /// An ordered tree of fold ranges in a document. Can be traversed using ``FoldRange/parent``
     /// and ``FoldRange/subFolds``.
-    var foldCache: LineFoldStorage = LineFoldStorage(documentLength: 0)
+    @Published var foldCache: LineFoldStorage = LineFoldStorage(documentLength: 0)
     private var calculator: LineFoldCalculator
 
     private var textChangedStream: AsyncStream<(NSRange, Int)>
@@ -30,7 +30,7 @@ class LineFoldingModel: NSObject, NSTextStorageDelegate {
 
     weak var controller: TextViewController?
 
-    init(controller: TextViewController, foldView: FoldingRibbonView, foldProvider: LineFoldProvider?) {
+    init(controller: TextViewController, foldView: NSView, foldProvider: LineFoldProvider?) {
         self.controller = controller
         (textChangedStream, textChangedStreamContinuation) = AsyncStream<(NSRange, Int)>.makeStream()
         self.calculator = LineFoldCalculator(

Sources/CodeEditSourceEditor/LineFolding/Model/LineFoldingModel.swift

@@ -10,13 +10,14 @@ import AppKit
 import CodeEditTextView
 import Combine
 
-#warning("Replace before release")
-private let demoFoldProvider = IndentationLineFoldProvider()
-
 /// Displays the code folding ribbon in the ``GutterView``.
 ///
 /// This view draws its contents
 class FoldingRibbonView: NSView {
+
+#warning("Replace before release")
+    private static let demoFoldProvider = IndentationLineFoldProvider()
+
     static let width: CGFloat = 7.0
 
     var model: LineFoldingModel?
@@ -92,7 +93,7 @@ class FoldingRibbonView: NSView {
         self.model = LineFoldingModel(
             controller: controller,
             foldView: self,
-            foldProvider: foldProvider ?? demoFoldProvider
+            foldProvider: foldProvider ?? Self.demoFoldProvider
         )
     }
 

Sources/CodeEditSourceEditor/LineFolding/View/FoldingRibbonView.swift

@@ -30,7 +30,7 @@ struct LineFoldStorageTests {
             LineFoldStorage.RawFold(depth: 1, range: 0..<5),
             LineFoldStorage.RawFold(depth: 2, range: 5..<10)
         ]
-        storage.updateFolds(from: raw) { [] }
+        storage.updateFolds(from: raw, collapsedRanges: [])
 
         let folds = storage.folds(in: 0..<20)
         #expect(folds.count == 2)
@@ -43,13 +43,11 @@ struct LineFoldStorageTests {
         var storage = LineFoldStorage(documentLength: 15)
         let raw = [LineFoldStorage.RawFold(depth: 1, range: 0..<5)]
         // First pass: no collapsed
-        storage.updateFolds(from: raw) { [] }
+        storage.updateFolds(from: raw, collapsedRanges: [])
         #expect(storage.folds(in: 0..<15).first?.isCollapsed == false)
 
         // Second pass: provider marks depth=1, start=0 as collapsed
-        storage.updateFolds(from: raw) {
-            collapsedSet((1, 0))
-        }
+        storage.updateFolds(from: raw, collapsedRanges: collapsedSet((1, 0)))
         #expect(storage.folds(in: 0..<15).first?.isCollapsed == true)
     }
 
@@ -58,11 +56,11 @@ struct LineFoldStorageTests {
         var storage = LineFoldStorage(documentLength: 30)
         let raw = [LineFoldStorage.RawFold(depth: 2, range: 10..<20)]
 
-        storage.updateFolds(from: raw) { [] }
+        storage.updateFolds(from: raw, collapsedRanges: [])
         let initial = storage.fullFoldRegion(at: 10, depth: 2)!.id
 
         // Perform update again with identical raw folds
-        storage.updateFolds(from: raw) { [] }
+        storage.updateFolds(from: raw, collapsedRanges: [])
         let subsequent = storage.fullFoldRegion(at: 10, depth: 2)!.id
 
         #expect(initial == subsequent)