Keep query and replace text when switching between Replace and Replace In Files

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}}

src/search/FindBar.js

@@ -77,6 +77,7 @@ define(function (require, exports, module) {
             replace: false,
             queryPlaceholder: "",
             initialQuery: "",
+            initialReplaceText: "",
             scopeLabel: ""
         };
         this._options = _.extend(defaults, options);

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)
         });

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();