pass exclusionGlob to WatchedRoot

Author: zaggino

src/filesystem/FileSystem.js

@@ -852,17 +852,17 @@ define(function (require, exports, module) {
      * @param {function(string): boolean} filter - Returns true if a particular item should
      *      be watched, given its name (not full path). Items that are ignored are also
      *      filtered from Directory.getContents() results within this subtree.
-     * @param {string} nodeFilter - anymatch compatible definition for filtering out events
+     * @param {string} globFilter - glob compatible string definition for filtering out events
      *      on the node side.
      * @param {function(?string)=} callback - A function that is called when the watch has
      *      completed. If the watch fails, the function will have a non-null FileSystemError
      *      string parametr.
      */
-    FileSystem.prototype.watch = function (entry, filter, nodeFilter, callback) {
-        // make nodeFilter an optional argument
-        if (typeof nodeFilter === "function" && typeof callback !== "function") {
-            callback = nodeFilter;
-            nodeFilter = null;
+    FileSystem.prototype.watch = function (entry, filter, globFilter, callback) {
+        // make globFilter an optional argument
+        if (typeof globFilter === "function" && typeof callback !== "function") {
+            callback = globFilter;
+            globFilter = null;
         }
 
         var fullPath = entry.fullPath;
@@ -891,7 +891,7 @@ define(function (require, exports, module) {
             return;
         }
 
-        var watchedRoot = new WatchedRoot(entry, filter, nodeFilter);
+        var watchedRoot = new WatchedRoot(entry, filter, globFilter);
 
         this._watchedRoots[fullPath] = watchedRoot;
 

src/filesystem/WatchedRoot.js

@@ -37,12 +37,12 @@ define(function (require, exports, module) {
      * @constructor
      * @param {File|Directory} entry
      * @param {function(string, string):boolean} filter
-     * @param {string} nodeFilter
+     * @param {string} globFilter
      */
-    function WatchedRoot(entry, filter, nodeFilter) {
+    function WatchedRoot(entry, filter, globFilter) {
         this.entry = entry;
         this.filter = filter;
-        this.nodeFilter = nodeFilter;
+        this.globFilter = globFilter;
     }
 
     // Status constants
@@ -63,7 +63,7 @@ define(function (require, exports, module) {
     /**
      * @type {string}
      */
-    WatchedRoot.prototype.nodeFilter = null;
+    WatchedRoot.prototype.globFilter = null;
 
     /**
      * @type {number}

src/project/ProjectManager.js

@@ -738,7 +738,7 @@ define(function (require, exports, module) {
         FileSystem.on("change", _fileSystemChange);
         FileSystem.on("rename", _fileSystemRename);
 
-        FileSystem.watch(FileSystem.getDirectoryForPath(rootPath), ProjectModel._shouldShowName, function (err) {
+        FileSystem.watch(FileSystem.getDirectoryForPath(rootPath), ProjectModel._shouldShowName, ProjectModel.exclusionGlob, function (err) {
             if (err === FileSystemError.TOO_MANY_ENTRIES) {
                 if (!_projectWarnedForTooManyFiles) {
                     _showErrorDialog(ERR_TYPE_MAX_FILES);

src/project/ProjectModel.js

@@ -58,6 +58,13 @@ define(function (require, exports, module) {
      */
     var _exclusionListRegEx = /\.pyc$|^\.git$|^\.gitmodules$|^\.svn$|^\.DS_Store$|^Thumbs\.db$|^\.hg$|^CVS$|^\.hgtags$|^\.idea$|^\.c9revisions$|^\.SyncArchive$|^\.SyncID$|^\.SyncIgnore$|\~$/;
 
+    /**
+     * @public
+     * Anymatch definition of files and folders that should be excluded directly
+     * node domain watching with chokidar
+     */
+    var exclusionGlob = ".git";
+
     /**
      * @private
      * A string containing all invalid characters for a specific platform.
@@ -1353,6 +1360,7 @@ define(function (require, exports, module) {
     exports._invalidChars           = _invalidChars;
 
     exports.shouldShow              = shouldShow;
+    exports.exclusionGlob           = exclusionGlob;
     exports.isValidFilename         = isValidFilename;
     exports.EVENT_CHANGE            = EVENT_CHANGE;
     exports.EVENT_SHOULD_SELECT     = EVENT_SHOULD_SELECT;