Add Hover Interaction to Folding Ribbon

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.0"
+            from: "0.11.1"
         ),
         // tree-sitter languages
         .package(

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

@@ -0,0 +1,205 @@
+//
+//  FoldingRibbonView.swift
+//  CodeEditSourceEditor
+//
+//  Created by Khan Winter on 5/8/25.
+//
+
+import AppKit
+import CodeEditTextView
+
+extension FoldingRibbonView {
+    /// The context in which the fold is being drawn, including the depth and fold range.
+    struct FoldMarkerDrawingContext {
+        let range: ClosedRange<Int>
+        let depth: UInt
+
+        /// Increment the depth
+        func incrementDepth() -> FoldMarkerDrawingContext {
+            FoldMarkerDrawingContext(
+                range: range,
+                depth: depth + 1
+            )
+        }
+    }
+
+    override func draw(_ dirtyRect: NSRect) {
+        guard let context = NSGraphicsContext.current?.cgContext,
+              let layoutManager = model.textView?.layoutManager else {
+            return
+        }
+
+        context.saveGState()
+        context.clip(to: dirtyRect)
+
+        // Find the visible lines in the rect AppKit is asking us to draw.
+        guard let rangeStart = layoutManager.textLineForPosition(dirtyRect.minY),
+              let rangeEnd = layoutManager.textLineForPosition(dirtyRect.maxY) else {
+            return
+        }
+        let lineRange = rangeStart.index...rangeEnd.index
+
+        context.setFillColor(markerColor)
+        let folds = model.getFolds(in: lineRange)
+        for fold in folds {
+            drawFoldMarker(
+                fold,
+                markerContext: FoldMarkerDrawingContext(range: lineRange, depth: 0),
+                in: context,
+                using: layoutManager
+            )
+        }
+
+        context.restoreGState()
+    }
+
+    /// Draw a single fold marker for a fold.
+    ///
+    /// Ensure the correct fill color is set on the drawing context before calling.
+    ///
+    /// - Parameters:
+    ///   - fold: The fold to draw.
+    ///   - markerContext: The context in which the fold is being drawn, including the depth and if a line is
+    ///                    being hovered.
+    ///   - context: The drawing context to use.
+    ///   - layoutManager: A layout manager used to retrieve position information for lines.
+    private func drawFoldMarker(
+        _ fold: FoldRange,
+        markerContext: FoldMarkerDrawingContext,
+        in context: CGContext,
+        using layoutManager: TextLayoutManager
+    ) {
+        guard let minYPosition = layoutManager.textLineForIndex(fold.lineRange.lowerBound)?.yPos,
+              let maxPosition = layoutManager.textLineForIndex(fold.lineRange.upperBound) else {
+            return
+        }
+
+        let maxYPosition = maxPosition.yPos + maxPosition.height
+
+        if let hoveringFold,
+           hoveringFold.depth == markerContext.depth,
+           fold.lineRange == hoveringFold.range {
+            drawHoveredFold(
+                markerContext: markerContext,
+                minYPosition: minYPosition,
+                maxYPosition: maxYPosition,
+                in: context
+            )
+        } else {
+            drawNestedFold(
+                markerContext: markerContext,
+                minYPosition: minYPosition,
+                maxYPosition: maxYPosition,
+                in: context
+            )
+        }
+
+        // Draw subfolds
+        for subFold in fold.subFolds.filter({ $0.lineRange.overlaps(markerContext.range) }) {
+            drawFoldMarker(subFold, markerContext: markerContext.incrementDepth(), in: context, using: layoutManager)
+        }
+    }
+
+    private func drawHoveredFold(
+        markerContext: FoldMarkerDrawingContext,
+        minYPosition: CGFloat,
+        maxYPosition: CGFloat,
+        in context: CGContext
+    ) {
+        context.saveGState()
+        let plainRect = NSRect(x: -2, y: minYPosition, width: 11.0, height: maxYPosition - minYPosition)
+        let roundedRect = NSBezierPath(roundedRect: plainRect, xRadius: 11.0 / 2, yRadius: 11.0 / 2)
+
+        context.setFillColor(hoverFillColor.copy(alpha: hoverAnimationProgress) ?? hoverFillColor)
+        context.setStrokeColor(hoverBorderColor.copy(alpha: hoverAnimationProgress) ?? hoverBorderColor)
+        context.addPath(roundedRect.cgPathFallback)
+        context.drawPath(using: .fillStroke)
+
+        // Add the little arrows
+        drawChevron(in: context, yPosition: minYPosition + 8, pointingUp: false)
+        drawChevron(in: context, yPosition: maxYPosition - 8, pointingUp: true)
+
+        context.restoreGState()
+    }
+
+    private func drawChevron(in context: CGContext, yPosition: CGFloat, pointingUp: Bool) {
+        context.saveGState()
+        let path = CGMutablePath()
+        let chevronSize = CGSize(width: 4.0, height: 2.5)
+
+        let center = (Self.width / 2)
+        let minX = center - (chevronSize.width / 2)
+        let maxX = center + (chevronSize.width / 2)
+
+        let startY = pointingUp ? yPosition + chevronSize.height : yPosition - chevronSize.height
+
+        context.setStrokeColor(NSColor.secondaryLabelColor.withAlphaComponent(hoverAnimationProgress).cgColor)
+        context.setLineCap(.round)
+        context.setLineJoin(.round)
+        context.setLineWidth(1.3)
+
+        path.move(to: CGPoint(x: minX, y: startY))
+        path.addLine(to: CGPoint(x: center, y: yPosition))
+        path.addLine(to: CGPoint(x: maxX, y: startY))
+
+        context.addPath(path)
+        context.strokePath()
+        context.restoreGState()
+    }
+
+    private func drawNestedFold(
+        markerContext: FoldMarkerDrawingContext,
+        minYPosition: CGFloat,
+        maxYPosition: CGFloat,
+        in context: CGContext
+    ) {
+        let plainRect = NSRect(x: 0, y: minYPosition + 1, width: 7, height: maxYPosition - minYPosition - 2)
+        // TODO: Draw a single horizontal line when folds are adjacent
+        let roundedRect = NSBezierPath(roundedRect: plainRect, xRadius: 3.5, yRadius: 3.5)
+
+        context.addPath(roundedRect.cgPathFallback)
+        context.drawPath(using: .fill)
+
+        // Add small white line if we're overlapping with other markers
+        if markerContext.depth != 0 {
+            drawOutline(
+                minYPosition: minYPosition,
+                maxYPosition: maxYPosition,
+                originalPath: roundedRect,
+                in: context
+            )
+        }
+    }
+
+    /// Draws a rounded outline for a rectangle, creating the small, light, outline around each fold indicator.
+    ///
+    /// This function does not change fill colors for the given context.
+    ///
+    /// - Parameters:
+    ///   - minYPosition: The minimum y position of the rectangle to outline.
+    ///   - maxYPosition: The maximum y position of the rectangle to outline.
+    ///   - originalPath: The original bezier path for the rounded rectangle.
+    ///   - context: The context to draw in.
+    private func drawOutline(
+        minYPosition: CGFloat,
+        maxYPosition: CGFloat,
+        originalPath: NSBezierPath,
+        in context: CGContext
+    ) {
+        context.saveGState()
+
+        let plainRect = NSRect(x: -0.5, y: minYPosition, width: 8, height: maxYPosition - minYPosition)
+        let roundedRect = NSBezierPath(roundedRect: plainRect, xRadius: 4, yRadius: 4)
+
+        let combined = CGMutablePath()
+        combined.addPath(roundedRect.cgPathFallback)
+        combined.addPath(originalPath.cgPathFallback)
+
+        context.clip(to: CGRect(x: 0, y: minYPosition, width: 7, height: maxYPosition - minYPosition))
+        context.addPath(combined)
+        context.setFillColor(markerBorderColor)
+        context.drawPath(using: .eoFill)
+
+        context.restoreGState()
+    }
+}