Merge pull request #1981 from mgreter/bugfix/issue_1889

Fix `isPrintable` functions for comments

Author: mgreter

src/ast.hpp

@@ -660,7 +660,7 @@ namespace Sass {
     : Statement(pstate), text_(txt), is_important_(is_important)
     { statement_type(COMMENT); }
     virtual bool is_invisible() const
-    { return is_important() == false; }
+    { return /* is_important() == */ false; }
     ATTACH_OPERATIONS()
   };
 

src/parser.cpp

@@ -1773,6 +1773,7 @@ namespace Sass {
       prefix = std::string(lexed);
     }
 
+    lex < optional_spaces >();
     String* url_string = parse_url_function_argument();
 
     std::string suffix("");
@@ -1806,7 +1807,6 @@ namespace Sass {
       uri = lexed.to_string();
     }
 
-    lex < css_whitespace >();
     if (peek< exactly< hash_lbrace > >()) {
       const char* pp = position;
       // TODO: error checking for unclosed interpolants

src/util.cpp

@@ -566,14 +566,52 @@ namespace Sass {
       for (size_t i = 0, L = b->length(); i < L; ++i) {
         Statement* stm = (*b)[i];
         if (typeid(*stm) == typeid(At_Rule)) return true;
-        if (typeid(*stm) == typeid(Declaration)) return true;
-        if (Has_Block* child = dynamic_cast<Has_Block*>(stm)) {
-          if (isPrintable(child->block(), style)) return true;
+        else if (typeid(*stm) == typeid(Declaration)) return true;
+        else if (typeid(*stm) == typeid(Comment)) {
+          Comment* c = (Comment*) stm;
+          if (isPrintable(c, style)) {
+            return true;
+          }
+        }
+        else if (typeid(*stm) == typeid(Ruleset)) {
+          Ruleset* r = (Ruleset*) stm;
+          if (isPrintable(r, style)) {
+            return true;
+          }
+        }
+        else if (typeid(*stm) == typeid(Supports_Block)) {
+          Supports_Block* f = (Supports_Block*) stm;
+          if (isPrintable(f, style)) {
+            return true;
+          }
+        }
+        else if (typeid(*stm) == typeid(Media_Block)) {
+          Media_Block* m = (Media_Block*) stm;
+          if (isPrintable(m, style)) {
+            return true;
+          }
+        }
+        else if (dynamic_cast<Has_Block*>(stm) && isPrintable(((Has_Block*)stm)->block(), style)) {
+          return true;
         }
       }
       return false;
     }
 
+    bool isPrintable(Comment* c, Sass_Output_Style style)
+    {
+      // keep for uncompressed
+      if (style != COMPRESSED) {
+        return true;
+      }
+      // output style compressed
+      if (c->is_important()) {
+        return true;
+      }
+      // not printable
+      return false;
+    };
+
     bool isPrintable(Block* b, Sass_Output_Style style) {
       if (b == NULL) {
         return false;
@@ -586,12 +624,7 @@ namespace Sass {
         }
         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()) {
+          if (isPrintable(c, style)) {
             return true;
           }
         }

src/util.hpp

@@ -46,6 +46,7 @@ namespace Sass {
     bool isPrintable(Ruleset* r, Sass_Output_Style style = NESTED);
     bool isPrintable(Supports_Block* r, Sass_Output_Style style = NESTED);
     bool isPrintable(Media_Block* r, Sass_Output_Style style = NESTED);
+    bool isPrintable(Comment* b, Sass_Output_Style style = NESTED);
     bool isPrintable(Block* b, Sass_Output_Style style = NESTED);
     bool isPrintable(String_Constant* s, Sass_Output_Style style = NESTED);
     bool isPrintable(String_Quoted* s, Sass_Output_Style style = NESTED);