remove dead code, minor re-org

micromatch · Apr 21, 2017 · e894de1 · e894de1
1 parent 75c0628
commit e894de1
Showing 1 changed file with 16 additions and 16 deletions.
diff --git a/lib/compilers.js b/lib/compilers.js
@@ -5,6 +5,7 @@ var extglob = require('extglob');
 
 module.exports = function(snapdragon) {
   var compilers = snapdragon.compiler.compilers;
+  var opts = snapdragon.options;
 
   snapdragon.state = snapdragon.state || {};
 
@@ -22,8 +23,8 @@ module.exports = function(snapdragon) {
   var dot = compilers.dot;
   var eos = compilers.eos;
 
-  // register extglob compilers
-  if (snapdragon.options.noext === true) {
+  // register extglob compilers or escape exglobs if disabled
+  if (opts.extglob === false || opts.noext === true) {
     snapdragon.compiler.use(escapeExtglobs);
   } else {
     snapdragon.use(extglob.compilers);
@@ -49,13 +50,6 @@ module.exports = function(snapdragon) {
 
     // customize end-of-string compiler
     .set('eos', function(node) {
-      if (this.ast.input.slice(-1) !== '/' && this.output.slice(-1) !== '/') {
-        var suffix = /(\w|\/\])$/.test(this.output) ? '\\/?' : '(\\/|$)';
-        var len = suffix.length;
-        if (snapdragon.state.metachar && this.output.slice(-len) !== suffix) {
-          this.output += suffix;
-        }
-      }
       if (typeof eos === 'function') {
         return eos.apply(this, arguments);
       }
@@ -72,17 +66,23 @@ function escapeExtglobs(compiler) {
     return this.emit(val, node);
   });
 
+  /**
+   * Visit `node` with the given `fn`
+   */
+
   function visit(node, fn) {
-    if (node.nodes) {
-      mapVisit(node.nodes, fn);
-    } else {
-      fn(node);
-    }
+    return node.nodes ? mapVisit(node.nodes, fn) : fn(node);
   }
 
+  /**
+   * Map visit over array of `nodes`.
+   */
+
   function mapVisit(nodes, fn) {
-    for (var i = 0; i < nodes.length; i++) {
-      visit(nodes[i], fn);
+    var len = nodes.length;
+    var idx = -1;
+    while (++idx < len) {
+      visit(nodes[idx], fn);
     }
   }
 }