Merge pull request #1468 from mgreter/bugfix/is-printable-comment

Fix `isPrintable` function for comment nodes

Author: xzyfer

src/ast.cpp

@@ -1297,6 +1297,20 @@ namespace Sass {
     }
   }
 
+  bool Ruleset::is_invisible() const {
+    Selector_List* sl = static_cast<Selector_List*>(selector());
+    for (size_t i = 0, L = sl->length(); i < L; ++i)
+      if (!(*sl)[i]->has_placeholder()) return false;
+    return true;
+  }
+
+  bool Media_Block::is_invisible() const {
+    for (size_t i = 0, L = block()->length(); i < L; ++i) {
+      if (!(*block())[i]->is_invisible()) return false;
+    }
+    return true;
+  }
+
   Number::Number(ParserState pstate, double val, std::string u, bool zero)
   : Value(pstate),
     value_(val),

src/ast.hpp

@@ -434,12 +434,7 @@ namespace Sass {
     { statement_type(MEDIA); }
     bool bubbles() { return true; }
     bool is_hoistable() { return true; }
-    bool is_invisible() const {
-      bool is_invisible = true;
-      for (size_t i = 0, L = block()->length(); i < L && is_invisible; i++)
-        is_invisible &= (*block())[i]->is_invisible();
-      return is_invisible;
-    }
+    bool is_invisible() const;
     ATTACH_OPERATIONS()
   };
 
@@ -592,6 +587,8 @@ namespace Sass {
     Comment(ParserState pstate, String* txt, bool is_important)
     : Statement(pstate), text_(txt), is_important_(is_important)
     { statement_type(COMMENT); }
+    virtual bool is_invisible() const
+    { return is_important() == false; }
     ATTACH_OPERATIONS()
   };
 
@@ -2262,15 +2259,6 @@ namespace Sass {
     ATTACH_OPERATIONS()
   };
 
-  inline bool Ruleset::is_invisible() const {
-    bool is_invisible = true;
-    Selector_List* sl = static_cast<Selector_List*>(selector());
-    for (size_t i = 0, L = sl->length(); i < L && is_invisible; ++i)
-      is_invisible &= (*sl)[i]->has_placeholder();
-    return is_invisible;
-  }
-
-
   template<typename SelectorType>
   bool selectors_equal(const SelectorType& one, const SelectorType& two, bool simpleSelectorOrderDependent) {
     // Test for equality among selectors while differentiating between checks that demand the underlying Simple_Selector

src/util.cpp

@@ -545,11 +545,14 @@ namespace Sass {
             hasPrintableChildBlocks = true;
           }
         } else if (Comment* c = dynamic_cast<Comment*>(stm)) {
-          if (style == COMPRESSED) {
-            hasDeclarations = c->is_important();
-          } else {
+          // keep for uncompressed
+          if (style != COMPRESSED) {
             hasDeclarations = true;
           }
+          // output style compressed
+          if (c->is_important()) {
+            hasDeclarations = c->is_important();
+          }
         } else if (Declaration* d = dynamic_cast<Declaration*>(stm)) {
           return isPrintable(d, style);
         } else {
@@ -646,7 +649,15 @@ namespace Sass {
           return true;
         }
         else if (typeid(*stm) == typeid(Comment)) {
-
+          Comment* c = (Comment*) stm;
+          // keep for uncompressed
+          if (style != COMPRESSED) {
+            return true;
+          }
+          // output style compressed
+          if (c->is_important()) {
+            return true;
+          }
         }
         else if (typeid(*stm) == typeid(Ruleset)) {
           Ruleset* r = (Ruleset*) stm;