File tree Expand file tree Collapse file tree 3 files changed +5
-4
lines changed Expand file tree Collapse file tree 3 files changed +5
-4
lines changed Original file line number Diff line number Diff line change @@ -1275,10 +1275,10 @@ namespace Sass {
1275
1275
if ((*this )[i]->head ()->is_empty_reference ()) {
1276
1276
// simply move to the next tail if we have "no" combinator
1277
1277
if ((*this )[i]->combinator () == Complex_Selector::ANCESTOR_OF) {
1278
- if ((*this )[i]->tail () && (*this )[i]->has_line_feed ()) {
1279
- (*this )[i]->tail ()->has_line_feed (true );
1280
- }
1281
1278
if ((*this )[i]->tail () != NULL ) {
1279
+ if ((*this )[i]->has_line_feed ()) {
1280
+ (*this )[i]->tail ()->has_line_feed (true );
1281
+ }
1282
1282
(*this )[i] = (*this )[i]->tail ();
1283
1283
}
1284
1284
}
Original file line number Diff line number Diff line change @@ -1683,6 +1683,7 @@ namespace Sass {
1683
1683
std::vector<Selector_List*> rv;
1684
1684
Selector_List* sl = SASS_MEMORY_NEW (ctx.mem , Selector_List, s->pstate ());
1685
1685
sl->media_block (s->media_block ());
1686
+ sl->is_optional (s->is_optional ());
1686
1687
for (size_t i = 0 , iL = s->length (); i < iL; ++i) {
1687
1688
rv.push_back (operator ()((*s)[i]));
1688
1689
}
Original file line number Diff line number Diff line change @@ -593,7 +593,7 @@ namespace Sass {
593
593
error (" Can't extend " + sel_str + " : can't extend nested selectors" , c->pstate (), backtrace ());
594
594
}
595
595
Compound_Selector* placeholder = c->head ();
596
- placeholder ->is_optional (s ->is_optional () );
596
+ if (contextualized ->is_optional ()) placeholder ->is_optional (true );
597
597
for (size_t i = 0 , L = extender->length (); i < L; ++i) {
598
598
Complex_Selector* sel = (*extender)[i];
599
599
if (!(sel->head () && sel->head ()->length () > 0 &&
You can’t perform that action at this time.
0 commit comments