Async and Faster Folding Calculation

Example/CodeEditSourceEditorExample/CodeEditSourceEditorExample/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -1,58 +1,68 @@
 {
   "images" : [
     {
+      "size" : "16x16",
       "idiom" : "mac",
-      "scale" : "1x",
-      "size" : "16x16"
+      "filename" : "CodeEditSourceEditor-Icon-16.png",
+      "scale" : "1x"
     },
     {
+      "size" : "16x16",
       "idiom" : "mac",
-      "scale" : "2x",
-      "size" : "16x16"
+      "filename" : "CodeEditSourceEditor-Icon-32.png",
+      "scale" : "2x"
     },
     {
+      "size" : "32x32",
       "idiom" : "mac",
-      "scale" : "1x",
-      "size" : "32x32"
+      "filename" : "CodeEditSourceEditor-Icon-32.png",
+      "scale" : "1x"
     },
     {
+      "size" : "32x32",
       "idiom" : "mac",
-      "scale" : "2x",
-      "size" : "32x32"
+      "filename" : "CodeEditSourceEditor-Icon-64.png",
+      "scale" : "2x"
     },
     {
+      "size" : "128x128",
       "idiom" : "mac",
-      "scale" : "1x",
-      "size" : "128x128"
+      "filename" : "CodeEditSourceEditor-Icon-128.png",
+      "scale" : "1x"
     },
     {
+      "size" : "128x128",
       "idiom" : "mac",
-      "scale" : "2x",
-      "size" : "128x128"
+      "filename" : "CodeEditSourceEditor-Icon-256.png",
+      "scale" : "2x"
     },
     {
+      "size" : "256x256",
       "idiom" : "mac",
-      "scale" : "1x",
-      "size" : "256x256"
+      "filename" : "CodeEditSourceEditor-Icon-256.png",
+      "scale" : "1x"
     },
     {
+      "size" : "256x256",
       "idiom" : "mac",
-      "scale" : "2x",
-      "size" : "256x256"
+      "filename" : "CodeEditSourceEditor-Icon-512.png",
+      "scale" : "2x"
     },
     {
+      "size" : "512x512",
       "idiom" : "mac",
-      "scale" : "1x",
-      "size" : "512x512"
+      "filename" : "CodeEditSourceEditor-Icon-512.png",
+      "scale" : "1x"
     },
     {
+      "size" : "512x512",
       "idiom" : "mac",
-      "scale" : "2x",
-      "size" : "512x512"
+      "filename" : "CodeEditSourceEditor-Icon-1024.png",
+      "scale" : "2x"
     }
   ],
   "info" : {
-    "author" : "xcode",
-    "version" : 1
+    "version" : 1,
+    "author" : "xcode"
   }
-}
+}

Package.swift

@@ -16,8 +16,9 @@ let package = Package(
     dependencies: [
         // A fast, efficient, text view for code.
         .package(
-            url: "https://github.com/CodeEditApp/CodeEditTextView.git",
-            from: "0.11.1"
+            path: "../CodeEditTextView"
+//            url: "https://github.com/CodeEditApp/CodeEditTextView.git",
+//            from: "0.11.1"
         ),
         // tree-sitter languages
         .package(

Sources/CodeEditSourceEditor/Controller/TextViewController+Lifecycle.swift

@@ -26,7 +26,7 @@ extension TextViewController {
             font: font.rulerFont,
             textColor: theme.text.color.withAlphaComponent(0.35),
             selectedTextColor: theme.text.color,
-            textView: textView,
+            controller: self,
             delegate: self
         )
         gutterView.updateWidthIfNeeded()
@@ -143,6 +143,7 @@ extension TextViewController {
             - (self?.scrollView.contentInsets.top ?? 0)
 
             self?.gutterView.needsDisplay = true
+            self?.gutterView.foldingRibbon.needsDisplay = true
             self?.guideView?.updatePosition(in: textView)
             self?.scrollView.needsLayout = true
         }

Sources/CodeEditSourceEditor/Extensions/DispatchQueue+dispatchMainIfNot.swift

@@ -27,13 +27,11 @@ extension DispatchQueue {
     /// executed if not already on the main thread.
     /// - Parameter item: The work item to execute.
     /// - Returns: The value of the work item.
-    static func syncMainIfNot<T>(_ item: @escaping () -> T) -> T {
+    static func waitMainIfNot<T>(_ item: () -> T) -> T {
         if Thread.isMainThread {
             return item()
         } else {
-            return DispatchQueue.main.sync {
-                return item()
-            }
+            return DispatchQueue.main.asyncAndWait(execute: item)
         }
     }
 }

Sources/CodeEditSourceEditor/Extensions/NSBezierPath+RoundedCorners.swift

@@ -0,0 +1,111 @@
+//
+//  NSBezierPath+RoundedCorners.swift
+//  CodeEditSourceEditor
+//
+//  Created by Khan Winter on 6/3/25.
+//
+
+import AppKit
+
+// Wonderful NSBezierPath extension taken with modification from the playground code at:
+// https://github.com/janheiermann/BezierPath-Corners
+
+extension NSBezierPath {
+    struct Corners: OptionSet {
+        public let rawValue: Int
+
+        public init(rawValue: Corners.RawValue) {
+            self.rawValue = rawValue
+        }
+
+        public static let topLeft = Corners(rawValue: 1 << 0)
+        public static let bottomLeft = Corners(rawValue: 1 << 1)
+        public static let topRight = Corners(rawValue: 1 << 2)
+        public static let bottomRight = Corners(rawValue: 1 << 3)
+    }
+
+    // swiftlint:disable:next function_body_length
+    convenience init(rect: CGRect, roundedCorners corners: Corners, cornerRadius: CGFloat) {
+        self.init()
+
+        let maxX = rect.maxX
+        let minX = rect.minX
+        let maxY = rect.maxY
+        let minY = rect.minY
+        let radius = min(cornerRadius, min(rect.width, rect.height) / 2)
+
+        // Start at bottom-left corner
+        move(to: CGPoint(x: minX + (corners.contains(.bottomLeft) ? radius : 0), y: minY))
+
+        // Bottom edge
+        if corners.contains(.bottomRight) {
+            line(to: CGPoint(x: maxX - radius, y: minY))
+            appendArc(
+                withCenter: CGPoint(x: maxX - radius, y: minY + radius),
+                radius: radius,
+                startAngle: 270,
+                endAngle: 0,
+                clockwise: false
+            )
+        } else {
+            line(to: CGPoint(x: maxX, y: minY))
+        }
+
+        // Right edge
+        if corners.contains(.topRight) {
+            line(to: CGPoint(x: maxX, y: maxY - radius))
+            appendArc(
+                withCenter: CGPoint(x: maxX - radius, y: maxY - radius),
+                radius: radius,
+                startAngle: 0,
+                endAngle: 90,
+                clockwise: false
+            )
+        } else {
+            line(to: CGPoint(x: maxX, y: maxY))
+        }
+
+        // Top edge
+        if corners.contains(.topLeft) {
+            line(to: CGPoint(x: minX + radius, y: maxY))
+            appendArc(
+                withCenter: CGPoint(x: minX + radius, y: maxY - radius),
+                radius: radius,
+                startAngle: 90,
+                endAngle: 180,
+                clockwise: false
+            )
+        } else {
+            line(to: CGPoint(x: minX, y: maxY))
+        }
+
+        // Left edge
+        if corners.contains(.bottomLeft) {
+            line(to: CGPoint(x: minX, y: minY + radius))
+            appendArc(
+                withCenter: CGPoint(x: minX + radius, y: minY + radius),
+                radius: radius,
+                startAngle: 180,
+                endAngle: 270,
+                clockwise: false
+            )
+        } else {
+            line(to: CGPoint(x: minX, y: minY))
+        }
+
+        close()
+    }
+
+    convenience init(roundingRect: CGRect, capTop: Bool, capBottom: Bool, cornerRadius radius: CGFloat) {
+        switch (capTop, capBottom) {
+        case (true, true):
+            self.init(rect: roundingRect)
+        case (false, true):
+            self.init(rect: roundingRect, roundedCorners: [.bottomLeft, .bottomRight], cornerRadius: radius)
+        case (true, false):
+            self.init(rect: roundingRect, roundedCorners: [.topLeft, .topRight], cornerRadius: radius)
+        case (false, false):
+            self.init(roundedRect: roundingRect, xRadius: radius, yRadius: radius)
+        }
+    }
+}

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/Extensions/TextView+/TextView+createReadBlock.swift

@@ -30,7 +30,7 @@ extension TextView {
                 let range = NSRange(location..<end)
                 return self?.textStorage.substring(from: range)?.data(using: String.nativeUTF16Encoding)
             }
-            return DispatchQueue.syncMainIfNot(workItem)
+            return DispatchQueue.waitMainIfNot(workItem)
         }
     }
     /// Creates a block for safely reading data for a text provider.
@@ -45,7 +45,7 @@ extension TextView {
             let workItem: () -> String? = {
                 self?.textStorage.substring(from: range)
             }
-            return DispatchQueue.syncMainIfNot(workItem)
+            return DispatchQueue.waitMainIfNot(workItem)
         }
     }
 }

Sources/CodeEditSourceEditor/Gutter/GutterView.swift

@@ -101,7 +101,7 @@ public class GutterView: NSView {
     }
 
     /// The view that draws the fold decoration in the gutter.
-    private var foldingRibbon: FoldingRibbonView
+    var foldingRibbon: FoldingRibbonView
 
     /// Syntax helper for determining the required space for the folding ribbon.
     private var foldingRibbonWidth: CGFloat {
@@ -137,16 +137,16 @@ public class GutterView: NSView {
         font: NSFont,
         textColor: NSColor,
         selectedTextColor: NSColor?,
-        textView: TextView,
+        controller: TextViewController,
         delegate: GutterViewDelegate? = nil
     ) {
         self.font = font
         self.textColor = textColor
         self.selectedLineTextColor = selectedTextColor ?? .secondaryLabelColor
-        self.textView = textView
+        self.textView = controller.textView
         self.delegate = delegate
 
-        foldingRibbon = FoldingRibbonView(textView: textView, foldProvider: nil)
+        foldingRibbon = FoldingRibbonView(controller: controller, foldProvider: nil)
 
         super.init(frame: .zero)
         clipsToBounds = true