Issue #11261: keep the search bar open

src/command/Commands.js

@@ -114,6 +114,7 @@ define(function (require, exports, module) {
     exports.TOGGLE_LINE_NUMBERS         = "view.toggleLineNumbers";     // EditorOptionHandlers.js      _getToggler()
     exports.TOGGLE_ACTIVE_LINE          = "view.toggleActiveLine";      // EditorOptionHandlers.js      _getToggler()
     exports.TOGGLE_WORD_WRAP            = "view.toggleWordWrap";        // EditorOptionHandlers.js      _getToggler()
+    exports.TOGGLE_SEARCH_AUTOHIDE      = "view.toggleSearchAutoHide";  // EditorOptionHandlers.js      _getToggler() // TODO REMOVE_toggleSearcjAutoHide()
 
     exports.CMD_OPEN                        = "cmd.open";
     exports.CMD_ADD_TO_WORKINGSET_AND_OPEN  = "cmd.addToWorkingSetAndOpen";          // DocumentCommandHandlers.js   handleOpenDocumentInNewPane()

src/command/DefaultMenus.js

@@ -125,6 +125,7 @@ define(function (require, exports, module) {
         menu.addMenuItem(Commands.CMD_SPLITVIEW_HORIZONTAL);
         menu.addMenuDivider();
         menu.addMenuItem(Commands.VIEW_HIDE_SIDEBAR);
+        menu.addMenuItem(Commands.TOGGLE_SEARCH_AUTOHIDE);
         menu.addMenuDivider();
         menu.addMenuItem(Commands.VIEW_INCREASE_FONT_SIZE);
         menu.addMenuItem(Commands.VIEW_DECREASE_FONT_SIZE);

src/editor/Editor.js

@@ -98,7 +98,8 @@ define(function (require, exports, module) {
         TAB_SIZE            = "tabSize",
         UPPERCASE_COLORS    = "uppercaseColors",
         USE_TAB_CHAR        = "useTabChar",
-        WORD_WRAP           = "wordWrap";
+        WORD_WRAP           = "wordWrap",
+        AUTO_HIDE_SEARCH    = "autoHideSearch";
 
     var cmOptions         = {};
 
@@ -207,6 +208,9 @@ define(function (require, exports, module) {
     PreferencesManager.definePreference(WORD_WRAP,          "boolean", true, {
         description: Strings.DESCRIPTION_WORD_WRAP
     });
+    PreferencesManager.definePreference(AUTO_HIDE_SEARCH,   "boolean", true, {
+        description: Strings.DESCRIPTION_SEARCH_AUTOHIDE
+    });
 
     var editorOptions = Object.keys(cmOptions);
 

src/editor/EditorOptionHandlers.js

@@ -39,7 +39,8 @@ define(function (require, exports, module) {
     var SHOW_LINE_NUMBERS = "showLineNumbers",
         STYLE_ACTIVE_LINE = "styleActiveLine",
         WORD_WRAP         = "wordWrap",
-        CLOSE_BRACKETS    = "closeBrackets";
+        CLOSE_BRACKETS    = "closeBrackets",
+        AUTO_HIDE_SEARCH  = "autoHideSearch";
 
     /**
      * @private
@@ -51,6 +52,7 @@ define(function (require, exports, module) {
     _optionMapping[STYLE_ACTIVE_LINE] = Commands.TOGGLE_ACTIVE_LINE;
     _optionMapping[WORD_WRAP] = Commands.TOGGLE_WORD_WRAP;
     _optionMapping[CLOSE_BRACKETS] = Commands.TOGGLE_CLOSE_BRACKETS;
+    _optionMapping[AUTO_HIDE_SEARCH] = Commands.TOGGLE_SEARCH_AUTOHIDE;
 
     /**
      * @private
@@ -100,6 +102,7 @@ define(function (require, exports, module) {
     CommandManager.register(Strings.CMD_TOGGLE_ACTIVE_LINE, Commands.TOGGLE_ACTIVE_LINE, _getToggler(STYLE_ACTIVE_LINE));
     CommandManager.register(Strings.CMD_TOGGLE_WORD_WRAP, Commands.TOGGLE_WORD_WRAP, _getToggler(WORD_WRAP));
     CommandManager.register(Strings.CMD_TOGGLE_CLOSE_BRACKETS, Commands.TOGGLE_CLOSE_BRACKETS, _getToggler(CLOSE_BRACKETS));
+    CommandManager.register(Strings.CMD_TOGGLE_SEARCH_AUTOHIDE, Commands.TOGGLE_SEARCH_AUTOHIDE, _getToggler(AUTO_HIDE_SEARCH));
 
     AppInit.htmlReady(_init);
 });

src/htmlContent/findreplace-bar.html

@@ -34,3 +34,5 @@
     <div class="indexing-message">{{Strings.FIND_IN_FILES_INDEXING}}</div>
 </div>
 {{/multifile}}
+
+<a href="#" class="close">&times;</a>

src/nls/root/strings.js

@@ -398,6 +398,7 @@ define({
     "CMD_WORKINGSET_SORT_BY_TYPE"         : "Sort by Type",
     "CMD_WORKING_SORT_TOGGLE_AUTO"        : "Automatic Sort",
     "CMD_THEMES"                          : "Themes\u2026",
+    "CMD_TOGGLE_SEARCH_AUTOHIDE"          : "Automatically close search",
 
     // Navigate menu commands
     "NAVIGATE_MENU"                       : "Navigate",
@@ -759,6 +760,7 @@ define({
     "DESCRIPTION_USE_TAB_CHAR"                       : "true to use tabs instead of spaces",
     "DESCRIPTION_UPPERCASE_COLORS"                   : "true to generate uppercase hex colors in Inline Color Editor",
     "DESCRIPTION_WORD_WRAP"                          : "Wrap lines that exceed the viewport width",
+    "DESCRIPTION_SEARCH_AUTOHIDE"                    : "Hide the search bar as soon as the editor is focused",
     "DESCRIPTION_DETECTED_EXCLUSIONS"                : "A list of files that have been detected to cause Tern to run out of control",
     "DESCRIPTION_INFERENCE_TIMEOUT"                  : "The amount of time after which Tern will time out when trying to understand files",
     "DESCRIPTION_SHOW_ERRORS_IN_STATUS_BAR"          : "true to show errors in status bar",

src/search/FindBar.js

@@ -247,11 +247,28 @@ define(function (require, exports, module) {
         var templateVars = _.clone(this._options);
         templateVars.Strings = Strings;
         templateVars.replaceAllLabel = (templateVars.multifile ? Strings.BUTTON_REPLACE_ALL_IN_FILES : Strings.BUTTON_REPLACE_ALL);
+
+        this._modalBar = new ModalBar(
+            Mustache.render(_searchBarTemplate, templateVars),
+            !!PreferencesManager.get('autoHideSearch')
+        );  // 2nd arg = auto-close on Esc/blur
 
-        this._modalBar = new ModalBar(Mustache.render(_searchBarTemplate, templateVars), true);  // 2nd arg = auto-close on Esc/blur
+        // Done this way because ModalBar.js seems to react underiably when
+        // modifying it to handle the escape key - the findbar wasn't getting
+        // closed as it should, instead persisting in the background
+        function _handleKeydown(e) {
+            if (e.keyCode === KeyEvent.DOM_VK_ESCAPE) {
+                e.stopPropagation();
+                e.preventDefault();
+                self.close();
+            }
+        }
+        window.document.body.addEventListener("keydown", _handleKeydown, true);
 
         // When the ModalBar closes, clean ourselves up.
         this._modalBar.on("close", function (event) {
+            window.document.body.removeEventListener("keydown", _handleKeydown, true);
+
             // Hide error popup, since it hangs down low enough to make the slide-out look awkward
             self.showError(null);
             self._modalBar = null;
@@ -293,8 +310,11 @@ define(function (require, exports, module) {
                         return;
                     }
                     currentTime = new Date().getTime();
-                    if (lastTypedTime && (currentTime - lastTypedTime >= 100) && self.getQueryInfo().query !==  lastQueriedText &&
+
+                    if (lastTypedTime && (currentTime - lastTypedTime >= 100) &&
+                            self.getQueryInfo().query !== lastQueriedText &&
                             !FindUtils.isNodeSearchInProgress()) {
+
                         // init Search
                         if (self._options.multifile) {
                             if ($(e.target).is("#find-what")) {
@@ -334,6 +354,9 @@ define(function (require, exports, module) {
                         self.trigger("doFind", e.shiftKey);
                     }
                 }
+            })
+            .on("click", ".close", function () {
+                self.close();
             });
 
         if (!this._options.multifile) {
@@ -608,6 +631,10 @@ define(function (require, exports, module) {
             }
         }
 
+        if (editor) {
+            query = getInitialQueryFromSelection(editor);
+        }
+
         return {query: query, replaceText: replaceText};
     };
 

src/search/FindInFilesUI.js

@@ -93,7 +93,8 @@ define(function (require, exports, module) {
                         var showMessage = false;
                         _findBar.enable(true);
                         if (zeroFilesToken === FindInFiles.ZERO_FILES_TO_SEARCH) {
-                            _findBar.showError(StringUtils.format(Strings.FIND_IN_FILES_ZERO_FILES, FindUtils.labelForScope(FindInFiles.searchModel.scope)), true);
+                            _findBar.showError(StringUtils.format(Strings.FIND_IN_FILES_ZERO_FILES,
+                                FindUtils.labelForScope(FindInFiles.searchModel.scope)), true);
                         } else {
                             showMessage = true;
                         }

src/search/FindReplace.js

@@ -591,6 +591,8 @@ define(function (require, exports, module) {
             // Blank or invalid query: just jump back to initial pos
             editor._codeMirror.setCursor(state.searchStartPos);
         }
+
+        editor.lastParsedQuery = state.parsedQuery;
     }
 
 
@@ -612,6 +614,10 @@ define(function (require, exports, module) {
         // Prepopulate the search field
         var initialQuery = FindBar.getInitialQuery(findBar, editor);
 
+        if (initialQuery.query === "" && editor.lastParsedQuery !== "") {
+            initialQuery.query = editor.lastParsedQuery;
+        }
+
         // Close our previous find bar, if any. (The open() of the new findBar will
         // take care of closing any other find bar instances.)
         if (findBar) {
@@ -636,6 +642,7 @@ define(function (require, exports, module) {
                 findNext(editor, searchBackwards);
             })
             .on("close.FindReplace", function (e) {
+                editor.lastParsedQuery = state.parsedQuery;
                 // Clear highlights but leave search state in place so Find Next/Previous work after closing
                 clearHighlights(cm, state);
 
@@ -655,12 +662,12 @@ define(function (require, exports, module) {
      */
     function doSearch(editor, searchBackwards) {
         var state = getSearchState(editor._codeMirror);
+
         if (state.parsedQuery) {
             findNext(editor, searchBackwards);
-            return;
+        } else {
+            openSearchBar(editor, false);
         }
-
-        openSearchBar(editor, false);
     }
 
 
@@ -695,6 +702,8 @@ define(function (require, exports, module) {
                 findBar.close();
             }
         }
+
+        editor.lastEditorSearchPosStr = "";     // Positions have shifted, so we abort the auto-next on findbar launch
     }
 
     function replace(editor) {
@@ -717,10 +726,43 @@ define(function (require, exports, module) {
 
     function _launchFind() {
         var editor = EditorManager.getActiveEditor();
+
         if (editor) {
+            // Make note of the original query details
+            var state = getSearchState(editor._codeMirror),
+                qry = (findBar && state && state.parsedQuery) || "",
+                idx = state && state.matchIndex;
+
             // Create a new instance of the search bar UI
             clearSearch(editor._codeMirror);
             doSearch(editor, false);
+            _findNextIfSameSearch(qry, idx, getSearchState(editor._codeMirror));
+        }
+    }
+
+    function _findNextIfSameSearch(originalQuery, originalIdx, state) {
+        // Process the new query and prep the original and new for comparing
+        var newIdx, newQuery;
+
+        if (findBar && state && state.queryInfo && state.searchStartPos) {
+            newQuery = state.parsedQuery || "";
+            newIdx = state.matchIndex;
+
+            if (!state.queryInfo.isCaseSensitive) {
+                originalQuery = typeof originalQuery === "string"
+                    ? originalQuery.toLowerCase()
+                    : originalQuery;
+
+                newQuery = typeof newQuery === "string"
+                    ? newQuery.toLowerCase()
+                    : newQuery;
+            }
+        }
+
+        // If the original and new query are the same, go to the next
+        if (originalQuery && newQuery && originalQuery === newQuery &&
+                originalIdx === newIdx) {
+            _findNext();
         }
     }
 

src/styles/brackets.less

@@ -1686,6 +1686,15 @@ a, img {
         margin-left: 0px;
         border-radius: 0;
     }
+
+    .close {
+        position: absolute;
+        right: 10px;
+
+        // vertically centers close button
+        top: 50%;
+        margin-top: -8px;
+    }
 }
 
 // File exclusion filter (used only in Find in Files search bar, for now)

src/widgets/ModalBar.js

@@ -264,4 +264,4 @@ define(function (require, exports, module) {
     };
 
     exports.ModalBar = ModalBar;
-});
+});

test/spec/FindReplace-test.js

@@ -745,7 +745,7 @@ define(function (require, exports, module) {
                 });
             });
 
-            it("shouldn't Find Next after search bar reopened", function () {
+            it("should Find Next after search bar reopened", function () {
                 runs(function () {
                     myEditor.setCursorPos(0, 0);
 
@@ -763,10 +763,10 @@ define(function (require, exports, module) {
                     twCommandManager.execute(Commands.CMD_FIND);
 
                     expectSearchBarOpen();
-                    expect(myEditor).toHaveCursorPosition(0, 0);
+                    expect(myEditor).toHaveCursorPosition(8, 8, true);
 
                     twCommandManager.execute(Commands.CMD_FIND_NEXT);
-                    expect(myEditor).toHaveCursorPosition(0, 0);
+                    expect(myEditor).toHaveCursorPosition(8, 8, true);
                 });
             });
 

test/spec/SpecRunnerUtils.js

@@ -1320,7 +1320,7 @@ define(function (require, exports, module) {
             /**
              * Expects the given editor's selection to be a cursor at the given position (no range selected)
              */
-            toHaveCursorPosition: function (line, ch) {
+            toHaveCursorPosition: function (line, ch, ignoreSelection) {
                 var editor = this.actual;
                 var selection = editor.getSelection();
                 var notString = this.isNot ? "not " : "";
@@ -1342,7 +1342,7 @@ define(function (require, exports, module) {
 
                 // when adding the not operator, it's confusing to check both the size of the
                 // selection and the position. We just check the position in that case.
-                if (this.isNot) {
+                if (this.isNot || ignoreSelection) {
                     return positionsMatch;
                 } else {
                     return !selectionMoreThanOneCharacter && positionsMatch;