Ticket #8141: ReplaceAll2.patch

src/apps/stylededit/StyledEditWindow.cpp

@@ -1408 +1408 @@
 
 bool
 StyledEditWindow::_Search(BString string, bool caseSensitive, bool wrap,
-    bool backSearch)
+    bool backSearch, bool scrollToOccurence)
 {
     int32 start;
     int32 finish;
@@ -1450 +1450 @@
     if (start != B_ERROR) {
         finish = start + length;
         fTextView->Select(start, finish);
-        fTextView->ScrollToSelection();
+        
+        if (scrollToOccurence)
+            fTextView->ScrollToSelection();
         return true;
     }
 
@@ -1501 +1503 @@
 {
     bool first = true;
     fTextView->SetSuppressChanges(true);
-    while (_Search(findThis, caseSensitive, true, false)) {
+    
+    // start from the beginning of text
+    fTextView->Select(0,0);
+        
+    int32 start, finish;
+
+    // iterate occurences of findThis without wrapping around
+    while (_Search(findThis, caseSensitive, false, false, false)) {
         if (first) {
             _UpdateCleanUndoRedoSaveRevert();
             first = false;
         }
-        int32 start, finish;
+        
         fTextView->GetSelection(&start, &finish);
-
         fTextView->Delete(start, start + findThis.Length());
         fTextView->Insert(start, replaceWith.String(), replaceWith.Length());
+        
+        // advance the caret behind the inserted text
+        start += replaceWith.Length();
+        fTextView->Select(start, start);
     }
+    fTextView->ScrollToSelection();
     fTextView->SetSuppressChanges(false);
 }
 

src/apps/stylededit/StyledEditWindow.h

@@ -57 +57 @@
             status_t            _LoadFile(entry_ref* ref);
             void                _RevertToSaved();
             bool                _Search(BString searchFor, bool caseSensitive,
-                                    bool wrap, bool backSearch);
+                                    bool wrap, bool backSearch,
+                                    bool scrollToOccurence = true);
             void                _FindSelection();
             bool                _Replace(BString findThis, BString replaceWith,
                                     bool caseSensitive, bool wrap,