Do not emit 'match' events for ignored items

Fix #194
isaacs · Jul 2, 2015 · f5878af · f5878af
1 parent 9439afd
commit f5878af
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/glob.js b/glob.js
@@ -57,6 +57,7 @@ var ownProp = common.ownProp
 var inflight = require('inflight')
 var util = require('util')
 var childrenIgnored = common.childrenIgnored
+var isIgnored = common.isIgnored
 
 var once = require('once')
 
@@ -432,6 +433,9 @@ Glob.prototype._emitMatch = function (index, e) {
   if (this.matches[index][e])
     return
 
+  if (isIgnored(this, e))
+    return
+
   if (this.paused) {
     this._emitQueue.push([index, e])
     return

diff --git a/test/ignore.js b/test/ignore.js
@@ -44,6 +44,8 @@ cases.forEach(function (c, i) {
   if (cwd)
     name += ' cwd=' + cwd
 
+  var matches = []
+
   var opt = { ignore: ignore }
   if (cwd)
     opt.cwd = cwd
@@ -53,9 +55,12 @@ cases.forEach(function (c, i) {
       if (er)
         throw er
       t.same(res.sort(), expect, 'async')
+      t.same(matches.sort(), expect, 'match events')
       res = glob.sync(pattern, opt)
       t.same(res.sort(), expect, 'sync')
       t.end()
+    }).on('match', function (p) {
+      matches.push(p)
     })
   })
 })