Merge pull request #269 from atom-community/ignoreglob-by-project

Author: aminya

lib/paths-cache.js

@@ -23,7 +23,7 @@ export default class PathsCache extends EventEmitter {
     this._filePathsByProjectDirectory = new Map()
     this._filePathsByDirectory = new Map()
     this._fileWatchersByDirectory = new Map()
-    this._allIgnoredGlob = []
+    this._allIgnoredGlobByDirectory = new Map()
     this.updateConfig()
   }
 
@@ -175,14 +175,17 @@ export default class PathsCache extends EventEmitter {
     }
     // add a watcher to run `this._onDirectoryChanged`
     const projectPath = projectDirectory.getPath()
-    const ignored = this._allIgnoredGlob
+    const ignored = this._allIgnoredGlobByDirectory.get(projectDirectory.path)
     // TODO smarter handling of directory changes
     // TODO get paths from the watcher itself
     // TODO track gitignore file
     watcher = chokidar
       .watch([projectPath, ...ignored], {
         persistent: true,
         ignoreInitial: true, // do not run the listeners on the initial scan
+        followSymlinks: false,
+        interval: 1000,
+        binaryInterval: 1000,
       })
       .on("add", (addedFile) => {
         // we should track it too!
@@ -198,7 +201,7 @@ export default class PathsCache extends EventEmitter {
         this.onRemoveFile(projectDirectory, removedFile)
       })
       .on("addDir", (addedDir) => {
-        this.onAddDir(projectDirectory, addedDir)
+        this.onAddDir(addedDir)
       })
       .on("unlinkDir", (removedDir) => {
         this.onRemoveDir(projectDirectory, removedDir)
@@ -231,10 +234,9 @@ export default class PathsCache extends EventEmitter {
   }
 
   /**
-   * @param projectDirectory {Directory}
    * @param addedDir {string}
    */
-  async onAddDir(projectDirectory, addedDir) {
+  async onAddDir(addedDir) {
     await this._cachePathsForDirectoryWithGlob(addedDir)
   }
 
@@ -484,9 +486,10 @@ export default class PathsCache extends EventEmitter {
    */
   async _cachePathsForDirectoryWithGlob(directoryPath) {
     const directoryGlob = globifyDirectory(directoryPath)
-    this._allIgnoredGlob = await this._getAllIgnoredGlob(directoryPath)
+    const allIgnoredGlob = await this._getAllIgnoredGlob(directoryPath)
+    this._allIgnoredGlobByDirectory.set(directoryPath, allIgnoredGlob)
     const files = await glob(
-      [directoryGlob, ...this._allIgnoredGlob],
+      [directoryGlob, ...allIgnoredGlob],
       // glob options
       {
         dot: true,