From a59300535c1fd5a5b176ed9f1ee0616ac62df63f Mon Sep 17 00:00:00 2001
From: Marcel Gerber <mg.hain@gmx.de>
Date: Sun, 19 Oct 2014 01:24:13 +0200
Subject: [PATCH 1/4] Keep query and replace text when switching between
 Replace and Replace In Files

---
 src/htmlContent/findreplace-bar.html |  2 +-
 src/search/FindBar.js                |  1 +
 src/search/FindInFilesUI.js          | 20 ++++++++++++++++----
 src/search/FindReplace.js            | 16 ++++++++++++++--
 4 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/src/htmlContent/findreplace-bar.html b/src/htmlContent/findreplace-bar.html
index c7f1f3dc1b4..3034a0f3dba 100644
--- a/src/htmlContent/findreplace-bar.html
+++ b/src/htmlContent/findreplace-bar.html
@@ -13,7 +13,7 @@
 
     {{#replace}}
     <div id="replace-group" {{#scope}}class="has-scope"{{/scope}}><!--
-        --><input type="text" id="replace-with" placeholder="{{Strings.REPLACE_PLACEHOLDER}}"/><!--
+        --><input type="text" id="replace-with" placeholder="{{Strings.REPLACE_PLACEHOLDER}}" value="{{initialReplaceText}}" /><!--
         {{^multifile}}
         --><button id="replace-yes" class="btn no-focus" tabindex="-1">{{Strings.BUTTON_REPLACE}}</button><!--
         {{/multifile}}
diff --git a/src/search/FindBar.js b/src/search/FindBar.js
index 83293916436..69561ded6d0 100644
--- a/src/search/FindBar.js
+++ b/src/search/FindBar.js
@@ -77,6 +77,7 @@ define(function (require, exports, module) {
             replace: false,
             queryPlaceholder: "",
             initialQuery: "",
+            initialReplaceText: "",
             scopeLabel: ""
         };
         this._options = _.extend(defaults, options);
diff --git a/src/search/FindInFilesUI.js b/src/search/FindInFilesUI.js
index df268be0514..c0ab781945a 100644
--- a/src/search/FindInFilesUI.js
+++ b/src/search/FindInFilesUI.js
@@ -130,15 +130,26 @@ define(function (require, exports, module) {
         }
         
         // Default to searching for the current selection
-        var currentEditor = EditorManager.getActiveEditor(),
-            initialQuery  = "";
+        var initialQuery = "",
+            initialReplaceText = "";
 
         if (_findBar && !_findBar.isClosed()) {
             // The modalBar was already up. When creating the new modalBar, copy the
             // current query instead of using the passed-in selected text.
             initialQuery = _findBar.getQueryInfo().query;
-        } else if (currentEditor) {
-            initialQuery = FindUtils.getInitialQueryFromSelection(currentEditor);
+            initialReplaceText = _findBar.getReplaceText();
+        } else {
+            var currentEditor = EditorManager.getActiveEditor(),
+                openedFindbars = FindBar._bars && FindBar._bars.filter(function (findBar) {
+                    return !findBar.isClosed();
+                });
+
+            if (openedFindbars && openedFindbars.length) {
+                initialQuery = openedFindbars[0].getQueryInfo().query;
+                initialReplaceText = openedFindbars[0].getReplaceText();
+            } else if (currentEditor) {
+                initialQuery = FindUtils.getInitialQueryFromSelection(currentEditor);
+            }
         }
 
         // Close our previous find bar, if any. (The open() of the new _findBar will
@@ -151,6 +162,7 @@ define(function (require, exports, module) {
             multifile: true,
             replace: showReplace,
             initialQuery: initialQuery,
+            initialReplaceText: initialReplaceText,
             queryPlaceholder: Strings.FIND_QUERY_PLACEHOLDER,
             scopeLabel: FindUtils.labelForScope(scope)
         });
diff --git a/src/search/FindReplace.js b/src/search/FindReplace.js
index 9ca6aebac2f..342946fdfdb 100644
--- a/src/search/FindReplace.js
+++ b/src/search/FindReplace.js
@@ -593,12 +593,23 @@ define(function (require, exports, module) {
         state.searchStartPos = editor.getCursorPos(false, "start");
         
         // Prepopulate the search field
-        var initialQuery;
+        var initialQuery,
+            initialReplaceText = "";
         if (findBar) {
             // Use the previous query. This can happen if the user switches from Find to Replace.
             initialQuery = findBar.getQueryInfo().query;
+            initialReplaceText = findBar.getReplaceText();
         } else {
-            initialQuery = FindUtils.getInitialQueryFromSelection(editor);
+            var openedFindbars = FindBar._bars && FindBar._bars.filter(function (findBar) {
+                return !findBar.isClosed();
+            });
+
+            if (openedFindbars && openedFindbars.length) {
+                initialQuery = openedFindbars[0].getQueryInfo().query;
+                initialReplaceText = openedFindbars[0].getReplaceText();
+            } else {
+                initialQuery = FindUtils.getInitialQueryFromSelection(editor);
+            }
         }
         
         // Close our previous find bar, if any. (The open() of the new findBar will
@@ -612,6 +623,7 @@ define(function (require, exports, module) {
             multifile: false,
             replace: replace,
             initialQuery: initialQuery,
+            initialReplaceText: initialReplaceText,
             queryPlaceholder: Strings.FIND_QUERY_PLACEHOLDER
         });
         findBar.open();

From e71d33ef8f66789649a4d82372a65cd71004330a Mon Sep 17 00:00:00 2001
From: Marcel Gerber <mg.hain@gmx.de>
Date: Tue, 21 Oct 2014 16:28:49 +0200
Subject: [PATCH 2/4] Code review changes

---
 src/search/FindInFilesUI.js | 8 ++++----
 src/search/FindReplace.js   | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/search/FindInFilesUI.js b/src/search/FindInFilesUI.js
index c0ab781945a..c866ea56fe4 100644
--- a/src/search/FindInFilesUI.js
+++ b/src/search/FindInFilesUI.js
@@ -130,7 +130,8 @@ define(function (require, exports, module) {
         }
         
         // Default to searching for the current selection
-        var initialQuery = "",
+        var currentEditor = EditorManager.getActiveEditor(),
+            initialQuery = "",
             initialReplaceText = "";
 
         if (_findBar && !_findBar.isClosed()) {
@@ -139,9 +140,8 @@ define(function (require, exports, module) {
             initialQuery = _findBar.getQueryInfo().query;
             initialReplaceText = _findBar.getReplaceText();
         } else {
-            var currentEditor = EditorManager.getActiveEditor(),
-                openedFindbars = FindBar._bars && FindBar._bars.filter(function (findBar) {
-                    return !findBar.isClosed();
+            var openedFindbars = FindBar._bars && FindBar._bars.filter(function (bar) {
+                    return !bar.isClosed();
                 });
 
             if (openedFindbars && openedFindbars.length) {
diff --git a/src/search/FindReplace.js b/src/search/FindReplace.js
index 342946fdfdb..99546418462 100644
--- a/src/search/FindReplace.js
+++ b/src/search/FindReplace.js
@@ -600,8 +600,8 @@ define(function (require, exports, module) {
             initialQuery = findBar.getQueryInfo().query;
             initialReplaceText = findBar.getReplaceText();
         } else {
-            var openedFindbars = FindBar._bars && FindBar._bars.filter(function (findBar) {
-                return !findBar.isClosed();
+            var openedFindbars = FindBar._bars && FindBar._bars.filter(function (bar) {
+                return !bar.isClosed();
             });
 
             if (openedFindbars && openedFindbars.length) {

From a3950976eaee23681b4e5d2faa67faef1027f1dd Mon Sep 17 00:00:00 2001
From: Marcel Gerber <mg.hain@gmx.de>
Date: Tue, 21 Oct 2014 16:57:31 +0200
Subject: [PATCH 3/4] Use FindUtils method

---
 src/search/FindInFilesUI.js | 27 +++---------------
 src/search/FindReplace.js   | 23 ++-------------
 src/search/FindUtils.js     | 56 +++++++++++++++++++++++++++++--------
 3 files changed, 51 insertions(+), 55 deletions(-)

diff --git a/src/search/FindInFilesUI.js b/src/search/FindInFilesUI.js
index c866ea56fe4..b4f354d3415 100644
--- a/src/search/FindInFilesUI.js
+++ b/src/search/FindInFilesUI.js
@@ -129,28 +129,9 @@ define(function (require, exports, module) {
             return;
         }
         
-        // Default to searching for the current selection
+        // Get initial query/replace text
         var currentEditor = EditorManager.getActiveEditor(),
-            initialQuery = "",
-            initialReplaceText = "";
-
-        if (_findBar && !_findBar.isClosed()) {
-            // The modalBar was already up. When creating the new modalBar, copy the
-            // current query instead of using the passed-in selected text.
-            initialQuery = _findBar.getQueryInfo().query;
-            initialReplaceText = _findBar.getReplaceText();
-        } else {
-            var openedFindbars = FindBar._bars && FindBar._bars.filter(function (bar) {
-                    return !bar.isClosed();
-                });
-
-            if (openedFindbars && openedFindbars.length) {
-                initialQuery = openedFindbars[0].getQueryInfo().query;
-                initialReplaceText = openedFindbars[0].getReplaceText();
-            } else if (currentEditor) {
-                initialQuery = FindUtils.getInitialQueryFromSelection(currentEditor);
-            }
-        }
+            initialQuery = FindUtils.getInitialQuery(_findBar, currentEditor);
 
         // Close our previous find bar, if any. (The open() of the new _findBar will
         // take care of closing any other find bar instances.)
@@ -161,8 +142,8 @@ define(function (require, exports, module) {
         _findBar = new FindBar({
             multifile: true,
             replace: showReplace,
-            initialQuery: initialQuery,
-            initialReplaceText: initialReplaceText,
+            initialQuery: initialQuery.query,
+            initialReplaceText: initialQuery.replaceText,
             queryPlaceholder: Strings.FIND_QUERY_PLACEHOLDER,
             scopeLabel: FindUtils.labelForScope(scope)
         });
diff --git a/src/search/FindReplace.js b/src/search/FindReplace.js
index 99546418462..d722eef47b7 100644
--- a/src/search/FindReplace.js
+++ b/src/search/FindReplace.js
@@ -593,24 +593,7 @@ define(function (require, exports, module) {
         state.searchStartPos = editor.getCursorPos(false, "start");
         
         // Prepopulate the search field
-        var initialQuery,
-            initialReplaceText = "";
-        if (findBar) {
-            // Use the previous query. This can happen if the user switches from Find to Replace.
-            initialQuery = findBar.getQueryInfo().query;
-            initialReplaceText = findBar.getReplaceText();
-        } else {
-            var openedFindbars = FindBar._bars && FindBar._bars.filter(function (bar) {
-                return !bar.isClosed();
-            });
-
-            if (openedFindbars && openedFindbars.length) {
-                initialQuery = openedFindbars[0].getQueryInfo().query;
-                initialReplaceText = openedFindbars[0].getReplaceText();
-            } else {
-                initialQuery = FindUtils.getInitialQueryFromSelection(editor);
-            }
-        }
+        var initialQuery = FindUtils.getInitialQuery(findBar, editor);
         
         // Close our previous find bar, if any. (The open() of the new findBar will
         // take care of closing any other find bar instances.)
@@ -622,8 +605,8 @@ define(function (require, exports, module) {
         findBar = new FindBar({
             multifile: false,
             replace: replace,
-            initialQuery: initialQuery,
-            initialReplaceText: initialReplaceText,
+            initialQuery: initialQuery.query,
+            initialReplaceText: initialQuery.replaceText,
             queryPlaceholder: Strings.FIND_QUERY_PLACEHOLDER
         });
         findBar.open();
diff --git a/src/search/FindUtils.js b/src/search/FindUtils.js
index 066671467c1..0672ffc3007 100644
--- a/src/search/FindUtils.js
+++ b/src/search/FindUtils.js
@@ -32,6 +32,7 @@ define(function (require, exports, module) {
         MainViewManager = require("view/MainViewManager"),
         FileSystem      = require("filesystem/FileSystem"),
         FileUtils       = require("file/FileUtils"),
+        FindBar         = require("search/FindBar").FindBar,
         ProjectManager  = require("project/ProjectManager"),
         Strings         = require("strings"),
         StringUtils     = require("utils/StringUtils"),
@@ -71,19 +72,50 @@ define(function (require, exports, module) {
         return replaceWith;
     }
     
-    /*
-     * Returns the string used to prepopulate the find bar
-     * @param {!Editor} editor
-     * @return {string} first line of primary selection to populate the find bar
+    /**
+     * Gets you the right query and replace text to prepopulate the Find Bar.
+     * @param {?FindBar} currentFindBar The currently open Find Bar, if any
+     * @param {?Editor} The active editor, if any
+     * @return {query: string, replaceText: string} Query and Replace text to prepopulate the Find Bar with
      */
-    function getInitialQueryFromSelection(editor) {
-        var selectionText = editor.getSelectedText();
-        if (selectionText) {
-            return selectionText
-                .replace(/^\n*/, "") // Trim possible newlines at the very beginning of the selection
-                .split("\n")[0];
+    function getInitialQuery(currentFindBar, editor) {
+        var query = "",
+            replaceText = "";
+
+        /*
+         * Returns the string used to prepopulate the find bar
+         * @param {!Editor} editor
+         * @return {string} first line of primary selection to populate the find bar
+         */
+        function getInitialQueryFromSelection(editor) {
+            var selectionText = editor.getSelectedText();
+            if (selectionText) {
+                return selectionText
+                    .replace(/^\n*/, "") // Trim possible newlines at the very beginning of the selection
+                    .split("\n")[0];
+            }
+            return "";
         }
-        return "";
+
+        if (currentFindBar && !currentFindBar.isClosed()) {
+            // The modalBar was already up. When creating the new modalBar, copy the
+            // current query instead of using the passed-in selected text.
+            query = currentFindBar.getQueryInfo().query;
+            replaceText = currentFindBar.getReplaceText();
+        } else {
+            var openedFindbars = FindBar._bars && FindBar._bars.filter(function (bar) {
+                    return !bar.isClosed();
+                });
+
+            if (openedFindbars && openedFindbars.length) {
+                query = openedFindbars[0].getQueryInfo().query;
+                replaceText = openedFindbars[0].getReplaceText();
+            } else if (editor) {
+                query = getInitialQueryFromSelection(editor);
+            }
+        }
+
+        return {query: query, replaceText: replaceText};
     }
 
     /**
@@ -311,7 +343,7 @@ define(function (require, exports, module) {
     }
 
     exports.parseDollars                    = parseDollars;
-    exports.getInitialQueryFromSelection    = getInitialQueryFromSelection;
+    exports.getInitialQuery                 = getInitialQuery;
     exports.hasCheckedMatches               = hasCheckedMatches;
     exports.performReplacements             = performReplacements;
     exports.labelForScope                   = labelForScope;

From 0358030b5012e8246db27a664dee69b2bb0518d3 Mon Sep 17 00:00:00 2001
From: Marcel Gerber <mg.hain@gmx.de>
Date: Tue, 21 Oct 2014 18:05:08 +0200
Subject: [PATCH 4/4] Stop filtering when the first match was found

---
 src/search/FindUtils.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/search/FindUtils.js b/src/search/FindUtils.js
index 0672ffc3007..86a54def01f 100644
--- a/src/search/FindUtils.js
+++ b/src/search/FindUtils.js
@@ -103,13 +103,13 @@ define(function (require, exports, module) {
             query = currentFindBar.getQueryInfo().query;
             replaceText = currentFindBar.getReplaceText();
         } else {
-            var openedFindbars = FindBar._bars && FindBar._bars.filter(function (bar) {
+            var openedFindBar = FindBar._bars && _.find(FindBar._bars, function (bar) {
                     return !bar.isClosed();
                 });
 
-            if (openedFindbars && openedFindbars.length) {
-                query = openedFindbars[0].getQueryInfo().query;
-                replaceText = openedFindbars[0].getReplaceText();
+            if (openedFindBar) {
+                query = openedFindBar.getQueryInfo().query;
+                replaceText = openedFindBar.getReplaceText();
             } else if (editor) {
                 query = getInitialQueryFromSelection(editor);
             }