Merge pull request #2004 from mgreter/bugfix/issue_2000

Fix selector schema evaluation with parent selectors

Author: mgreter

src/ast.cpp

@@ -1298,6 +1298,14 @@ namespace Sass {
     return false;
   }
 
+  bool Selector_Schema::has_parent_ref()
+  {
+    if (String_Schema* schema = dynamic_cast<String_Schema*>(contents())) {
+      return schema->length() > 0 && dynamic_cast<Parent_Selector*>(schema->at(0)) != NULL;
+    }
+    return false;
+  }
+
   void Selector_List::adjust_after_pushing(Complex_Selector* c)
   {
     // if (c->has_reference())   has_reference(true);

src/ast.hpp

@@ -1914,6 +1914,7 @@ namespace Sass {
     Selector_Schema(ParserState pstate, String* c)
     : Selector(pstate), contents_(c), at_root_(false)
     { }
+    virtual bool has_parent_ref();
     virtual size_t hash() {
       if (hash_ == 0) {
         hash_combine(hash_, contents_->hash());

src/eval.cpp

@@ -1732,7 +1732,9 @@ namespace Sass {
     result_str = unquote(Util::rtrim(result_str)) + "\n{";
     Parser p = Parser::from_c_str(result_str.c_str(), ctx, s->pstate());
     p.last_media_block = s->media_block();
-    return operator()(p.parse_selector_list(exp.block_stack.back()->is_root()));
+    Selector_List* sl = p.parse_selector_list(exp.block_stack.back()->is_root());
+    if (s->has_parent_ref()) sl->remove_parent_selectors();
+    return operator()(sl);
   }
 
   Expression* Eval::operator()(Parent_Selector* p)

src/expand.cpp

@@ -621,8 +621,11 @@ namespace Sass {
   Statement* Expand::operator()(Extension* e)
   {
     if (Selector_List* extender = dynamic_cast<Selector_List*>(selector())) {
-      selector_stack.push_back(0);
       Selector* s = e->selector();
+      if (Selector_Schema* schema = dynamic_cast<Selector_Schema*>(s)) {
+        if (schema->has_parent_ref()) s = eval(schema);
+      }
+      selector_stack.push_back(0);
       expand_selector_list(s, extender);
       selector_stack.pop_back();
     }