Merge branch 'code-folding/ribbon-view' into code-folding/better-folding-calculation

Author: thecoolwinter

Example/CodeEditSourceEditorExample/CodeEditSourceEditorExample.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -16,15 +16,19 @@ let package = Package(
     dependencies: [
         // A fast, efficient, text view for code.
         .package(
-            path: "../CodeEditTextView"
-//            url: "https://github.com/CodeEditApp/CodeEditTextView.git",
-//            from: "0.10.1"
+            url: "https://github.com/CodeEditApp/CodeEditTextView.git",
+            from: "0.11.0"
         ),
         // tree-sitter languages
         .package(
             url: "https://github.com/CodeEditApp/CodeEditLanguages.git",
             exact: "0.1.20"
         ),
+        // CodeEditSymbols
+        .package(
+            url: "https://github.com/CodeEditApp/CodeEditSymbols.git",
+            exact: "0.2.3"
+        ),
         // SwiftLint
         .package(
             url: "https://github.com/lukepistrol/SwiftLintPlugin",
@@ -44,7 +48,8 @@ let package = Package(
             dependencies: [
                 "CodeEditTextView",
                 "CodeEditLanguages",
-                "TextFormation"
+                "TextFormation",
+                "CodeEditSymbols"
             ],
             plugins: [
                 .plugin(name: "SwiftLint", package: "SwiftLintPlugin")

Package.resolved

@@ -11,7 +11,7 @@ import AppKit
 extension TextViewController {
     /// Sets new cursor positions.
     /// - Parameter positions: The positions to set. Lines and columns are 1-indexed.
-    public func setCursorPositions(_ positions: [CursorPosition]) {
+    public func setCursorPositions(_ positions: [CursorPosition], scrollToVisible: Bool = false) {
         if isPostingCursorNotification { return }
         var newSelectedRanges: [NSRange] = []
         for position in positions {
@@ -33,6 +33,10 @@ extension TextViewController {
             }
         }
         textView.selectionManager.setSelectedRanges(newSelectedRanges)
+
+        if scrollToVisible {
+            textView.scrollSelectionToVisible()
+        }
     }
 
     /// Update the ``TextViewController/cursorPositions`` variable with new text selections from the text view.

Package.swift

@@ -5,10 +5,14 @@
 //  Created by Khan Winter on 3/16/25.
 //
 
-import Foundation
+import AppKit
 import CodeEditTextView
 
 extension TextViewController: FindPanelTarget {
+    var findPanelTargetView: NSView {
+        textView
+    }
+
     func findPanelWillShow(panelHeight: CGFloat) {
         updateContentInsets()
     }
@@ -17,6 +21,10 @@ extension TextViewController: FindPanelTarget {
         updateContentInsets()
     }
 
+    func findPanelModeDidChange(to mode: FindPanelMode) {
+        updateContentInsets()
+    }
+
     var emphasisManager: EmphasisManager? {
         textView?.emphasisManager
     }

Sources/CodeEditSourceEditor/Controller/TextViewController+Cursor.swift

@@ -225,7 +225,7 @@ extension TextViewController {
             self.findViewController?.showFindPanel()
             return nil
         case (0, "\u{1b}"): // Escape key
-            self.findViewController?.findPanel.dismiss()
+            self.findViewController?.hideFindPanel()
             return nil
         case (_, _):
             return event

Sources/CodeEditSourceEditor/Controller/TextViewController+FindPanelTarget.swift

@@ -97,7 +97,11 @@ extension TextViewController {
         minimapView.scrollView.contentInsets.bottom += additionalTextInsets?.bottom ?? 0
 
         // Inset the top by the find panel height
-        let findInset = (findViewController?.isShowingFindPanel ?? false) ? FindPanel.height : 0
+        let findInset: CGFloat = if findViewController?.viewModel.isShowingFindPanel ?? false {
+            findViewController?.viewModel.panelHeight ?? 0
+        } else {
+            0
+        }
         scrollView.contentInsets.top += findInset
         minimapView.scrollView.contentInsets.top += findInset
 

Sources/CodeEditSourceEditor/Controller/TextViewController+Lifecycle.swift

@@ -0,0 +1,20 @@
+//
+//  FindPanelMode.swift
+//  CodeEditSourceEditor
+//
+//  Created by Khan Winter on 4/18/25.
+//
+
+enum FindPanelMode: CaseIterable {
+    case find
+    case replace
+
+    var displayName: String {
+        switch self {
+        case .find:
+            return "Find"
+        case .replace:
+            return "Replace"
+        }
+    }
+}

Sources/CodeEditSourceEditor/Controller/TextViewController+StyleViews.swift

@@ -5,17 +5,18 @@
 //  Created by Khan Winter on 3/10/25.
 //
 
-import Foundation
+import AppKit
 import CodeEditTextView
 
 protocol FindPanelTarget: AnyObject {
-    var emphasisManager: EmphasisManager? { get }
-    var text: String { get }
+    var textView: TextView! { get }
+    var findPanelTargetView: NSView { get }
 
     var cursorPositions: [CursorPosition] { get }
-    func setCursorPositions(_ positions: [CursorPosition])
+    func setCursorPositions(_ positions: [CursorPosition], scrollToVisible: Bool)
     func updateCursorPosition()
 
     func findPanelWillShow(panelHeight: CGFloat)
     func findPanelWillHide(panelHeight: CGFloat)
+    func findPanelModeDidChange(to mode: FindPanelMode)
 }