Fixed most of the bugs introduced in the find replace refactor.

Author: austincondiff

Sources/CodeEditSourceEditor/Find/PanelView/FindPanelView.swift

@@ -106,7 +106,7 @@ struct FindPanelView: View {
         HStack(spacing: 4) {
             ControlGroup {
                 Button {
-                    viewModel.replace(all: false)
+                    viewModel.replace()
                 } label: {
                     Text("Replace")
                         .opacity(
@@ -126,7 +126,7 @@ struct FindPanelView: View {
                 Divider().overlay(Color(nsColor: .tertiaryLabelColor))
 
                 Button {
-                    viewModel.replace(all: true)
+                    viewModel.replaceAll()
                 } label: {
                     Text("All")
                         .opacity(viewModel.findText.isEmpty || viewModel.matchCount == 0 ? 0.33 : 1)

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

@@ -31,6 +31,33 @@ extension FindPanelViewModel {
         emphasisManager.addEmphases(emphases, for: EmphasisGroup.find)
     }
 
+    func flashCurrentMatch() {
+        guard let target = target,
+              let emphasisManager = target.emphasisManager,
+              let currentFindMatchIndex else {
+            return
+        }
+
+        let currentMatch = findMatches[currentFindMatchIndex]
+
+        // Clear existing emphases
+        emphasisManager.removeEmphases(for: EmphasisGroup.find)
+
+        // Create emphasis with the nearest match as active
+        let emphasis = (
+            Emphasis(
+                range: currentMatch,
+                style: .standard,
+                flash: true,
+                inactive: false,
+                selectInDocument: true
+            )
+        )
+
+        // Add the emphasis
+        emphasisManager.addEmphases([emphasis], for: EmphasisGroup.find)
+    }
+
     func clearMatchEmphases() {
         target?.emphasisManager?.removeEmphases(for: EmphasisGroup.find)
     }

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

@@ -15,7 +15,7 @@ extension FindPanelViewModel {
     func find() {
         // Don't find if target or emphasisManager isn't ready or the query is empty
         guard let target = target, isFocused, !findText.isEmpty else {
-            updateMatches([])
+            self.findMatches = []
             return
         }
 
@@ -24,14 +24,15 @@ extension FindPanelViewModel {
         let escapedQuery = NSRegularExpression.escapedPattern(for: findText)
 
         guard let regex = try? NSRegularExpression(pattern: escapedQuery, options: findOptions) else {
-            updateMatches([])
+            self.findMatches = []
+            self.currentFindMatchIndex = 0
             return
         }
 
         let text = target.text
         let matches = regex.matches(in: text, range: NSRange(location: 0, length: text.utf16.count))
 
-        updateMatches(matches.map(\.range))
+        self.findMatches = matches.map(\.range)
 
         // Find the nearest match to the current cursor position
         currentFindMatchIndex = getNearestEmphasisIndex(matchRanges: findMatches) ?? 0

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

@@ -25,7 +25,13 @@ extension FindPanelViewModel {
         }
 
         // From here on out we want to emphasize the result no matter what
-        defer { addMatchEmphases(flashCurrent: isTargetFirstResponder) }
+        defer {
+            if isTargetFirstResponder {
+                flashCurrentMatch()
+            } else {
+                addMatchEmphases(flashCurrent: isTargetFirstResponder)
+            }
+        }
 
         guard let currentFindMatchIndex else {
             self.currentFindMatchIndex = 0
@@ -54,7 +60,7 @@ extension FindPanelViewModel {
         }
         BezelNotification.show(
             symbolName: error ?
-            forwards ? "arrow.up.to.line" : "arrow.down.to.line"
+            forwards ? "arrow.down.to.line" : "arrow.up.to.line"
             : forwards
                 ? "arrow.trianglehead.topright.capsulepath.clockwise"
                 : "arrow.trianglehead.bottomleft.capsulepath.clockwise",

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

@@ -11,39 +11,51 @@ import CodeEditTextView
 extension FindPanelViewModel {
     /// Replace one or all ``findMatches`` with the contents of ``replaceText``.
     /// - Parameter all: If true, replaces all matches instead of just the selected one.
-    func replace(all: Bool) {
+    func replace() {
         guard let target = target,
               let currentFindMatchIndex,
               !findMatches.isEmpty,
               let textViewController = target as? TextViewController else {
             return
         }
 
-        if all {
-            textViewController.textView.undoManager?.beginUndoGrouping()
-            textViewController.textView.textStorage.beginEditing()
+        replaceMatch(index: currentFindMatchIndex, textView: textViewController.textView, matches: &findMatches)
 
-            var sortedMatches = findMatches.sorted(by: { $0.location < $1.location })
-            for (idx, _) in sortedMatches.enumerated().reversed() {
-                replaceMatch(index: idx, textView: textViewController.textView, matches: &sortedMatches)
-            }
+        self.findMatches = findMatches.enumerated().filter({ $0.offset != currentFindMatchIndex }).map(\.element)
+        self.currentFindMatchIndex = findMatches.isEmpty ? nil : (currentFindMatchIndex) % findMatches.count
 
-            textViewController.textView.textStorage.endEditing()
-            textViewController.textView.undoManager?.endUndoGrouping()
+        // Update the emphases
+        addMatchEmphases(flashCurrent: true)
+    }
 
-            if let lastMatch = sortedMatches.last {
-                target.setCursorPositions(
-                    [CursorPosition(range: NSRange(location: lastMatch.location, length: 0))],
-                    scrollToVisible: true
-                )
-            }
+    func replaceAll() {
+        guard let target = target,
+              !findMatches.isEmpty,
+              let textViewController = target as? TextViewController else {
+            return
+        }
+
+        textViewController.textView.undoManager?.beginUndoGrouping()
+        textViewController.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)
+        }
+
+        textViewController.textView.textStorage.endEditing()
+        textViewController.textView.undoManager?.endUndoGrouping()
 
-            updateMatches([])
-        } else {
-            replaceMatch(index: currentFindMatchIndex, textView: textViewController.textView, matches: &findMatches)
-            updateMatches(findMatches)
+        if let lastMatch = sortedMatches.last {
+            target.setCursorPositions(
+                [CursorPosition(range: NSRange(location: lastMatch.location, length: 0))],
+                scrollToVisible: true
+            )
         }
 
+        self.findMatches = []
+        self.currentFindMatchIndex = nil
+
         // Update the emphases
         addMatchEmphases(flashCurrent: true)
     }

Sources/CodeEditSourceEditor/Find/ViewModel/FindPanelViewModel.swift

@@ -58,13 +58,6 @@ class FindPanelViewModel: ObservableObject {
         }
     }
 
-    // MARK: - Update Matches
-
-    func updateMatches(_ newMatches: [NSRange]) {
-        findMatches = newMatches
-        currentFindMatchIndex = newMatches.isEmpty ? nil : 0
-    }
-
     // MARK: - Text Listeners
 
     /// Find target's text content changed, we need to re-search the contents and emphasize results.