Merge pull request #2502 from mgreter/bugfix/issue-2232

Do not compress colors in selectors

Author: mgreter

src/eval.cpp

@@ -1804,8 +1804,10 @@ namespace Sass {
   {
     LOCAL_FLAG(is_in_selector_schema, true);
     // the parser will look for a brace to end the selector
+    ctx.c_options.in_selector = true; // do not compress colors
     Expression_Obj sel = s->contents()->perform(this);
     std::string result_str(sel->to_string(ctx.c_options));
+    ctx.c_options.in_selector = false; // flag temporary only
     result_str = unquote(Util::rtrim(result_str));
     char* temp_cstr = sass_copy_c_string(result_str.c_str());
     ctx.strings.push_back(temp_cstr); // attach to context

src/inspect.cpp

@@ -42,7 +42,9 @@ namespace Sass {
   void Inspect::operator()(Ruleset_Ptr ruleset)
   {
     if (ruleset->selector()) {
+      opt.in_selector = true;
       ruleset->selector()->perform(this);
+      opt.in_selector = false;
     }
     if (ruleset->block()) {
       ruleset->block()->perform(this);
@@ -622,6 +624,11 @@ namespace Sass {
     // maybe an unknown token
     std::string name = c->disp();
 
+    if (opt.in_selector && name != "") {
+      append_token(name, c);
+      return;
+    }
+
     // resolved color
     std::string res_name = name;
 
@@ -909,7 +916,9 @@ namespace Sass {
 
   void Inspect::operator()(Selector_Schema_Ptr s)
   {
+    opt.in_selector = true;
     s->contents()->perform(this);
+    opt.in_selector = false;
   }
 
   void Inspect::operator()(Parent_Selector_Ptr p)

src/sass.hpp

@@ -90,10 +90,13 @@ struct Sass_Inspect_Options {
   // Precision for fractional numbers
   int precision;
 
+  // Do not compress colors in selectors
+  bool in_selector;
+
   // initialization list (constructor with defaults)
   Sass_Inspect_Options(Sass_Output_Style style = Sass::NESTED,
-                       int precision = 5)
-  : output_style(style), precision(precision)
+                       int precision = 5, bool in_selector = false)
+  : output_style(style), precision(precision), in_selector(in_selector)
   { }
 
 };