Folds in Minimap, Double Click/Enter DIsmisses Fold

thecoolwinter · thecoolwinter · commit 353ada9fa49d · 2025-06-25T15:50:45.000-05:00
diff --git a/Package.swift b/Package.swift
@@ -17,7 +17,7 @@ let package = Package(
         // A fast, efficient, text view for code.
         .package(
             url: "https://github.com/CodeEditApp/CodeEditTextView.git",
-            from: "0.11.3"
+            from: "0.11.4"
         ),
         // tree-sitter languages
         .package(
diff --git a/Sources/CodeEditSourceEditor/Controller/TextViewController+StyleViews.swift b/Sources/CodeEditSourceEditor/Controller/TextViewController+StyleViews.swift
@@ -13,7 +13,7 @@ extension TextViewController {
         // swiftlint:disable:next force_cast
         let paragraph = NSParagraphStyle.default.mutableCopy() as! NSMutableParagraphStyle
         paragraph.tabStops.removeAll()
-        paragraph.defaultTabInterval = CGFloat(tabWidth) * fontCharWidth
+        paragraph.defaultTabInterval = CGFloat(tabWidth) * font.charWidth
         return paragraph
     }
 
diff --git a/Sources/CodeEditSourceEditor/Controller/TextViewController.swift b/Sources/CodeEditSourceEditor/Controller/TextViewController.swift
@@ -173,7 +173,7 @@ public class TextViewController: NSViewController {
     /// This will be `nil` if another highlighter provider is passed to the source editor.
     internal(set) public var treeSitterClient: TreeSitterClient?
 
-    var fontCharWidth: CGFloat { (" " as NSString).size(withAttributes: [.font: font]).width }
+    var foldProvider: LineFoldProvider
 
     /// Filters used when applying edits..
     var textFilters: [TextFormation.Filter] = []
@@ -202,13 +202,15 @@ public class TextViewController: NSViewController {
         configuration: SourceEditorConfiguration,
         cursorPositions: [CursorPosition],
         highlightProviders: [HighlightProviding] = [TreeSitterClient()],
+        foldProvider: LineFoldProvider? = nil,
         undoManager: CEUndoManager? = nil,
         coordinators: [TextViewCoordinator] = []
     ) {
         self.language = language
         self.configuration = configuration
         self.cursorPositions = cursorPositions
         self.highlightProviders = highlightProviders
+        self.foldProvider = foldProvider ?? LineIndentationFoldProvider()
         self._undoManager = undoManager
         self.invisibleCharactersCoordinator = InvisibleCharactersCoordinator(configuration: configuration)
 
diff --git a/Sources/CodeEditSourceEditor/Extensions/NSFont/NSFont+CharWidth.swift b/Sources/CodeEditSourceEditor/Extensions/NSFont/NSFont+CharWidth.swift
@@ -0,0 +1,14 @@
+//
+//  NSFont+CharWidth.swift
+//  CodeEditSourceEditor
+//
+//  Created by Khan Winter on 6/25/25.
+//
+
+import AppKit
+
+extension NSFont {
+    var charWidth: CGFloat {
+        (" " as NSString).size(withAttributes: [.font: self]).width
+    }
+}
diff --git a/Sources/CodeEditSourceEditor/Gutter/GutterView.swift b/Sources/CodeEditSourceEditor/Gutter/GutterView.swift
@@ -160,7 +160,7 @@ public class GutterView: NSView {
         self.textView = controller.textView
         self.delegate = delegate
 
-        foldingRibbon = FoldingRibbonView(controller: controller, foldProvider: nil)
+        foldingRibbon = FoldingRibbonView(controller: controller)
 
         super.init(frame: .zero)
         clipsToBounds = true
diff --git a/Sources/CodeEditSourceEditor/Highlighting/StyledRangeContainer/StyledRangeContainer.swift b/Sources/CodeEditSourceEditor/Highlighting/StyledRangeContainer/StyledRangeContainer.swift
@@ -96,7 +96,6 @@ class StyledRangeContainer {
         var runs: [RangeStoreRun<StyleElement>] = []
 
         var minValue = allRuns.compactMap { $0.last }.enumerated().min(by: { $0.1.length < $1.1.length })
-
         while let value = minValue {
             // Get minimum length off the end of each array
             let minRunIdx = value.offset
@@ -118,7 +117,9 @@ class StyledRangeContainer {
                 }
             }
 
-            allRuns[minRunIdx].removeLast()
+            if !allRuns[minRunIdx].isEmpty {
+                allRuns[minRunIdx].removeLast()
+            }
 
             runs.append(minRun)
             minValue = allRuns.compactMap { $0.last }.enumerated().min(by: { $0.1.length < $1.1.length })
diff --git a/Sources/CodeEditSourceEditor/LineFolding/LineFoldProviders/LineFoldProvider.swift b/Sources/CodeEditSourceEditor/LineFolding/LineFoldProviders/LineFoldProvider.swift
@@ -8,7 +8,7 @@
 import AppKit
 import CodeEditTextView
 
-enum LineFoldProviderLineInfo {
+public enum LineFoldProviderLineInfo {
     case startFold(rangeStart: Int, newDepth: Int)
     case endFold(rangeEnd: Int, newDepth: Int)
 
@@ -32,7 +32,7 @@ enum LineFoldProviderLineInfo {
 }
 
 @MainActor
-protocol LineFoldProvider: AnyObject {
+public protocol LineFoldProvider: AnyObject {
     func foldLevelAtLine(
         lineNumber: Int,
         lineRange: NSRange,
diff --git a/Sources/CodeEditSourceEditor/LineFolding/LineFoldProviders/LineIndentationFoldProvider.swift b/Sources/CodeEditSourceEditor/LineFolding/LineFoldProviders/LineIndentationFoldProvider.swift
@@ -1,5 +1,5 @@
 //
-//  IndentationLineFoldProvider.swift
+//  LineIndentationFoldProvider.swift
 //  CodeEditSourceEditor
 //
 //  Created by Khan Winter on 5/8/25.
@@ -8,7 +8,8 @@
 import AppKit
 import CodeEditTextView
 
-final class IndentationLineFoldProvider: LineFoldProvider {
+/// A basic fold provider that uses line indentation to determine fold regions.
+final class LineIndentationFoldProvider: LineFoldProvider {
     func indentLevelAtLine(substring: NSString) -> Int? {
         for idx in 0..<substring.length {
             let character = UnicodeScalar(substring.character(at: idx))
diff --git a/Sources/CodeEditSourceEditor/LineFolding/Model/LineFoldCalculator.swift b/Sources/CodeEditSourceEditor/LineFolding/Model/LineFoldCalculator.swift
@@ -26,11 +26,10 @@ actor LineFoldCalculator {
     ///   - controller: The text controller to use for text and attachment fetching.
     ///   - textChangedStream: A stream of text changes, received as the document is edited.
     init(
-        foldProvider: LineFoldProvider?,
         controller: TextViewController,
-        textChangedStream: AsyncStream<(NSRange, Int)>
+        textChangedStream: AsyncStream<Void>
     ) {
-        self.foldProvider = foldProvider
+        self.foldProvider = controller.foldProvider
         self.controller = controller
         (valueStream, valueStreamContinuation) = AsyncStream<LineFoldStorage>.makeStream()
         Task { await listenToTextChanges(textChangedStream: textChangedStream) }
@@ -42,10 +41,10 @@ actor LineFoldCalculator {
 
     /// Sets up an attached task to listen to values on a stream of text changes.
     /// - Parameter textChangedStream: A stream of text changes.
-    private func listenToTextChanges(textChangedStream: AsyncStream<(NSRange, Int)>) {
+    private func listenToTextChanges(textChangedStream: AsyncStream<Void>) {
         textChangedTask = Task {
             for await edit in textChangedStream {
-                await buildFoldsForDocument(afterEditIn: edit.0, delta: edit.1)
+                await buildFoldsForDocument()
             }
         }
     }
@@ -54,7 +53,7 @@ actor LineFoldCalculator {
     ///
     /// For each line in the document, find the indentation level using the ``levelProvider``. At each line, if the
     /// indent increases from the previous line, we start a new fold. If it decreases we end the fold we were in.
-    private func buildFoldsForDocument(afterEditIn: NSRange, delta: Int) async {
+    private func buildFoldsForDocument() async {
         guard let controller = self.controller, let foldProvider = self.foldProvider else { return }
         let documentRange = await controller.textView.documentRange
         var foldCache: [LineFoldStorage.RawFold] = []
diff --git a/Sources/CodeEditSourceEditor/LineFolding/Model/LineFoldingModel.swift b/Sources/CodeEditSourceEditor/LineFolding/Model/LineFoldingModel.swift
@@ -26,17 +26,18 @@ class LineFoldingModel: NSObject, NSTextStorageDelegate, ObservableObject {
     @Published var foldCache: LineFoldStorage = LineFoldStorage(documentLength: 0)
     private var calculator: LineFoldCalculator
 
-    private var textChangedStream: AsyncStream<(NSRange, Int)>
-    private var textChangedStreamContinuation: AsyncStream<(NSRange, Int)>.Continuation
+    private var textChangedStream: AsyncStream<Void>
+    private var textChangedStreamContinuation: AsyncStream<Void>.Continuation
     private var cacheListenTask: Task<Void, Never>?
 
     weak var controller: TextViewController?
+    weak var foldView: NSView?
 
-    init(controller: TextViewController, foldView: NSView, foldProvider: LineFoldProvider?) {
+    init(controller: TextViewController, foldView: NSView) {
         self.controller = controller
-        (textChangedStream, textChangedStreamContinuation) = AsyncStream<(NSRange, Int)>.makeStream()
+        self.foldView = foldView
+        (textChangedStream, textChangedStreamContinuation) = AsyncStream<Void>.makeStream()
         self.calculator = LineFoldCalculator(
-            foldProvider: foldProvider,
             controller: controller,
             textChangedStream: textChangedStream
         )
@@ -49,7 +50,7 @@ class LineFoldingModel: NSObject, NSTextStorageDelegate, ObservableObject {
                 foldView?.needsDisplay = true
             }
         }
-        textChangedStreamContinuation.yield((.zero, 0))
+        textChangedStreamContinuation.yield(Void())
     }
 
     func getFolds(in range: Range<Int>) -> [FoldRange] {
@@ -66,7 +67,7 @@ class LineFoldingModel: NSObject, NSTextStorageDelegate, ObservableObject {
             return
         }
         foldCache.storageUpdated(editedRange: editedRange, changeInLength: delta)
-        textChangedStreamContinuation.yield((editedRange, delta))
+        textChangedStreamContinuation.yield()
     }
 
     /// Finds the deepest cached depth of the fold for a line number.
@@ -126,3 +127,13 @@ class LineFoldingModel: NSObject, NSTextStorageDelegate, ObservableObject {
         controller?.textView.emphasisManager?.removeEmphases(for: Self.emphasisId)
     }
 }
+
+// MARK: - LineFoldPlaceholderDelegate
+
+extension LineFoldingModel: LineFoldPlaceholderDelegate {
+    func placeholderDiscarded(fold: FoldRange) {
+        foldCache.toggleCollapse(forFold: fold)
+        foldView?.needsDisplay = true
+        textChangedStreamContinuation.yield()
+    }
+}
diff --git a/Sources/CodeEditSourceEditor/LineFolding/Placeholder/LineFoldPlaceholder.swift b/Sources/CodeEditSourceEditor/LineFolding/Placeholder/LineFoldPlaceholder.swift
@@ -8,44 +8,58 @@
 import AppKit
 import CodeEditTextView
 
+protocol LineFoldPlaceholderDelegate: AnyObject {
+    func placeholderDiscarded(fold: FoldRange)
+}
+
 class LineFoldPlaceholder: TextAttachment {
     let fold: FoldRange
     let charWidth: CGFloat
     var isSelected: Bool = false
+    weak var delegate: LineFoldPlaceholderDelegate?
 
-    init(fold: FoldRange, charWidth: CGFloat) {
+    init(delegate: LineFoldPlaceholderDelegate?, fold: FoldRange, charWidth: CGFloat) {
         self.fold = fold
+        self.delegate = delegate
         self.charWidth = charWidth
     }
 
     var width: CGFloat {
-        charWidth * 5
+        charWidth * 3
     }
 
     func draw(in context: CGContext, rect: NSRect) {
         context.saveGState()
 
-        let centerY = rect.midY - 1.5
+        let size = charWidth / 3.0
+        let centerY = rect.midY - (size / 2.0)
 
         if isSelected {
             context.setFillColor(NSColor.controlAccentColor.cgColor)
-            context.addPath(
-                NSBezierPath(
-                    rect: rect.transform(x: 2.0, y: 3.0, width: -4.0, height: -6.0 ),
-                    roundedCorners: .all,
-                    cornerRadius: 2
-                ).cgPathFallback
-            )
-            context.fillPath()
+        } else {
+            context.setFillColor(NSColor.tertiaryLabelColor.cgColor)
         }
 
+        context.addPath(
+            NSBezierPath(
+                rect: rect.transform(x: 2.0, y: 2, width: -4.0, height: -4.0 ),
+                roundedCorners: .all,
+                cornerRadius: (rect.height - 4) / 2
+            ).cgPathFallback
+        )
+        context.fillPath()
+
         context.setFillColor(NSColor.secondaryLabelColor.cgColor)
-        let size = charWidth / 2
-        context.addEllipse(in: CGRect(x: rect.minX + charWidth * 1.25, y: centerY, width: size, height: size))
-        context.addEllipse(in: CGRect(x: rect.minX + (charWidth * 2.25), y: centerY, width: size, height: size))
-        context.addEllipse(in: CGRect(x: rect.minX + (charWidth * 3.25), y: centerY, width: size, height: size))
+        context.addEllipse(in: CGRect(x: rect.minX + charWidth - (size / 2), y: centerY, width: size, height: size))
+        context.addEllipse(in: CGRect(x: rect.midX - (size / 2), y: centerY, width: size, height: size))
+        context.addEllipse(in: CGRect(x: rect.maxX - charWidth - (size / 2), y: centerY, width: size, height: size))
         context.fillPath()
 
         context.restoreGState()
     }
+
+    func attachmentAction() -> TextAttachmentAction {
+        delegate?.placeholderDiscarded(fold: fold)
+        return .discard
+    }
 }
diff --git a/Sources/CodeEditSourceEditor/LineFolding/View/FoldingRibbonView.swift b/Sources/CodeEditSourceEditor/LineFolding/View/FoldingRibbonView.swift
@@ -26,9 +26,6 @@ class FoldingRibbonView: NSView {
         }
     }
 
-#warning("Replace before release")
-    private static let demoFoldProvider = IndentationLineFoldProvider()
-
     static let width: CGFloat = 7.0
 
     var model: LineFoldingModel?
@@ -79,16 +76,13 @@ class FoldingRibbonView: NSView {
         true
     }
 
-    init(controller: TextViewController, foldProvider: LineFoldProvider?) {
+    init(controller: TextViewController) {
         super.init(frame: .zero)
         layerContentsRedrawPolicy = .onSetNeedsDisplay
         clipsToBounds = false
-
-        #warning("Replace before release")
         self.model = LineFoldingModel(
             controller: controller,
-            foldView: self,
-            foldProvider: foldProvider ?? Self.demoFoldProvider
+            foldView: self
         )
     }
 
@@ -114,8 +108,6 @@ class FoldingRibbonView: NSView {
         addTrackingArea(area)
     }
 
-    var attachments: [LineFoldPlaceholder] = []
-
     override func scrollWheel(with event: NSEvent) {
         super.scrollWheel(with: event)
         self.mouseMoved(with: event)
@@ -134,15 +126,15 @@ class FoldingRibbonView: NSView {
 
         if let attachment = findAttachmentFor(fold: fold, firstLineRange: firstLineInFold.range) {
             layoutManager.attachments.remove(atOffset: attachment.range.location)
-            attachments.removeAll(where: { $0 === attachment.attachment })
         } else {
-            let placeholder = LineFoldPlaceholder(fold: fold, charWidth: model?.controller?.fontCharWidth ?? 1.0)
+            let charWidth = model?.controller?.font.charWidth ?? 1.0
+            let placeholder = LineFoldPlaceholder(delegate: model, fold: fold, charWidth: charWidth)
             layoutManager.attachments.add(placeholder, for: NSRange(fold.range))
-            attachments.append(placeholder)
         }
 
         model?.foldCache.toggleCollapse(forFold: fold)
         model?.controller?.textView.needsLayout = true
+        model?.controller?.gutterView.needsDisplay = true
         mouseMoved(with: event)
     }
 
diff --git a/Sources/CodeEditSourceEditor/Minimap/MinimapLineFragmentView.swift b/Sources/CodeEditSourceEditor/Minimap/MinimapLineFragmentView.swift
@@ -50,15 +50,27 @@ final class MinimapLineFragmentView: LineFragmentView {
         // Create the drawing runs using attribute information
         var position = newFragment.documentRange.location
 
-        while position < newFragment.documentRange.max {
+        for contentRun in newFragment.contents {
+            switch contentRun.data {
+            case .text:
+                addDrawingRunsUntil(max: position + contentRun.length, position: &position, textStorage: textStorage)
+            case .attachment(let attachment):
+                position += attachment.range.length
+                appendDrawingRun(color: .clear, range: NSRange(location: position, length: contentRun.length))
+            }
+        }
+    }
+
+    private func addDrawingRunsUntil(max: Int, position: inout Int, textStorage: NSTextStorage) {
+        while position < max {
             var longestRange: NSRange = .notFound
             defer { position = longestRange.max }
 
             guard let foregroundColor = textStorage.attribute(
                 .foregroundColor,
                 at: position,
                 longestEffectiveRange: &longestRange,
-                in: NSRange(start: position, end: newFragment.documentRange.max)
+                in: NSRange(start: position, end: max)
             ) as? NSColor else {
                 continue
             }
diff --git a/Sources/CodeEditSourceEditor/Minimap/MinimapLineRenderer.swift b/Sources/CodeEditSourceEditor/Minimap/MinimapLineRenderer.swift
@@ -34,7 +34,7 @@ final class MinimapLineRenderer: TextLayoutManagerRenderDelegate {
             range: range,
             stringRef: stringRef,
             markedRanges: markedRanges,
-            attachments: []
+            attachments: attachments
         )
 
         // Make all fragments 2px tall
diff --git a/Sources/CodeEditSourceEditor/Minimap/MinimapView+TextAttachmentManagerDelegate.swift b/Sources/CodeEditSourceEditor/Minimap/MinimapView+TextAttachmentManagerDelegate.swift
diff --git a/Sources/CodeEditSourceEditor/Minimap/MinimapView.swift b/Sources/CodeEditSourceEditor/Minimap/MinimapView.swift
diff --git a/Sources/CodeEditSourceEditor/ReformattingGuide/ReformattingGuideView.swift b/Sources/CodeEditSourceEditor/ReformattingGuide/ReformattingGuideView.swift

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ extension TextViewController {`
`13`	`13`	`// swiftlint:disable:next force_cast`
`14`	`14`	`let paragraph = NSParagraphStyle.default.mutableCopy() as! NSMutableParagraphStyle`
`15`	`15`	`paragraph.tabStops.removeAll()`
`16`		`- paragraph.defaultTabInterval = CGFloat(tabWidth) * fontCharWidth`
	`16`	`+ paragraph.defaultTabInterval = CGFloat(tabWidth) * font.charWidth`
`17`	`17`	`return paragraph`
`18`	`18`	`}`
`19`	`19`