From 0388f9cc86e3133f67bdf531d544339236ad2f1a Mon Sep 17 00:00:00 2001
From: Marcel Gerber <mg.hain@gmx.de>
Date: Mon, 3 Mar 2014 02:36:07 +0100
Subject: [PATCH 1/6] Added button to show all results in a list

---
 src/htmlContent/findreplace-bar.html       |  1 +
 src/nls/root/strings.js                    |  1 +
 src/search/FindInFiles.js                  | 25 +++++++++++++++-------
 src/search/FindReplace.js                  |  9 +++++++-
 src/styles/brackets.less                   | 10 +++++++--
 src/styles/images/find-replace-sprites.svg |  2 +-
 6 files changed, 36 insertions(+), 12 deletions(-)

diff --git a/src/htmlContent/findreplace-bar.html b/src/htmlContent/findreplace-bar.html
index 7273f266f35..6d619eaad8d 100644
--- a/src/htmlContent/findreplace-bar.html
+++ b/src/htmlContent/findreplace-bar.html
@@ -1,5 +1,6 @@
 <div id="find-group"><!--
     --><div class="search-input-container"><input type="text" id="find-what" placeholder="{{CMD_FIND_FIELD_PLACEHOLDER}}" /><div class="error"></div><span id="find-counter"></span></div><!--
+    -->{{^replace}}<button id="find-show-list" class="btn no-focus" tabindex="-1" title="{{FIND_SHOW_IN_A_LIST}}"><div class="button-icon"></div></button>{{/replace}}<!--
     --><button id="find-case-sensitive" class="btn no-focus" tabindex="-1" title="{{BUTTON_CASESENSITIVE_HINT}}"><div class="button-icon"></div></button><!--
     --><button id="find-regexp" class="btn no-focus" tabindex="-1" title="{{BUTTON_REGEXP_HINT}}"><div class="button-icon"></div></button><!--
     --><div class="navigator"><!--
diff --git a/src/nls/root/strings.js b/src/nls/root/strings.js
index 657511bb586..62ddf279f48 100644
--- a/src/nls/root/strings.js
+++ b/src/nls/root/strings.js
@@ -131,6 +131,7 @@ define({
     "FIND_RESULT_COUNT"                 : "{0} results",
     "FIND_RESULT_COUNT_SINGLE"          : "1 result",
     "FIND_NO_RESULTS"                   : "No results",
+    "FIND_SHOW_IN_A_LIST"               : "Show results in a list",
     "REPLACE_PLACEHOLDER"               : "Replace with\u2026",
     "BUTTON_REPLACE_ALL"                : "All\u2026",
     "BUTTON_REPLACE"                    : "Replace",
diff --git a/src/search/FindInFiles.js b/src/search/FindInFiles.js
index ce8ec3a9b03..ec20bef72ef 100644
--- a/src/search/FindInFiles.js
+++ b/src/search/FindInFiles.js
@@ -858,9 +858,10 @@ define(function (require, exports, module) {
      * @private
      * Displays a non-modal embedded dialog above the code mirror editor that allows the user to do
      * a find operation across all files in the project.
-     * @param {?Entry} scope  Project file/subfolder to search within; else searches whole project.
+     * @param {?Entry=} scope  Project file/subfolder to search within; else searches whole project.
+    * @param {?string=} query - The query to search for; else asks for the query
      */
-    function _doFindInFiles(scope) {
+    function _doFindInFiles(scope, query) {
         // If the scope is a file with a custom viewer, then we
         // don't show find in files dialog.
         if (scope && EditorManager.getCustomViewerForPath(scope.fullPath)) {
@@ -892,17 +893,25 @@ define(function (require, exports, module) {
         currentQueryExpr   = null;
         currentScope       = scope;
         maxHitsFoundInFile = false;
-                            
-        dialog.showDialog(initialString, scope);
+
+        if (query) {
+            StatusBar.showBusyIndicator(true);
+            dialog.closed = true;
+            _doSearch(query);
+        } else {
+            dialog.showDialog(initialString, scope);
+        }
     }
     
     /**
-     * @private
      * Search within the file/subtree defined by the sidebar selection
+     * @param {?Entry=} scope - Project file/subfolder to search within; else takes entry selected in file tree.
+     * @param {?string=} query - The query to search for; else asks for the query
      */
-    function _doFindInSubtree() {
-        var selectedEntry = ProjectManager.getSelectedItem();
-        _doFindInFiles(selectedEntry);
+    function _doFindInSubtree(scope, query) {
+        scope = scope || ProjectManager.getSelectedItem();
+        query = query || undefined;
+        _doFindInFiles(scope, query);
     }
     
     
diff --git a/src/search/FindReplace.js b/src/search/FindReplace.js
index 4cfb8cca485..b2a3039e98c 100644
--- a/src/search/FindReplace.js
+++ b/src/search/FindReplace.js
@@ -278,9 +278,11 @@ define(function (require, exports, module) {
             // Make the field red if it's not blank and it has no matches (which also covers invalid regexes)
             ViewUtils.toggleClass($("#find-what"), "no-results", !state.foundAny && $("#find-what").val());
             
-            // Buttons disabled if blank, OR if no matches (Replace buttons) / < 2 matches (nav buttons)
+            // Buttons disabled if blank, OR if no matches (Replace buttons, Show in list button) /
+            // < 2 matches (nav buttons)
             $("#find-prev, #find-next").prop("disabled", !state.foundAny || numResults < 2);
             $("#replace-yes, #replace-all").prop("disabled", !state.foundAny);
+            $("#find-show-list").prop("disabled", !state.foundAny);
         }
         
         cm.operation(function () {
@@ -413,6 +415,11 @@ define(function (require, exports, module) {
                 
                 handleQueryChange(editor, state);
             })
+            .on("click", "#find-show-list", function (e) {
+                var query = $("#find-what").val();
+                modalBar.close(true, true);
+                CommandManager.execute(Commands.EDIT_FIND_IN_SUBTREE, DocumentManager.getCurrentDocument().file, query);
+            })
             .on("keydown", function (e) {
                 if (e.keyCode === KeyEvent.DOM_VK_RETURN) {
                     if (!e.shiftKey) {
diff --git a/src/styles/brackets.less b/src/styles/brackets.less
index 2f6b1caf1c3..fd10f1cbfc0 100644
--- a/src/styles/brackets.less
+++ b/src/styles/brackets.less
@@ -1107,7 +1107,7 @@ a, img {
         display: inline-block;
     }
 
-    #find-case-sensitive, #find-regexp {
+    #find-case-sensitive, #find-regexp, #find-show-list {
         padding: 1px 5px;
     }
     .button-icon {  // icons must be nested inside button so we can apply padding w/o tiling icon
@@ -1123,6 +1123,9 @@ a, img {
     #find-case-sensitive.active .button-icon {
         .sprite-swap(0, 72px);
     }
+    #find-show-list .button-icon {
+        .sprite-swap(0, 96px);
+    }
     #find-regexp.active, #find-case-sensitive.active {
         background-color: @tc-highlight;
     }
@@ -1144,6 +1147,9 @@ a, img {
         border-right: none;
         margin-right: 0;
     }
+    #find-show-list {
+        margin-right: 0;
+    }
     #find-next, #replace-all, #find-regexp {
         border-top-left-radius: 0;
         border-bottom-left-radius: 0;
@@ -1157,7 +1163,7 @@ a, img {
         border-top-right-radius: 0;
         border-bottom-right-radius: 0;
     }
-    #find-case-sensitive, #replace-yes {
+    #find-case-sensitive, #replace-yes, #find-show-list {
         border-left: none;
         margin-left: 0px;
         border-radius: 0;
diff --git a/src/styles/images/find-replace-sprites.svg b/src/styles/images/find-replace-sprites.svg
index fc472b6ab0c..8c13e6ef02e 100644
--- a/src/styles/images/find-replace-sprites.svg
+++ b/src/styles/images/find-replace-sprites.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="24px" height="96px" viewBox="0 0 24 96" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
+<svg width="24px" height="120px" viewBox="0 0 24 120" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
     <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <path d="M5,15.5 C5,15.0643543 5.14141273,14.705447 5.42424242,14.4232673 C5.70707212,14.1410877 6.06565439,14 6.5,14 C6.93434561,14 7.29292788,14.1410877 7.57575758,14.4232673 C7.85858727,14.705447 8,15.0643543 8,15.5 C8,15.9356457 7.85858727,16.294553 7.57575758,16.5767327 C7.29292788,16.8589123 6.93434561,17 6.5,17 C6.06565439,17 5.70707212,16.8589123 5.42424242,16.5767327 C5.14141273,16.294553 5,15.9356457 5,15.5 Z M13.8665049,12.3759036 L15.2936893,10.0144578 L13,9.00240964 L13.3228155,8.00722892 L15.7524272,8.61445783 L15.9563107,6 L17.0436893,6 L17.2475728,8.59759036 L19.6771845,8.00722892 L20,9.00240964 L17.7063107,10.0144578 L19.1334951,12.3759036 L18.2330097,13 L16.5,10.8578313 L14.7669903,13 L13.8665049,12.3759036 Z" id=".*" fill="#454545" sketch:type="MSShapeGroup"></path>
         <path d="M5,39.5 C5,39.0643543 5.14141273,38.705447 5.42424242,38.4232673 C5.70707212,38.1410877 6.06565439,38 6.5,38 C6.93434561,38 7.29292788,38.1410877 7.57575758,38.4232673 C7.85858727,38.705447 8,39.0643543 8,39.5 C8,39.9356457 7.85858727,40.294553 7.57575758,40.5767327 C7.29292788,40.8589123 6.93434561,41 6.5,41 C6.06565439,41 5.70707212,40.8589123 5.42424242,40.5767327 C5.14141273,40.294553 5,39.9356457 5,39.5 Z M13.8665049,36.3759036 L15.2936893,34.0144578 L13,33.0024096 L13.3228155,32.0072289 L15.7524272,32.6144578 L15.9563107,30 L17.0436893,30 L17.2475728,32.5975904 L19.6771845,32.0072289 L20,33.0024096 L17.7063107,34.0144578 L19.1334951,36.3759036 L18.2330097,37 L16.5,34.8578313 L14.7669903,37 L13.8665049,36.3759036 Z" id=".*-copy" fill="#0083E8" sketch:type="MSShapeGroup"></path>

From 43cb09c7ee627929bb56f0fd36ebf67f6fdcd2d8 Mon Sep 17 00:00:00 2001
From: Marcel Gerber <mg.hain@gmx.de>
Date: Mon, 3 Mar 2014 23:04:21 +0100
Subject: [PATCH 2/6] UI changes

---
 src/htmlContent/findreplace-bar.html       |  1 -
 src/search/FindReplace.js                  | 14 +++++++-------
 src/styles/brackets.less                   | 16 +++++++---------
 src/styles/images/find-replace-sprites.svg |  2 +-
 4 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/src/htmlContent/findreplace-bar.html b/src/htmlContent/findreplace-bar.html
index 6d619eaad8d..7273f266f35 100644
--- a/src/htmlContent/findreplace-bar.html
+++ b/src/htmlContent/findreplace-bar.html
@@ -1,6 +1,5 @@
 <div id="find-group"><!--
     --><div class="search-input-container"><input type="text" id="find-what" placeholder="{{CMD_FIND_FIELD_PLACEHOLDER}}" /><div class="error"></div><span id="find-counter"></span></div><!--
-    -->{{^replace}}<button id="find-show-list" class="btn no-focus" tabindex="-1" title="{{FIND_SHOW_IN_A_LIST}}"><div class="button-icon"></div></button>{{/replace}}<!--
     --><button id="find-case-sensitive" class="btn no-focus" tabindex="-1" title="{{BUTTON_CASESENSITIVE_HINT}}"><div class="button-icon"></div></button><!--
     --><button id="find-regexp" class="btn no-focus" tabindex="-1" title="{{BUTTON_REGEXP_HINT}}"><div class="button-icon"></div></button><!--
     --><div class="navigator"><!--
diff --git a/src/search/FindReplace.js b/src/search/FindReplace.js
index b2a3039e98c..f6faf9fadd8 100644
--- a/src/search/FindReplace.js
+++ b/src/search/FindReplace.js
@@ -276,13 +276,11 @@ define(function (require, exports, module) {
         
         function indicateHasMatches(numResults) {
             // Make the field red if it's not blank and it has no matches (which also covers invalid regexes)
-            ViewUtils.toggleClass($("#find-what"), "no-results", !state.foundAny && $("#find-what").val());
+            ViewUtils.toggleClass($("#find-what, #find-counter"), "no-results", !state.foundAny && $("#find-what").val());
             
-            // Buttons disabled if blank, OR if no matches (Replace buttons, Show in list button) /
-            // < 2 matches (nav buttons)
+            // Buttons disabled if blank, OR if no matches (Replace buttons) / < 2 matches (nav buttons)
             $("#find-prev, #find-next").prop("disabled", !state.foundAny || numResults < 2);
             $("#replace-yes, #replace-all").prop("disabled", !state.foundAny);
-            $("#find-show-list").prop("disabled", !state.foundAny);
         }
         
         cm.operation(function () {
@@ -415,10 +413,12 @@ define(function (require, exports, module) {
                 
                 handleQueryChange(editor, state);
             })
-            .on("click", "#find-show-list", function (e) {
+            .on("click", "#find-counter", function (e) {
                 var query = $("#find-what").val();
-                modalBar.close(true, true);
-                CommandManager.execute(Commands.EDIT_FIND_IN_SUBTREE, DocumentManager.getCurrentDocument().file, query);
+                if (query && state.foundAny) {
+                    modalBar.close(true, true);
+                    CommandManager.execute(Commands.EDIT_FIND_IN_SUBTREE, DocumentManager.getCurrentDocument().file, query);
+                }
             })
             .on("keydown", function (e) {
                 if (e.keyCode === KeyEvent.DOM_VK_RETURN) {
diff --git a/src/styles/brackets.less b/src/styles/brackets.less
index fd10f1cbfc0..83e84649fc0 100644
--- a/src/styles/brackets.less
+++ b/src/styles/brackets.less
@@ -1091,11 +1091,15 @@ a, img {
         }
         #find-counter {
             position: absolute;
-            color: @tc-light-weight-quiet-text;
+            color: @tc-call-to-action;
             top: 1px;
             right: 2px;
             font-size: 12px;
         }
+
+        #find-counter.no-results {
+            color: @tc-light-weight-quiet-text;
+        }
     }
 
     #find-group, #replace-group {
@@ -1107,7 +1111,7 @@ a, img {
         display: inline-block;
     }
 
-    #find-case-sensitive, #find-regexp, #find-show-list {
+    #find-case-sensitive, #find-regexp {
         padding: 1px 5px;
     }
     .button-icon {  // icons must be nested inside button so we can apply padding w/o tiling icon
@@ -1123,9 +1127,6 @@ a, img {
     #find-case-sensitive.active .button-icon {
         .sprite-swap(0, 72px);
     }
-    #find-show-list .button-icon {
-        .sprite-swap(0, 96px);
-    }
     #find-regexp.active, #find-case-sensitive.active {
         background-color: @tc-highlight;
     }
@@ -1147,9 +1148,6 @@ a, img {
         border-right: none;
         margin-right: 0;
     }
-    #find-show-list {
-        margin-right: 0;
-    }
     #find-next, #replace-all, #find-regexp {
         border-top-left-radius: 0;
         border-bottom-left-radius: 0;
@@ -1163,7 +1161,7 @@ a, img {
         border-top-right-radius: 0;
         border-bottom-right-radius: 0;
     }
-    #find-case-sensitive, #replace-yes, #find-show-list {
+    #find-case-sensitive, #replace-yes {
         border-left: none;
         margin-left: 0px;
         border-radius: 0;
diff --git a/src/styles/images/find-replace-sprites.svg b/src/styles/images/find-replace-sprites.svg
index 8c13e6ef02e..fc472b6ab0c 100644
--- a/src/styles/images/find-replace-sprites.svg
+++ b/src/styles/images/find-replace-sprites.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="24px" height="120px" viewBox="0 0 24 120" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
+<svg width="24px" height="96px" viewBox="0 0 24 96" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
     <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <path d="M5,15.5 C5,15.0643543 5.14141273,14.705447 5.42424242,14.4232673 C5.70707212,14.1410877 6.06565439,14 6.5,14 C6.93434561,14 7.29292788,14.1410877 7.57575758,14.4232673 C7.85858727,14.705447 8,15.0643543 8,15.5 C8,15.9356457 7.85858727,16.294553 7.57575758,16.5767327 C7.29292788,16.8589123 6.93434561,17 6.5,17 C6.06565439,17 5.70707212,16.8589123 5.42424242,16.5767327 C5.14141273,16.294553 5,15.9356457 5,15.5 Z M13.8665049,12.3759036 L15.2936893,10.0144578 L13,9.00240964 L13.3228155,8.00722892 L15.7524272,8.61445783 L15.9563107,6 L17.0436893,6 L17.2475728,8.59759036 L19.6771845,8.00722892 L20,9.00240964 L17.7063107,10.0144578 L19.1334951,12.3759036 L18.2330097,13 L16.5,10.8578313 L14.7669903,13 L13.8665049,12.3759036 Z" id=".*" fill="#454545" sketch:type="MSShapeGroup"></path>
         <path d="M5,39.5 C5,39.0643543 5.14141273,38.705447 5.42424242,38.4232673 C5.70707212,38.1410877 6.06565439,38 6.5,38 C6.93434561,38 7.29292788,38.1410877 7.57575758,38.4232673 C7.85858727,38.705447 8,39.0643543 8,39.5 C8,39.9356457 7.85858727,40.294553 7.57575758,40.5767327 C7.29292788,40.8589123 6.93434561,41 6.5,41 C6.06565439,41 5.70707212,40.8589123 5.42424242,40.5767327 C5.14141273,40.294553 5,39.9356457 5,39.5 Z M13.8665049,36.3759036 L15.2936893,34.0144578 L13,33.0024096 L13.3228155,32.0072289 L15.7524272,32.6144578 L15.9563107,30 L17.0436893,30 L17.2475728,32.5975904 L19.6771845,32.0072289 L20,33.0024096 L17.7063107,34.0144578 L19.1334951,36.3759036 L18.2330097,37 L16.5,34.8578313 L14.7669903,37 L13.8665049,36.3759036 Z" id=".*-copy" fill="#0083E8" sketch:type="MSShapeGroup"></path>

From 44f1ec95807ffbe4d9e9e870f12f5c00880e1bc4 Mon Sep 17 00:00:00 2001
From: Marcel Gerber <mg.hain@gmx.de>
Date: Tue, 4 Mar 2014 00:29:49 +0100
Subject: [PATCH 3/6] Cursor, title, shortcut

---
 src/nls/root/strings.js   |  2 +-
 src/search/FindReplace.js | 34 +++++++++++++++++++++++++---------
 src/styles/brackets.less  |  2 ++
 3 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/src/nls/root/strings.js b/src/nls/root/strings.js
index 62ddf279f48..51a0ca43c32 100644
--- a/src/nls/root/strings.js
+++ b/src/nls/root/strings.js
@@ -131,7 +131,7 @@ define({
     "FIND_RESULT_COUNT"                 : "{0} results",
     "FIND_RESULT_COUNT_SINGLE"          : "1 result",
     "FIND_NO_RESULTS"                   : "No results",
-    "FIND_SHOW_IN_A_LIST"               : "Show results in a list",
+    "FIND_SHOW_IN_LIST"                 : "Show results in a list",
     "REPLACE_PLACEHOLDER"               : "Replace with\u2026",
     "BUTTON_REPLACE_ALL"                : "All\u2026",
     "BUTTON_REPLACE"                    : "Replace",
diff --git a/src/search/FindReplace.js b/src/search/FindReplace.js
index f6faf9fadd8..a95b2aa3aaf 100644
--- a/src/search/FindReplace.js
+++ b/src/search/FindReplace.js
@@ -84,6 +84,9 @@ define(function (require, exports, module) {
     /** @type {!function():void} API from FindInFiles for closing its conflicting search bar, if open */
     var closeFindInFilesBar;
     
+    /** @type {?String} The (localized) title attribute of the #find-counter, including the shortcut */
+    var showInListTitle;
+    
     function SearchState() {
         this.searchStartPos = null;
         this.query = null;
@@ -275,8 +278,14 @@ define(function (require, exports, module) {
             state = getSearchState(cm);
         
         function indicateHasMatches(numResults) {
+            if (!showInListTitle) {
+                showInListTitle = Strings.FIND_SHOW_IN_LIST + " (" + KeyBindingManager.formatKeyDescriptor("Alt-Enter") + ")";
+            }
+            
             // Make the field red if it's not blank and it has no matches (which also covers invalid regexes)
-            ViewUtils.toggleClass($("#find-what, #find-counter"), "no-results", !state.foundAny && $("#find-what").val());
+            var query = $("#find-what").val();
+            ViewUtils.toggleClass($("#find-what, #find-counter"), "no-results", !state.foundAny && query);
+            $("#find-counter").attr("title", (state.foundAny && query) ? showInListTitle : "");
             
             // Buttons disabled if blank, OR if no matches (Replace buttons) / < 2 matches (nav buttons)
             $("#find-prev, #find-next").prop("disabled", !state.foundAny || numResults < 2);
@@ -360,6 +369,17 @@ define(function (require, exports, module) {
         }
     }
     
+    /**
+     * Shows the found results in a list (which is just the invoked FindInFiles panel)
+     */
+    function _showResultsInList() {
+        if (!$("#find-counter").hasClass("no-results")) {
+            var query = $("#find-what").val();
+            modalBar.close(true, true);
+            CommandManager.execute(Commands.EDIT_FIND_IN_SUBTREE, DocumentManager.getCurrentDocument().file, query);
+        }
+    }
+    
     
     /**
      * Opens the search bar with the given HTML content (Find or Find-Replace), attaches common Find behaviors,
@@ -413,16 +433,12 @@ define(function (require, exports, module) {
                 
                 handleQueryChange(editor, state);
             })
-            .on("click", "#find-counter", function (e) {
-                var query = $("#find-what").val();
-                if (query && state.foundAny) {
-                    modalBar.close(true, true);
-                    CommandManager.execute(Commands.EDIT_FIND_IN_SUBTREE, DocumentManager.getCurrentDocument().file, query);
-                }
-            })
+            .on("click", "#find-counter", _showResultsInList)
             .on("keydown", function (e) {
                 if (e.keyCode === KeyEvent.DOM_VK_RETURN) {
-                    if (!e.shiftKey) {
+                    if (e.altKey) {
+                        _showResultsInList();
+                    } else if (!e.shiftKey) {
                         findNext(editor);
                     } else {
                         findNext(editor, true);
diff --git a/src/styles/brackets.less b/src/styles/brackets.less
index 83e84649fc0..f4ec4a55656 100644
--- a/src/styles/brackets.less
+++ b/src/styles/brackets.less
@@ -1095,10 +1095,12 @@ a, img {
             top: 1px;
             right: 2px;
             font-size: 12px;
+            cursor: pointer;
         }
 
         #find-counter.no-results {
             color: @tc-light-weight-quiet-text;
+            cursor: default;
         }
     }
 

From df324c2f9e7a858666ac4659f3772e1ca54a98a7 Mon Sep 17 00:00:00 2001
From: Marcel Gerber <mg.hain@gmx.de>
Date: Mon, 10 Mar 2014 20:41:02 +0100
Subject: [PATCH 4/6] Fix merge errors

---
 src/search/FindInFiles.js | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/search/FindInFiles.js b/src/search/FindInFiles.js
index fbfbe2d02df..ef6316aa6a6 100644
--- a/src/search/FindInFiles.js
+++ b/src/search/FindInFiles.js
@@ -966,7 +966,8 @@ define(function (require, exports, module) {
         currentQueryExpr   = null;
         currentScope       = scope;
         maxHitsFoundInFile = false;
-<<<<<<< HEAD
+
+        exports._searchResults = null;  // for unit tests
 
         if (query) {
             StatusBar.showBusyIndicator(true);
@@ -975,11 +976,6 @@ define(function (require, exports, module) {
         } else {
             dialog.showDialog(initialString, scope);
         }
-=======
-        exports._searchResults = null;  // for unit tests
-                            
-        dialog.showDialog(initialString, scope);
->>>>>>> upstream/master
     }
     
     /**

From 81281710fe93e4baa925f0a0d714471944967b04 Mon Sep 17 00:00:00 2001
From: Marcel Gerber <mg.hain@gmx.de>
Date: Mon, 10 Mar 2014 21:36:42 +0100
Subject: [PATCH 5/6] Code review changes

---
 src/search/FindInFiles.js |  9 ++++-----
 src/search/FindReplace.js | 11 +++--------
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/src/search/FindInFiles.js b/src/search/FindInFiles.js
index ef6316aa6a6..2b5c9db50ea 100644
--- a/src/search/FindInFiles.js
+++ b/src/search/FindInFiles.js
@@ -925,8 +925,8 @@ define(function (require, exports, module) {
      * @private
      * Displays a non-modal embedded dialog above the code mirror editor that allows the user to do
      * a find operation across all files in the project.
-     * @param {?Entry=} scope  Project file/subfolder to search within; else searches whole project.
-    * @param {?string=} query - The query to search for; else asks for the query
+     * @param {Entry=} scope  Project file/subfolder to search within; else searches whole project.
+     * @param {string=} query The query to search for; else asks for the query
      */
     function _doFindInFiles(scope, query) {
         // If the scope is a file with a custom viewer, then we
@@ -980,12 +980,11 @@ define(function (require, exports, module) {
     
     /**
      * Search within the file/subtree defined by the sidebar selection
-     * @param {?Entry=} scope - Project file/subfolder to search within; else takes entry selected in file tree.
-     * @param {?string=} query - The query to search for; else asks for the query
+     * @param {Entry=} scope Project file/subfolder to search within; else takes entry selected in file tree.
+     * @param {string=} query The query to search for; else asks for the query
      */
     function _doFindInSubtree(scope, query) {
         scope = scope || ProjectManager.getSelectedItem();
-        query = query || undefined;
         _doFindInFiles(scope, query);
     }
     
diff --git a/src/search/FindReplace.js b/src/search/FindReplace.js
index a95b2aa3aaf..4eee7e930c2 100644
--- a/src/search/FindReplace.js
+++ b/src/search/FindReplace.js
@@ -84,9 +84,6 @@ define(function (require, exports, module) {
     /** @type {!function():void} API from FindInFiles for closing its conflicting search bar, if open */
     var closeFindInFilesBar;
     
-    /** @type {?String} The (localized) title attribute of the #find-counter, including the shortcut */
-    var showInListTitle;
-    
     function SearchState() {
         this.searchStartPos = null;
         this.query = null;
@@ -278,14 +275,10 @@ define(function (require, exports, module) {
             state = getSearchState(cm);
         
         function indicateHasMatches(numResults) {
-            if (!showInListTitle) {
-                showInListTitle = Strings.FIND_SHOW_IN_LIST + " (" + KeyBindingManager.formatKeyDescriptor("Alt-Enter") + ")";
-            }
-            
             // Make the field red if it's not blank and it has no matches (which also covers invalid regexes)
             var query = $("#find-what").val();
             ViewUtils.toggleClass($("#find-what, #find-counter"), "no-results", !state.foundAny && query);
-            $("#find-counter").attr("title", (state.foundAny && query) ? showInListTitle : "");
+            $("#find-counter").attr("title", (state.foundAny && query) ? Strings.FIND_SHOW_IN_LIST + " (" + KeyBindingManager.formatKeyDescriptor("Alt-Enter") + ")" : "");
             
             // Buttons disabled if blank, OR if no matches (Replace buttons) / < 2 matches (nav buttons)
             $("#find-prev, #find-next").prop("disabled", !state.foundAny || numResults < 2);
@@ -377,7 +370,9 @@ define(function (require, exports, module) {
             var query = $("#find-what").val();
             modalBar.close(true, true);
             CommandManager.execute(Commands.EDIT_FIND_IN_SUBTREE, DocumentManager.getCurrentDocument().file, query);
+            return true;
         }
+        return false;
     }
     
     

From 220f51a64e9c1e6831ec710701410107423bd124 Mon Sep 17 00:00:00 2001
From: Marcel Gerber <mg.hain@gmx.de>
Date: Tue, 11 Mar 2014 20:19:53 +0100
Subject: [PATCH 6/6] Code review changes

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

diff --git a/src/search/FindReplace.js b/src/search/FindReplace.js
index 4eee7e930c2..0602803c30f 100644
--- a/src/search/FindReplace.js
+++ b/src/search/FindReplace.js
@@ -276,9 +276,11 @@ define(function (require, exports, module) {
         
         function indicateHasMatches(numResults) {
             // Make the field red if it's not blank and it has no matches (which also covers invalid regexes)
-            var query = $("#find-what").val();
+            var query           = $("#find-what").val(),
+                showInListTitle = Strings.FIND_SHOW_IN_LIST + " (" + KeyBindingManager.formatKeyDescriptor("Alt-Enter") + ")";
+            
             ViewUtils.toggleClass($("#find-what, #find-counter"), "no-results", !state.foundAny && query);
-            $("#find-counter").attr("title", (state.foundAny && query) ? Strings.FIND_SHOW_IN_LIST + " (" + KeyBindingManager.formatKeyDescriptor("Alt-Enter") + ")" : "");
+            $("#find-counter").attr("title", (state.foundAny && query) ? showInListTitle : "");
             
             // Buttons disabled if blank, OR if no matches (Replace buttons) / < 2 matches (nav buttons)
             $("#find-prev, #find-next").prop("disabled", !state.foundAny || numResults < 2);
@@ -370,9 +372,7 @@ define(function (require, exports, module) {
             var query = $("#find-what").val();
             modalBar.close(true, true);
             CommandManager.execute(Commands.EDIT_FIND_IN_SUBTREE, DocumentManager.getCurrentDocument().file, query);
-            return true;
         }
-        return false;
     }