Begin Refactor

Author: thecoolwinter

Sources/CodeEditSourceEditor/CodeEditUI/PanelTextField.swift

@@ -33,8 +33,6 @@ struct PanelTextField<LeadingAccessories: View, TrailingAccessories: View>: View
 
     var onClear: (() -> Void)
 
-    var hasValue: Bool
-
     init(
         _ label: String,
         text: Binding<String>,
@@ -43,8 +41,7 @@ struct PanelTextField<LeadingAccessories: View, TrailingAccessories: View>: View
         @ViewBuilder trailingAccessories: () -> TrailingAccessories? = { EmptyView() },
         helperText: String? = nil,
         clearable: Bool? = false,
-        onClear: (() -> Void)? = {},
-        hasValue: Bool? = false
+        onClear: (() -> Void)? = {}
     ) {
         self.label = label
         _text = text
@@ -54,15 +51,14 @@ struct PanelTextField<LeadingAccessories: View, TrailingAccessories: View>: View
         self.helperText = helperText ?? nil
         self.clearable = clearable ?? false
         self.onClear = onClear ?? {}
-        self.hasValue = hasValue ?? false
     }
 
     @ViewBuilder
     public func selectionBackground(
         _ isFocused: Bool = false
     ) -> some View {
-        if self.controlActive != .inactive || !text.isEmpty || hasValue {
-            if isFocused || !text.isEmpty || hasValue {
+        if self.controlActive != .inactive || !text.isEmpty {
+            if isFocused || !text.isEmpty {
                 Color(.textBackgroundColor)
             } else {
                 if colorScheme == .light {
@@ -135,7 +131,7 @@ struct PanelTextField<LeadingAccessories: View, TrailingAccessories: View>: View
         )
         .overlay(
             RoundedRectangle(cornerRadius: 6)
-                .stroke(isFocused || !text.isEmpty || hasValue ? .tertiary : .quaternary, lineWidth: 1.25)
+                .stroke(isFocused || !text.isEmpty ? .tertiary : .quaternary, lineWidth: 1.25)
                 .clipShape(RoundedRectangle(cornerRadius: 6))
                 .disabled(true)
                 .edgesIgnoringSafeArea(.all)

Sources/CodeEditSourceEditor/Controller/TextViewController+Cursor.swift

@@ -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.

Sources/CodeEditSourceEditor/Controller/TextViewController+FindPanelTarget.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) {
         scrollView.contentInsets.top += panelHeight
         gutterView.frame.origin.y = -scrollView.contentInsets.top
@@ -20,7 +24,7 @@ extension TextViewController: FindPanelTarget {
     }
 
     func findPanelModeDidChange(to mode: FindPanelMode, panelHeight: CGFloat) {
-        scrollView.contentInsets.top += mode == .replace ? panelHeight/2 : -panelHeight
+        scrollView.contentInsets.top += mode == .replace ? panelHeight : -(panelHeight/2)
         gutterView.frame.origin.y = -scrollView.contentInsets.top
     }
 

Sources/CodeEditSourceEditor/Controller/TextViewController+LoadView.swift

@@ -155,7 +155,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+StyleViews.swift

@@ -78,7 +78,7 @@ extension TextViewController {
         scrollView.contentInsets.top += additionalTextInsets?.top ?? 0
         scrollView.contentInsets.bottom += additionalTextInsets?.bottom ?? 0
 
-        scrollView.contentInsets.top += (findViewController?.isShowingFindPanel ?? false)
+        scrollView.contentInsets.top += (findViewController?.viewModel.isShowingFindPanel ?? false)
             ? findViewController?.panelHeight ?? 0
             : 0
     }

Sources/CodeEditSourceEditor/Find/FindPanelDelegate.swift

@@ -5,15 +5,16 @@
 //  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 findPanelTargetView: NSView { get }
 
     var cursorPositions: [CursorPosition] { get }
-    func setCursorPositions(_ positions: [CursorPosition])
+    func setCursorPositions(_ positions: [CursorPosition], scrollToVisible: Bool)
     func updateCursorPosition()
 
     func findPanelWillShow(panelHeight: CGFloat)