Merge pull request adobe#11375 from adobe/abose/instant_search

Instant Search.

Author: prafulVaishnav

src/editor/EditorManager.js

@@ -472,7 +472,7 @@ define(function (require, exports, module) {
      * Semi-private: should only be called within this module or by Document.
      * @param {!Document} document  Document whose main/full Editor to create
      * @param {!Pane} pane  Pane in which the editor will be hosted
-     * @param {!Object} editorOptions If specified, contains editor options that 
+     * @param {!Object} editorOptions If specified, contains editor options that
      * can be passed to CodeMirror
      * @return {!Editor}
      */
@@ -533,7 +533,7 @@ define(function (require, exports, module) {
      * Create and/or show the editor for the specified document
      * @param {!Document} document - document to edit
      * @param {!Pane} pane - pane to show it in
-     * @param {!Object} editorOptions - If specified, contains 
+     * @param {!Object} editorOptions - If specified, contains
      * editor options that can be passed to CodeMirror
      * @private
      */
@@ -623,7 +623,7 @@ define(function (require, exports, module) {
      * Opens the specified document in the given pane
      * @param {!Document} doc - the document to open
      * @param {!Pane} pane - the pane to open the document in
-     * @param {!Object} editorOptions - If specified, contains 
+     * @param {!Object} editorOptions - If specified, contains
      * editor options that can be passed to CodeMirror
      * @return {boolean} true if the file can be opened, false if not
      */

src/extensibility/ExtensionManager.js

@@ -276,7 +276,7 @@ define(function (require, exports, module) {
             loadTheme(id);
             exports.trigger("statusChange", id);
         }
-        
+
         function deduceMetadata() {
             var match = path.match(/\/([^\/]+)$/),
                 name = (match && match[1]) || path,
@@ -408,12 +408,12 @@ define(function (require, exports, module) {
         }
         return result.promise();
     }
-    
+
     /**
      * @private
-     * 
+     *
      * Disables or enables the installed extensions.
-     * 
+     *
      * @param {string} id The id of the extension to disable or enable.
      * @param {boolean} enable A boolean indicating whether to enable or disable.
      * @return {$.Promise} A promise that's resolved when the extension action is
@@ -438,21 +438,21 @@ define(function (require, exports, module) {
         }
         return result.promise();
     }
-    
+
     /**
      * Disables the installed extension with the given id.
-     * 
+     *
      * @param {string} id The id of the extension to disable.
      * @return {$.Promise} A promise that's resolved when the extenion is disabled or
      *      rejected with an error that prevented the disabling.
      */
     function disable(id) {
         return _enableOrDisable(id, false);
     }
-    
+
     /**
      * Enables the installed extension with the given id.
-     * 
+     *
      * @param {string} id The id of the extension to enable.
      * @return {$.Promise} A promise that's resolved when the extenion is enabled or
      *      rejected with an error that prevented the enabling.
@@ -514,7 +514,7 @@ define(function (require, exports, module) {
         }
         exports.trigger("statusChange", id);
     }
-    
+
     /**
      * Returns true if an extension is marked for removal.
      * @param {string} id The id of the extension to check.
@@ -523,7 +523,7 @@ define(function (require, exports, module) {
     function isMarkedForRemoval(id) {
         return !!(_idsToRemove[id]);
     }
-    
+
     /**
      * Returns true if there are any extensions marked for removal.
      * @return {boolean} true if there are extensions to remove
@@ -534,7 +534,7 @@ define(function (require, exports, module) {
 
     /**
      * Marks an extension for disabling later, or unmarks an extension previously marked.
-     * 
+     *
      * @param {string} id The id of the extension
      * @param {boolean} mark Whether to mark or unmark the extension.
      */
@@ -549,7 +549,7 @@ define(function (require, exports, module) {
 
     /**
      * Returns true if an extension is mark for disabling.
-     * 
+     *
      * @param {string} id The id of the extension to check.
      * @return {boolean} true if it's been mark for disabling, false otherwise.
      */
@@ -564,7 +564,7 @@ define(function (require, exports, module) {
     function hasExtensionsToDisable() {
         return Object.keys(_idsToDisable).length > 0;
     }
-    
+
     /**
      * Unmarks all the extensions that have been marked for disabling.
      */
@@ -644,14 +644,14 @@ define(function (require, exports, module) {
             }
         );
     }
-    
+
     /**
      * Disables extensions marked for disabling.
-     * 
+     *
      * If the return promise is rejected, the argument will contain an array of objects. Each
      * element is an object identifying the extension failed with "item" property set to the
      * extension id which has failed to be disabled and "error" property set to the error.
-     * 
+     *
      * @return {$.Promise} A promise that's resolved when all extensions marked for disabling are
      *      disabled or rejected if one or more extensions can't be disabled.
      */
@@ -934,4 +934,4 @@ define(function (require, exports, module) {
     exports._getAutoInstallFiles    = _getAutoInstallFiles;
     exports._reset                  = _reset;
     exports._setExtensions          = _setExtensions;
-});
+});

src/extensibility/ExtensionManagerDialog.js

@@ -116,7 +116,7 @@ define(function (require, exports, module) {
                     removeErrors,
                     updateErrors,
                     disableErrors;
-                
+
                 removeExtensionsPromise = ExtensionManager.removeMarkedExtensions()
                     .fail(function (errorArray) {
                         removeErrors = errorArray;
@@ -129,7 +129,7 @@ define(function (require, exports, module) {
                     .fail(function (errorArray) {
                         disableErrors = errorArray;
                     });
-                
+
                 Async.waitForAll([removeExtensionsPromise, updateExtensionsPromise, disableExtensionsPromise], true)
                     .always(function () {
                         dlg.close();
@@ -151,7 +151,7 @@ define(function (require, exports, module) {
                                 CommandManager.execute(Commands.APP_RELOAD);
                             }
                         }
-                        
+
                         if (removeErrors) {
                             removeErrors.forEach(function (errorObj) {
                                 ids.push(errorObj.item);
@@ -162,7 +162,7 @@ define(function (require, exports, module) {
                                 message: StringUtils.format(Strings.EXTENSION_MANAGER_REMOVE_ERROR, ids.join(", "))
                             });
                         }
-                        
+
                         if (updateErrors) {
                             // This error case should be very uncommon.
                             // Just let the user know that we couldn't update
@@ -185,7 +185,7 @@ define(function (require, exports, module) {
                                 message: StringUtils.format(Strings.EXTENSION_MANAGER_UPDATE_ERROR, ids.join(", "))
                             });
                         }
-                        
+
                         if (disableErrors) {
                             ids.length = 0;
                             disableErrors.forEach(function (errorObj) {

src/extensibility/Package.js

@@ -434,7 +434,7 @@ define(function (require, exports, module) {
 
     /**
      * Disables the extension at the given path.
-     * 
+     *
      * @param {string} path The absolute path to the extension to disable.
      * @return {$.Promise} A promise that's resolved when the extenion is disabled, or
      *      rejected if there was an error.
@@ -451,10 +451,10 @@ define(function (require, exports, module) {
         });
         return result.promise();
     }
-    
+
     /**
      * Enables the extension at the given path.
-     * 
+     *
      * @param {string} path The absolute path to the extension to enable.
      * @return {$.Promise} A promise that's resolved when the extenion is enable, or
      *      rejected if there was an error.
@@ -473,7 +473,7 @@ define(function (require, exports, module) {
         });
         return result.promise();
     }
-    
+
     /**
      * Install an extension update located at path.
      * This assumes that the installation was previously attempted

src/extensions/default/DebugCommands/main.js

@@ -87,7 +87,7 @@ define(function (require, exports, module) {
     prefs.definePreference("openPrefsInSplitView",   "boolean", true, {
         description: Strings.DESCRIPTION_OPEN_PREFS_IN_SPLIT_VIEW
     });
-    
+
     prefs.definePreference("openUserPrefsInSecondPane",   "boolean", true, {
         description: Strings.DESCRIPTION_OPEN_USER_PREFS_IN_SECOND_PANE
     });
@@ -285,7 +285,7 @@ define(function (require, exports, module) {
             defaultPrefsFile   = FileSystem.getFileForPath(defaultPrefsPath),
             DEFAULT_PREFS_PANE = "first-pane",
             USER_PREFS_PANE    = "second-pane";
-        
+
         // Exchange the panes, if default preferences need to be opened
         // in the right pane.
         if (!prefs.get("openUserPrefsInSecondPane")) {

src/extensions/default/InlineTimingFunctionEditor/unittests.js

@@ -165,7 +165,7 @@ define(function (require, exports, module) {
                 expect(match[0]).toEqual("ease-in-out");
                 expect(match.originalString).toBeFalsy();
             });
-            
+
             it("should match linear function in declaration in strict mode", function () {
                 match = TimingFunctionUtils.timingFunctionMatch("transition-timing-function: linear;", false);
                 expect(match.length).toEqual(1);

src/extensions/default/PrefsCodeHints/main.js

@@ -55,7 +55,7 @@ define(function (require, exports, module) {
             description: Strings.DESCRIPTION_PATH
         }
     };
-    
+
     var stringMatcherOptions = {
         preferPrefixMatches: true
     };

src/filesystem/FileSystemEntry.js

@@ -440,12 +440,13 @@ define(function (require, exports, module) {
      * @param {function(FileSystemEntry): boolean} visitor - A visitor function, which is
      *      applied to descendent FileSystemEntry objects. If the function returns false for
      *      a particular Directory entry, that directory's descendents will not be visited.
-     * @param {{maxDepth: number, maxEntriesCounter: {value: number}}} options
+     * @param {{maxDepth: number, maxEntriesCounter: {value: number}, sortList: boolean}} options
      * @param {function(?string)=} callback Callback with single FileSystemError string parameter.
      */
     FileSystemEntry.prototype._visitHelper = function (stats, visitedPaths, visitor, options, callback) {
         var maxDepth = options.maxDepth,
-            maxEntriesCounter = options.maxEntriesCounter;
+            maxEntriesCounter = options.maxEntriesCounter,
+            sortList = options.sortList;
 
         if (maxEntriesCounter.value-- <= 0 || maxDepth-- < 0) {
             // The outer FileSystemEntry.visit call is responsible for applying
@@ -491,13 +492,30 @@ define(function (require, exports, module) {
 
             var nextOptions = {
                 maxDepth: maxDepth,
-                maxEntriesCounter: maxEntriesCounter
+                maxEntriesCounter: maxEntriesCounter,
+                sortList : sortList
             };
 
-            entries.forEach(function (entry, index) {
-                var stats = entriesStats[index];
-                entry._visitHelper(stats, visitedPaths, visitor, nextOptions, helperCallback);
-            });
+            //sort entries if required
+            function compareFilesWithIndices(index1, index2) {
+                return entries[index1]._name.toLocaleLowerCase().localeCompare(entries[index2]._name.toLocaleLowerCase());
+            }
+            if (sortList) {
+                var fileIndexes = [], i = 0;
+                for (i = 0; i < entries.length; i++) {
+                    fileIndexes[i] = i;
+                }
+                fileIndexes.sort(compareFilesWithIndices);
+                fileIndexes.forEach(function (fileIndex) {
+                    var stats = entriesStats[fileIndexes[fileIndex]];
+                    entries[fileIndexes[fileIndex]]._visitHelper(stats, visitedPaths, visitor, nextOptions, helperCallback);
+                });
+            } else {
+                entries.forEach(function (entry, index) {
+                    var stats = entriesStats[index];
+                    entry._visitHelper(stats, visitedPaths, visitor, nextOptions, helperCallback);
+                });
+            }
         }.bind(this));
     };
 

src/htmlContent/findreplace-bar.html

@@ -29,4 +29,8 @@
     </div>
     <!-- For Find in Files, the filter picker will be added here programmatically. -->
 </div>
+<div id="indexing-spinner" class="indexing-group forced-hidden">
+    <div class="spinner inline spin"></div>
+    <div class="indexing-message">{{Strings.FIND_IN_FILES_INDEXING}}</div>
+</div>
 {{/multifile}}

src/htmlContent/main-view.html

@@ -107,4 +107,4 @@
     <div id="codehint-menu-bar">
         <ul data-dropdown="dropdown"></ul>
     </div>
-    <div id="hidden-editors"></div>
+    <div id="hidden-editors"></div>