Fix issue with compressed output mode

sass · Mar 4, 2021 · 64b1fc3 · 64b1fc3
1 parent dc92cb3
commit 64b1fc3
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 11 deletions.
diff --git a/include/sass/values.h b/include/sass/values.h
@@ -39,7 +39,6 @@ extern "C" {
     SASS_ERROR,
     SASS_WARNING,
     SASS_FUNCTION,
-    SASS_PARENT,
   };
 
   // List separators

diff --git a/src/emitter.cpp b/src/emitter.cpp
@@ -73,7 +73,7 @@ namespace Sass {
   // add outstanding delimiter
   void Emitter::finalize(bool final)
   {
-    scheduled_space = 0;
+    scheduled_space = false;
     if (output_style() == SASS_STYLE_COMPRESSED)
       if (final) scheduled_delimiter = false;
     if (scheduled_linefeed)
@@ -90,8 +90,8 @@ namespace Sass {
 
       for (size_t i = 0; i < scheduled_linefeed; i++)
         linefeeds += opt.linefeed;
-      scheduled_space = 0;
-      scheduled_linefeed = 0;
+      scheduled_space = false;
+      scheduled_linefeed = false;
       if (scheduled_delimiter) {
         scheduled_delimiter = false;
         write_char(';');
@@ -101,7 +101,7 @@ namespace Sass {
     }
     else if (scheduled_space) {
       sass::string spaces(scheduled_space, ' ');
-      scheduled_space = 0;
+      scheduled_space = false;
       if (scheduled_delimiter) {
         scheduled_delimiter = false;
         write_char(';');
@@ -249,21 +249,29 @@ namespace Sass {
 
   void Emitter::append_comma_separator()
   {
-    // scheduled_space = 0;
+    scheduled_space = false;
     append_char(',');
     append_optional_space();
   }
 
   void Emitter::append_colon_separator()
   {
-    scheduled_space = 0;
+    scheduled_space = false;
     append_char(':');
     if (!in_custom_property) append_optional_space();
   }
 
   void Emitter::append_mandatory_space()
   {
-    scheduled_space = 1;
+    if (buffer().empty()) {
+      scheduled_space = true;
+    }
+    else {
+      unsigned char lst = buffer().at(buffer().length() - 1);
+      if (!isspace(lst)) {
+        scheduled_space = true;
+      }
+    }
   }
 
   void Emitter::append_optional_space()

diff --git a/src/inspect.cpp b/src/inspect.cpp
@@ -140,7 +140,7 @@ namespace Sass {
         if (iL == i + 1) break;
         next = text[i+1];
         if (isHex(next) || next == $space || next == $tab) {
-          append_char($space);
+          append_mandatory_space();
         }
         break;
       case $backslash:
@@ -391,7 +391,7 @@ namespace Sass {
       append_mandatory_space();
       for (CssMediaQueryObj query : import->media()) {
         if (first == false) {
-          append_char($comma);
+          append_comma_separator();
           append_optional_space();
         }
         acceptCssMediaQuery(query);
@@ -488,7 +488,7 @@ namespace Sass {
       append_optional_linefeed();
     }
     for (SelectorComponentObj& item : complex->elements()) {
-      if (many) append_optional_space();
+      if (many) append_mandatory_space();
       if (SelectorCombinator* combinator = item->isaSelectorCombinator()) {
         visitSelectorCombinator(combinator);
       }