Remove Hard Dependency on TextViewController

Author: thecoolwinter

Package.resolved

@@ -9,8 +9,7 @@ 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 }

Sources/CodeEditSourceEditor/Find/FindPanelTarget.swift

@@ -56,6 +56,7 @@ struct FindSearchField: View {
             clearable: true
         )
         .controlSize(.small)
+        .fixedSize(horizontal: false, vertical: true)
         .focused($focus, equals: .find)
         .onSubmit {
             viewModel.moveToNextMatch()

Sources/CodeEditSourceEditor/Find/PanelView/FindSearchField.swift

@@ -30,6 +30,7 @@ struct ReplaceSearchField: View {
             clearable: true
         )
         .controlSize(.small)
+        .fixedSize(horizontal: false, vertical: true)
         .focused($focus, equals: .replace)
     }
 }

Sources/CodeEditSourceEditor/Find/PanelView/ReplaceSearchField.swift

@@ -9,7 +9,7 @@ import CodeEditTextView
 
 extension FindPanelViewModel {
     func addMatchEmphases(flashCurrent: Bool) {
-        guard let target = target, let emphasisManager = target.emphasisManager else {
+        guard let target = target, let emphasisManager = target.textView.emphasisManager else {
             return
         }
 
@@ -33,7 +33,7 @@ extension FindPanelViewModel {
 
     func flashCurrentMatch() {
         guard let target = target,
-              let emphasisManager = target.emphasisManager,
+              let emphasisManager = target.textView.emphasisManager,
               let currentFindMatchIndex else {
             return
         }
@@ -59,6 +59,6 @@ extension FindPanelViewModel {
     }
 
     func clearMatchEmphases() {
-        target?.emphasisManager?.removeEmphases(for: EmphasisGroup.find)
+        target?.textView.emphasisManager?.removeEmphases(for: EmphasisGroup.find)
     }
 }

Sources/CodeEditSourceEditor/Find/ViewModel/FindPanelViewModel+Emphasis.swift

@@ -29,7 +29,7 @@ extension FindPanelViewModel {
             return
         }
 
-        let text = target.text
+        let text = target.textView.string
         let matches = regex.matches(in: text, range: NSRange(location: 0, length: text.utf16.count))
 
         self.findMatches = matches.map(\.range)

Sources/CodeEditSourceEditor/Find/ViewModel/FindPanelViewModel+Find.swift

@@ -14,12 +14,11 @@ extension FindPanelViewModel {
     func replace() {
         guard let target = target,
               let currentFindMatchIndex,
-              !findMatches.isEmpty,
-              let textViewController = target as? TextViewController else {
+              !findMatches.isEmpty else {
             return
         }
 
-        replaceMatch(index: currentFindMatchIndex, textView: textViewController.textView, matches: &findMatches)
+        replaceMatch(index: currentFindMatchIndex, textView: target.textView, matches: &findMatches)
 
         self.findMatches = findMatches.enumerated().filter({ $0.offset != currentFindMatchIndex }).map(\.element)
         self.currentFindMatchIndex = findMatches.isEmpty ? nil : (currentFindMatchIndex) % findMatches.count
@@ -30,21 +29,20 @@ extension FindPanelViewModel {
 
     func replaceAll() {
         guard let target = target,
-              !findMatches.isEmpty,
-              let textViewController = target as? TextViewController else {
+              !findMatches.isEmpty else {
             return
         }
 
-        textViewController.textView.undoManager?.beginUndoGrouping()
-        textViewController.textView.textStorage.beginEditing()
+        target.textView.undoManager?.beginUndoGrouping()
+        target.textView.textStorage.beginEditing()
 
         var sortedMatches = findMatches.sorted(by: { $0.location < $1.location })
         for (idx, _) in sortedMatches.enumerated().reversed() {
-            replaceMatch(index: idx, textView: textViewController.textView, matches: &sortedMatches)
+            replaceMatch(index: idx, textView: target.textView, matches: &sortedMatches)
         }
 
-        textViewController.textView.textStorage.endEditing()
-        textViewController.textView.undoManager?.endUndoGrouping()
+        target.textView.textStorage.endEditing()
+        target.textView.undoManager?.endUndoGrouping()
 
         if let lastMatch = sortedMatches.last {
             target.setCursorPositions(

Sources/CodeEditSourceEditor/Find/ViewModel/FindPanelViewModel+Replace.swift

@@ -81,12 +81,12 @@ class FindPanelViewModel: ObservableObject {
         // If the textview is first responder, exit fast
         if target?.findPanelTargetView.window?.firstResponder === target?.findPanelTargetView {
             // If the text view has focus, just clear visual emphases but keep our find matches
-            target?.emphasisManager?.removeEmphases(for: EmphasisGroup.find)
+            target?.textView.emphasisManager?.removeEmphases(for: EmphasisGroup.find)
             return
         }
 
         // Clear existing emphases before performing new find
-        target?.emphasisManager?.removeEmphases(for: EmphasisGroup.find)
+        target?.textView.emphasisManager?.removeEmphases(for: EmphasisGroup.find)
         find()
     }
 }

Sources/CodeEditSourceEditor/Find/ViewModel/FindPanelViewModel.swift

@@ -24,7 +24,7 @@ extension MinimapView {
     /// The ``scrollView`` uses the scroll percentage calculated for the first case, and scrolls its content to that
     /// percentage. The ``scrollView`` is only modified if the minimap is longer than the container view.
     func updateDocumentVisibleViewPosition() {
-        guard let textView = textView, let editorScrollView = textView.enclosingScrollView, let layoutManager else {
+        guard let textView = textView, let editorScrollView = textView.enclosingScrollView else {
             return
         }