Fix the rest of import silent

lib/less/tree/comment.js

@@ -8,9 +8,12 @@ tree.Comment = function (value, silent, index, currentFileInfo) {
 tree.Comment.prototype = {
     type: "Comment",
     toCSS: function (env) {
-        return (env.compress || (this.currentFileInfo && this.currentFileInfo.silent)) ? '' : this.value;
+        return (env.compress || (this.currentFileInfo && this.currentFileInfo.silent && !this.isNotSilent)) ? '' : this.value;
     },
-    eval: function () { return this; }
+    eval: function () { return this; },
+    markNotSilent: function () {
+        this.isNotSilent = true;
+    }
 };
 
 })(require('../tree'));

lib/less/tree/directive.js

@@ -19,7 +19,7 @@ tree.Directive.prototype = {
     },
     toCSS: function (env) {
 
-        if (this.currentFileInfo.silent) {
+        if (this.currentFileInfo.silent && !this.isNotSilent) {
             return "";
         }
 
@@ -44,7 +44,19 @@ tree.Directive.prototype = {
     },
     variable: function (name) { return tree.Ruleset.prototype.variable.call(this.ruleset, name) },
     find: function () { return tree.Ruleset.prototype.find.apply(this.ruleset, arguments) },
-    rulesets: function () { return tree.Ruleset.prototype.rulesets.apply(this.ruleset) }
+    rulesets: function () { return tree.Ruleset.prototype.rulesets.apply(this.ruleset) },
+    markNotSilent: function () {
+        var rule, i;
+        this.isNotSilent = true;
+        if (this.ruleset) {
+            for (i = 0; i < this.ruleset.rules.length; i++) {
+                rule = this.ruleset.rules[i];
+                if (rule.markNotSilent) {
+                    rule.markNotSilent();
+                }
+            }
+        }
+    }
 };
 
 })(require('../tree'));

lib/less/tree/media.js

@@ -72,6 +72,16 @@ tree.Media.prototype = {
         var el = new(tree.Element)('', '&', 0);
         return [new(tree.Selector)([el], null, this.index, this.currentFileInfo)];
     },
+    markNotSilent: function () {
+        var rule, i;
+        this.isNotSilent = true;
+        for (i = 0; i < this.ruleset.rules.length; i++) {
+            rule = this.ruleset.rules[i];
+            if (rule.markNotSilent) {
+                rule.markNotSilent();
+            }
+        }
+    },
 
     evalTop: function (env) {
         var result = this;

lib/less/tree/mixin.js

@@ -15,7 +15,7 @@ tree.mixin.Call.prototype = {
         this.arguments = visitor.visit(this.arguments);
     },
     eval: function (env) {
-        var mixins, mixin, args, rules = [], match = false, i, m, f, isRecursive, isOneFound;
+        var mixins, mixin, args, rules = [], match = false, i, m, f, isRecursive, isOneFound, rule;
 
         args = this.arguments && this.arguments.map(function (a) {
             return { name: a.name, value: a.value.eval(env) };
@@ -50,8 +50,12 @@ tree.mixin.Call.prototype = {
                 }
                 if (match) {
                     if (!this.currentFileInfo || !this.currentFileInfo.silent) {
-                        //todo tell the rules that they are not silent
-                        // make sure the rules pass that information when eval'd
+                        for (i = 0; i < rules.length; i++) {
+                            rule = rules[i];
+                            if (rule.markNotSilent) {
+                                rule.markNotSilent();
+                            }
+                        }
                     }
                     return rules;
                 }

lib/less/tree/ruleset.js

@@ -278,6 +278,12 @@ tree.Ruleset.prototype = {
         return css.join('')  + (env.compress ? '\n' : '');
     },
 
+    markNotSilent: function () {
+        for (var s = 0; s < this.selectors.length; s++) {
+            this.selectors[s].markNotSilent();
+        }
+    },
+
     joinSelectors: function (paths, context, selectors) {
         for (var s = 0; s < selectors.length; s++) {
             this.joinSelector(paths, context, selectors[s]);

lib/less/tree/selector.js

@@ -1,18 +1,19 @@
 (function (tree) {
 
-tree.Selector = function (elements, extendList, index, currentFileInfo) {
+tree.Selector = function (elements, extendList, index, currentFileInfo, isNotSilent) {
     this.elements = elements;
     this.extendList = extendList || [];
-    this.currentFileInfo = currentFileInfo || {}; // TODO remove
+    this.currentFileInfo = currentFileInfo || {};
+    this.isNotSilent = isNotSilent;
 };
 tree.Selector.prototype = {
     type: "Selector",
     accept: function (visitor) {
         this.elements = visitor.visit(this.elements);
         this.extendList = visitor.visit(this.extendList)
     },
-    createDerived: function(elements) {
-      return new(tree.Selector)(elements, this.extendList, this.index, this.currentFileInfo);
+    createDerived: function(elements, extendList) {
+        return new(tree.Selector)(elements, extendList || this.extendList, this.index, this.currentFileInfo, this.isNotSilent);
     },
     match: function (other) {
         var elements = this.elements,
@@ -36,11 +37,11 @@ tree.Selector.prototype = {
         return true;
     },
     eval: function (env) {
-        return new(tree.Selector)(this.elements.map(function (e) {
+        return this.createDerived(this.elements.map(function (e) {
             return e.eval(env);
         }), this.extendList.map(function(extend) {
             return extend.eval(env);
-        }), this.index, this.currentFileInfo);
+        }));
     },
     toCSS: function (env) {
         if (this._css) { return this._css }
@@ -61,8 +62,11 @@ tree.Selector.prototype = {
 
         return this._css;
     },
+    markNotSilent: function () {
+        this.isNotSilent = true;
+    },
     isSilent: function() {
-        return this.currentFileInfo.silent;
+        return this.currentFileInfo.silent && !this.isNotSilent;
     }
 };
 

test/css/import-silent.css

@@ -37,6 +37,18 @@
 .b .c {
   color: green;
 }
+.b:hover {
+  color: green;
+}
+.b {
+  color: green;
+}
+.b + .b {
+  color: green;
+}
+.b + .b .sub {
+  color: green;
+}
 .y {
   pulled-in: yes;
 }