Merge pull request #3783 from dschaffe/dschaffe/MaxIndexFileShowOnce

peterflynn · peterflynn · commit 2ddcf52d490c · 2013-05-16T10:34:05.000-07:00
Fix for #3773: Only show 'Indexing Max Files Exceeded' dialog once per project
diff --git a/src/project/FileIndexManager.js b/src/project/FileIndexManager.js
@@ -58,6 +58,13 @@ define(function (require, exports, module) {
      */
     var _indexListDirty = true;
 
+    /**
+     * Store whether the index manager has exceeded the limit so the warning dialog only
+     * appears once.
+     * @type {boolean}
+     */
+    var _maxFileDialogDisplayed = false;
+
     /** class FileIndex
      *
      * A FileIndex contains an array of fileInfos that meet the criteria specified by
@@ -218,7 +225,13 @@ define(function (require, exports, module) {
                         if (state.fileCount > 10000) {
                             if (!state.maxFilesHit) {
                                 state.maxFilesHit = true;
-                                _showMaxFilesDialog();
+                                if (!_maxFileDialogDisplayed) {
+                                    _showMaxFilesDialog();
+                                    _maxFileDialogDisplayed = true;
+                                } else {
+                                    console.warn("The maximum number of files have been indexed. Actions " +
+                                                 "that lookup files in the index may function incorrectly.");
+                                }
                             }
                             return;
                         }
@@ -231,7 +244,6 @@ define(function (require, exports, module) {
                             _scanDirectoryRecurse(entry);
                         }
                     });
-
                     _finishDirScan(dirEntry);
                 },
                 // error callback
@@ -397,11 +409,20 @@ define(function (require, exports, module) {
             return PathUtils.filenameExtension(filename) === ".css";
         }
     );
-    
-    $(ProjectManager).on("projectOpen projectFilesChange", function (event, projectRoot) {
+
+    /**
+     * When a new project is opened set the flag for index exceeding maximum
+     * warning back to false. 
+     */
+    $(ProjectManager).on("projectOpen", function (event, projectRoot) {
+        _maxFileDialogDisplayed = false;
         markDirty();
     });
     
+    $(ProjectManager).on("projectFilesChange", function (event, projectRoot) {
+        markDirty();
+    });
+
     PerfUtils.createPerfMeasurement("FILE_INDEX_MANAGER_SYNC", "syncFileIndex");
 
     exports.markDirty = markDirty;
diff --git a/src/project/ProjectManager.js b/src/project/ProjectManager.js
@@ -576,7 +576,7 @@ define(function (require, exports, module) {
      * @return boolean true if the file should be displayed
      */
     function shouldShow(entry) {
-        if ([".git", ".gitignore", ".gitmodules", ".svn", ".DS_Store", "Thumbs.db"].indexOf(entry.name) > -1) {
+        if ([".git", ".gitignore", ".gitmodules", ".svn", ".DS_Store", "Thumbs.db", ".hg"].indexOf(entry.name) > -1) {
             return false;
         }
         var extension = entry.name.split('.').pop();

Original file line number	Diff line number	Diff line change
`@@ -576,7 +576,7 @@ define(function (require, exports, module) {`
`576`	`576`	`* @return boolean true if the file should be displayed`
`577`	`577`	`*/`
`578`	`578`	`function shouldShow(entry) {`
`579`		`- if ([".git", ".gitignore", ".gitmodules", ".svn", ".DS_Store", "Thumbs.db"].indexOf(entry.name) > -1) {`
	`579`	`+ if ([".git", ".gitignore", ".gitmodules", ".svn", ".DS_Store", "Thumbs.db", ".hg"].indexOf(entry.name) > -1) {`
`580`	`580`	`return false;`
`581`	`581`	`}`
`582`	`582`	`var extension = entry.name.split('.').pop();`