Merge pull request #4442 from shevchuk/hide-zipped-from-quick-open-re…

…view-1 Exclude certain known binary files types from FileIndexManager (and thus Quick Open, Find in Files, etc.)
adobe · Jul 22, 2013 · 12bbef8 · 12bbef8
2 parents 34556da + e205fe5
commit 12bbef8
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 2 deletions.
diff --git a/src/project/FileIndexManager.js b/src/project/FileIndexManager.js
@@ -147,8 +147,14 @@ define(function (require, exports, module) {
         if (!ProjectManager.shouldShow(entry)) {
             return;
         }
-
+        
         var fileInfo = new FileInfo(entry);
+
+        // skip zipped/binary files
+        if (ProjectManager.isBinaryFile(fileInfo.name)) {
+            return;
+        }
+
         //console.log(entry.name);
 
         CollectionUtils.forEach(_indexList, function (index, indexName) {

diff --git a/src/project/ProjectManager.js b/src/project/ProjectManager.js
@@ -80,6 +80,13 @@ define(function (require, exports, module) {
      */
     var _exclusionListRegEx = /\.pyc$|^\.git$|^\.gitignore$|^\.gitmodules$|^\.svn$|^\.DS_Store$|^Thumbs\.db$|^\.hg$|^CVS$|^\.cvsignore$|^\.gitattributes$|^\.hgtags$|^\.hgignore$/;
 
+    /**
+     * @private
+     * File names which are not showed in quick open dialog
+     * @type {RegExp}
+     */
+    var _binaryExclusionListRegEx = /\.svgz$|\.jsz$|\.zip$|\.gz$|\.htmz$|\.htmlz$|\.rar$|\.tar$|\.exe$|\.bin$/;
+
     /**
      * @private
      * Reference to the tree control container div. Initialized by
@@ -637,6 +644,15 @@ define(function (require, exports, module) {
     function shouldShow(entry) {
         return !entry.name.match(_exclusionListRegEx);
     }
+
+    /**
+     * Returns true if fileName's extension doesn't belong to binary (e.g. archived)
+     * @param {string} fileName
+     * @return {boolean}
+     */
+    function isBinaryFile(fileName) {
+        return fileName.match(_binaryExclusionListRegEx);
+    }
 
     /**
      * @private
@@ -1559,6 +1575,7 @@ define(function (require, exports, module) {
     exports.isWithinProject          = isWithinProject;
     exports.makeProjectRelativeIfPossible = makeProjectRelativeIfPossible;
     exports.shouldShow               = shouldShow;
+    exports.isBinaryFile             = isBinaryFile;
     exports.openProject              = openProject;
     exports.getSelectedItem          = getSelectedItem;
     exports.getInitialProjectPath    = getInitialProjectPath;

diff --git a/src/search/QuickOpen.js b/src/search/QuickOpen.js
@@ -502,7 +502,10 @@ define(function (require, exports, module) {
         var filteredList = $.map(fileList, function (fileInfo) {
             // Is it a match at all?
             // match query against the full path (with gaps between query characters allowed)
-            var searchResult = matcher.match(ProjectManager.makeProjectRelativeIfPossible(fileInfo.fullPath), query);
+            var searchResult;
+
+            searchResult = matcher.match(ProjectManager.makeProjectRelativeIfPossible(fileInfo.fullPath), query);
+
             if (searchResult) {
                 searchResult.label = fileInfo.name;
                 searchResult.fullPath = fileInfo.fullPath;