Additional fixes for further regressions

Author: mgreter

ast.cpp

@@ -577,7 +577,7 @@ namespace Sass {
     // create a new complex selector to return a processed copy
     return this;
     Complex_Selector* ss = new (ctx.mem) Complex_Selector(this->pstate());
-    ss->has_line_feed(this->has_line_feed());
+    //ss->has_line_feed(this->has_line_feed());
     ss->combinator(this->combinator());
     if (this->tail()) {
       ss->tail(this->tail()->parentize(ctx));
@@ -624,7 +624,7 @@ namespace Sass {
     Compound_Selector* head = this->head();
     // create a new complex selector to return a processed copy
     Complex_Selector* ss = new (ctx.mem) Complex_Selector(pstate());
-    ss->has_line_feed(has_line_feed());
+    // ss->has_line_feed(has_line_feed());
     ss->has_line_break(has_line_break());
 
     // Points to last complex selector
@@ -749,9 +749,9 @@ namespace Sass {
       if ((*this)[i]->combinator() != Complex_Selector::ANCESTOR_OF) continue;
       if ((*this)[i]->head()->is_empty_reference()) {
         Complex_Selector* tail = (*this)[i]->tail();
-        if ((*this)[i]->has_line_feed()) {
-          if (tail) tail->has_line_feed(true);
-        }
+        // if ((*this)[i]->has_line_feed()) {
+          // if (tail) tail->has_line_feed(true);
+        // }
         (*this)[i] = tail;
       }
     }

eval.cpp

@@ -1447,7 +1447,7 @@ namespace Sass {
                 lst->combinator(combinator);
               }
             }
-            if (s->has_line_feed()) lst->has_line_feed(true);
+            if (s->has_line_feed()) (*ns)[n]->has_line_feed(true);
             if (s->has_line_break()) lst->has_line_break(true);
           }
           return ns;
@@ -1473,7 +1473,12 @@ namespace Sass {
     }
     else
     {
-      *sl << s;
+      Selector_List* l = operator()(s->tail());
+      for (size_t i = 0, L = l->length(); i < L; ++i) {
+        Complex_Selector* ss = s->clone(ctx);
+        ss->tail((*l)[i]);
+        *sl << ss;
+      }
       return sl;
     }
 
@@ -1501,9 +1506,9 @@ namespace Sass {
       if (!(*sl)[i]->head()) continue;
       if ((*sl)[i]->combinator() != Complex_Selector::ANCESTOR_OF) continue;
       if ((*sl)[i]->head()->is_empty_reference()) {
-        if ((*sl)[i]->has_line_feed()) {
-          if ((*sl)[i]->tail()) (*sl)[i]->tail()->has_line_feed(true);
-        }
+        // if ((*sl)[i]->has_line_feed()) {
+          // if ((*sl)[i]->tail()) (*sl)[i]->tail()->has_line_feed(true);
+        // }
         (*sl)[i] = (*sl)[i]->tail();
       }
 

node.cpp

@@ -249,7 +249,7 @@ namespace Sass {
 
       if (child.isSelector()) {
         pCurrent->tail(child.selector()->clone(ctx));   // JMA - need to clone the selector, because they can end up getting shared across Node collections, and can result in an infinite loop during the call to parentSuperselector()
-        if (child.got_line_feed) pCurrent->has_line_feed(child.got_line_feed);
+        // if (child.got_line_feed) pCurrent->has_line_feed(child.got_line_feed);
         pCurrent = pCurrent->tail();
       } else if (child.isCombinator()) {
         pCurrent->combinator(child.combinator());