Merge pull request #5477 from cosmosgenius/5237-findinfiles-noresult

redmunds · redmunds · commit 0e12072a9a22 · 2013-10-11T08:27:09.000-07:00
Fix for issue #5237 - Find in Files - No response for no result found
diff --git a/src/search/FindInFiles.js b/src/search/FindInFiles.js
@@ -106,14 +106,20 @@ define(function (require, exports, module) {
         $searchContent,
         $selectedRow;
     
-    
+    /** @type {FindInFilesDialog} dialog having the modalbar for search */
+    var dialog = null;
+
     /**
      * @private
      * Returns a regular expression from the given query and shows an error in the modal-bar if it was invalid
      * @param {string} query  The query from the modal-bar input
      * @return {RegExp}
      */
     function _getQueryRegExp(query) {
+        if (!query) {
+            return null;
+        }
+        
         // Clear any pending RegEx error message
         $(".modal-bar .message").css("display", "inline-block");
         $(".modal-bar .error").css("display", "none");
@@ -162,83 +168,7 @@ define(function (require, exports, module) {
             return Strings.FIND_IN_FILES_NO_SCOPE;
         }
     }
-    
-    
-    // This dialog class was mostly copied from QuickOpen. We should have a common dialog
-    // class that everyone can use.
-    
-    /**
-     * FindInFilesDialog class
-     * @constructor
-     */
-    function FindInFilesDialog() {
-        this.closed = false;
-        this.result = null; // $.Deferred
-    }
 
-    /**
-     * Closes the search dialog and resolves the promise that showDialog returned
-     */
-    FindInFilesDialog.prototype._close = function (value) {
-        if (this.closed) {
-            return;
-        }
-        
-        this.closed = true;
-        this.modalBar.close();
-        EditorManager.focusEditor();
-        this.result.resolve(value);
-    };
-    
-    /**
-     * Shows the search dialog
-     * @param {string=} initialString  Default text to prepopulate the search field with
-     * @param {Entry=} scope  Search scope, or null to search whole project
-     * @returns {$.Promise} that is resolved with the string to search for
-     */
-    FindInFilesDialog.prototype.showDialog = function (initialString, scope) {
-        // Note the prefix label is a simple "Find:" - the "in ..." part comes after the text field
-        var templateVars = {
-                value: initialString || "",
-                label: _labelForScope(scope)
-            },
-            dialogHTML = Mustache.render(searchDialogTemplate, $.extend(templateVars, Strings)),
-            that       = this;
-        
-        this.result      = new $.Deferred();
-        this.modalBar    = new ModalBar(dialogHTML, false);
-        var $searchField = $("input#searchInput");
-        
-        $searchField.get(0).select();
-        $searchField
-            .bind("keydown", function (event) {
-                if (event.keyCode === KeyEvent.DOM_VK_RETURN || event.keyCode === KeyEvent.DOM_VK_ESCAPE) {  // Enter/Return key or Esc key
-                    event.stopPropagation();
-                    event.preventDefault();
-                    
-                    var query = $searchField.val();
-                    
-                    if (event.keyCode === KeyEvent.DOM_VK_ESCAPE) {
-                        query = null;
-                    }
-                    
-                    that._close(query);
-                }
-            })
-            .bind("input", function (event) {
-                // Check the query expression on every input event. This way the user is alerted
-                // to any RegEx syntax errors immediately.
-                _getQueryRegExp($searchField.val());
-            })
-            .blur(function () {
-                that._close(null);
-            })
-            .focus();
-        
-        return this.result.promise();
-    };
-    
-    
     /**
      * @private
      * Hides the Search Results Panel
@@ -541,9 +471,23 @@ define(function (require, exports, module) {
                 $selectedRow = null;
             }
             searchResultsPanel.show();
-        
+
+            if (dialog) {
+                dialog._close();
+                dialog = null;
+            }
         } else {
+
             _hideSearchResults();
+
+            if (dialog) {
+                dialog.getDialogTextField().addClass("no-results")
+                                            .removeAttr("disabled")
+                                            .get(0).select();
+                                            
+                $(".modal-bar .message").css("display", "none");
+                $(".modal-bar .error").css("display", "inline-block").html(Strings.FIND_NO_RESULTS);
+            }
         }
     }
 
@@ -706,8 +650,141 @@ define(function (require, exports, module) {
         }
     }
 
+    /**
+     * @private
+     * Executes the Find in Files search inside the 'currentScope'
+     * @param {string} query String to be searched
+     */
+    function _doSearch(query) {
+        currentQuery     = query;
+        currentQueryExpr = _getQueryRegExp(query);
+        
+        if (!currentQueryExpr) {
+            StatusBar.hideBusyIndicator();
+            dialog._close();
+            dialog = null;
+            return;
+        }
+        FileIndexManager.getFileInfoList("all")
+            .done(function (fileListResult) {
+                Async.doInParallel(fileListResult, function (fileInfo) {
+                    var result = new $.Deferred();
+                    
+                    if (!_inScope(fileInfo, currentScope)) {
+                        result.resolve();
+                    } else {
+                        // Search one file
+                        DocumentManager.getDocumentForPath(fileInfo.fullPath)
+                            .done(function (doc) {
+                                _addSearchMatches(fileInfo.fullPath, doc.getText(), currentQueryExpr);
+                                result.resolve();
+                            })
+                            .fail(function (error) {
+                                // Error reading this file. This is most likely because the file isn't a text file.
+                                // Resolve here so we move on to the next file.
+                                result.resolve();
+                            });
+                    }
+                    return result.promise();
+                })
+                    .done(function () {
+                        // Done searching all files: show results
+                        _showSearchResults();
+                        StatusBar.hideBusyIndicator();
+                        $(DocumentModule).on("documentChange.findInFiles", _documentChangeHandler);
+                    })
+                    .fail(function () {
+                        console.log("find in files failed.");
+                        StatusBar.hideBusyIndicator();
+                    });
+            });
+    }
+    
+    
+    // This dialog class was mostly copied from QuickOpen. We should have a common dialog
+    // class that everyone can use.
+    
+    /**
+     * FindInFilesDialog class
+     * @constructor
+     */
+    function FindInFilesDialog() {
+        this.closed = false;
+    }
+
+    /**
+     * Returns the input text field of the modalbar in the dialog
+     * @return jQuery Object pointing to input text field
+     */
+    FindInFilesDialog.prototype.getDialogTextField = function () {
+        return $("input[type='text']", this.modalBar.getRoot());
+    };
 
 
+    /**
+     * Closes the search dialog and resolves the promise that showDialog returned
+     */
+    FindInFilesDialog.prototype._close = function (value) {
+        if (this.closed) {
+            return;
+        }
+        
+        this.closed = true;
+        this.modalBar.close();
+        EditorManager.focusEditor();
+    };
+    
+    /**
+     * Shows the search dialog
+     * @param {string=} initialString  Default text to prepopulate the search field with
+     * @param {Entry=} scope  Search scope, or null to search whole project
+     * @returns {$.Promise} that is resolved with the string to search for
+     */
+    FindInFilesDialog.prototype.showDialog = function (initialString, scope) {
+        // Note the prefix label is a simple "Find:" - the "in ..." part comes after the text field
+        var templateVars = {
+                value: initialString || "",
+                label: _labelForScope(scope)
+            },
+            dialogHTML = Mustache.render(searchDialogTemplate, $.extend(templateVars, Strings)),
+            that       = this;
+        
+        this.modalBar    = new ModalBar(dialogHTML, false);
+        var $searchField = $("input#searchInput");
+        
+        $searchField.get(0).select();
+        $searchField
+            .bind("keydown", function (event) {
+                if (event.keyCode === KeyEvent.DOM_VK_RETURN || event.keyCode === KeyEvent.DOM_VK_ESCAPE) {  // Enter/Return key or Esc key
+                    event.stopPropagation();
+                    event.preventDefault();
+                    
+                    var query = $searchField.val();
+                    
+                    if (event.keyCode === KeyEvent.DOM_VK_ESCAPE) {
+                        that._close(null);
+                    } else if (event.keyCode === KeyEvent.DOM_VK_RETURN) {
+                        StatusBar.showBusyIndicator(true);
+                        that.getDialogTextField().attr("disabled", "disabled");
+                        _doSearch(query);
+                    }
+                }
+            })
+            .bind("input", function (event) {
+                // Check the query expression on every input event. This way the user is alerted
+                // to any RegEx syntax errors immediately.
+                _getQueryRegExp($searchField.val());
+                that.getDialogTextField().removeClass("no-results");
+            })
+            .blur(function () {
+                if (that.getDialogTextField().attr("disabled")) {
+                    return;
+                }
+                that._close(null);
+            })
+            .focus();
+    };
+
     /**
      * @private
      * Displays a non-modal embedded dialog above the code mirror editor that allows the user to do
@@ -724,61 +801,17 @@ define(function (require, exports, module) {
         
         // Default to searching for the current selection
         var currentEditor = EditorManager.getActiveEditor(),
-            initialString = currentEditor && currentEditor.getSelectedText(),
-            dialog        = new FindInFilesDialog();
+            initialString = currentEditor && currentEditor.getSelectedText();
 
+        dialog             = new FindInFilesDialog();
         searchResults      = {};
         currentStart       = 0;
         currentQuery       = "";
         currentQueryExpr   = null;
         currentScope       = scope;
         maxHitsFoundInFile = false;
                             
-        dialog.showDialog(initialString, scope)
-            .done(function (query) {
-                if (query) {
-                    currentQuery     = query;
-                    currentQueryExpr = _getQueryRegExp(query);
-                    
-                    if (!currentQueryExpr) {
-                        return;
-                    }
-                    StatusBar.showBusyIndicator(true);
-                    FileIndexManager.getFileInfoList("all")
-                        .done(function (fileListResult) {
-                            Async.doInParallel(fileListResult, function (fileInfo) {
-                                var result = new $.Deferred();
-                                
-                                if (!_inScope(fileInfo, scope)) {
-                                    result.resolve();
-                                } else {
-                                    // Search one file
-                                    DocumentManager.getDocumentForPath(fileInfo.fullPath)
-                                        .done(function (doc) {
-                                            _addSearchMatches(fileInfo.fullPath, doc.getText(), currentQueryExpr);
-                                            result.resolve();
-                                        })
-                                        .fail(function (error) {
-                                            // Error reading this file. This is most likely because the file isn't a text file.
-                                            // Resolve here so we move on to the next file.
-                                            result.resolve();
-                                        });
-                                }
-                                return result.promise();
-                            })
-                                .done(function () {
-                                    // Done searching all files: show results
-                                    _showSearchResults();
-                                    StatusBar.hideBusyIndicator();
-                                    $(DocumentModule).on("documentChange.findInFiles", _documentChangeHandler);
-                                })
-                                .fail(function () {
-                                    console.log("find in files failed.");
-                                    StatusBar.hideBusyIndicator();
-                                });
-                        });
-                }
-            });
+        dialog.showDialog(initialString, scope);
     }
     
     /**
