Maintain find matches when typing, respect wrap around preference when replacing

Author: austincondiff

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

@@ -13,8 +13,8 @@ extension FindPanelViewModel {
     /// Performs a find operation on the find target and updates both the ``findMatches`` array and the emphasis
     /// manager's emphases.
     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 {
+        // Don't find if target isn't ready or the query is empty
+        guard let target = target, !findText.isEmpty else {
             self.findMatches = []
             return
         }
@@ -36,7 +36,11 @@ extension FindPanelViewModel {
 
         // Find the nearest match to the current cursor position
         currentFindMatchIndex = getNearestEmphasisIndex(matchRanges: findMatches) ?? 0
-        addMatchEmphases(flashCurrent: false)
+
+        // Only add emphasis layers if the find panel is focused
+        if isFocused {
+            addMatchEmphases(flashCurrent: false)
+        }
     }
 
     // MARK: - Get Nearest Emphasis Index

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

@@ -21,7 +21,16 @@ extension FindPanelViewModel {
         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
+
+        // Update currentFindMatchIndex based on wrapAround setting
+        if findMatches.isEmpty {
+            self.currentFindMatchIndex = nil
+        } else if wrapAround {
+            self.currentFindMatchIndex = currentFindMatchIndex % findMatches.count
+        } else {
+            // If we're at the end and not wrapping, stay at the end
+            self.currentFindMatchIndex = min(currentFindMatchIndex, findMatches.count - 1)
+        }
 
         // Update the emphases
         addMatchEmphases(flashCurrent: true)