Fixes leafo#149 - parent selector in string

Author: robocoder

src/Compiler.php

@@ -545,11 +545,21 @@ protected function evalSelectors($selectors)
         $newSelectors = array();
 
         foreach ($selectors as $selector) {
-            if (is_array($selector[0][0]) || strpos($selector[0][0], ',') === false) {
+            if (is_array($selector[0][0])) {
+                $newSelectors[] = $selector;
+            } elseif (strpos($selector[0][0], ',') === false) {
+                if ($selector[0][0][0] === '&') {
+                    $selector = array(array(array('self'), substr($selector[0][0], 1)));
+                }
+
                 $newSelectors[] = $selector;
             } else {
                 foreach (array_map(function ($s) { return trim($s, " \t\n\r\0\x0b'\""); }, explode(',', $selector[0][0])) as $newSelectorPart) {
-                    $newSelectors[] = array(array($newSelectorPart));
+                    if ($newSelectorPart[0] === '&') {
+                        $newSelectors[] = array(array(array('self'), substr($newSelectorPart, 1)));
+                    } else {
+                        $newSelectors[] = array(array($newSelectorPart));
+                    }
                 }
             }
         }

tests/FailingTest.php

@@ -181,31 +181,6 @@ public function provideFailing()
                 , <<<END_OF_EXPECTED
 body .to-extend, body .test {
   color: red; }
-END_OF_EXPECTED
-            ),
-            array(
-                '#149 - parent selector (&) inside string does not work', <<<'END_OF_SCSS'
-.parent {
-    $sub: unquote(".child");
-    $self: unquote("&.self2");
-    &.self { // works perfectly
-        content: "should match .parent.self";
-    }
-    #{$sub} { // works as it should
-        content: "should match .parent .child";
-    }
-    #{$self} { // does not work (see below)
-        content: "should match .parent.self2";
-    }
-}
-END_OF_SCSS
-                , <<<END_OF_EXPECTED
-.parent.self {
-  content: "should match .parent.self"; }
-.parent .child {
-  content: "should match .parent .child"; }
-.parent.self2 {
-  content: "should match .parent.self2"; }
 END_OF_EXPECTED
             ),
 /*************************************************************

tests/inputs/selectors.scss

@@ -246,3 +246,24 @@ $all: $span, $p, $div;
         color: red;
     }
 }
+
+.parent {
+    $sub: unquote(".child");
+    $self: unquote("&.self2");
+    &.self { // works perfectly
+        content: "should match .parent.self";
+    }
+    #{$sub} { // works as it should
+        content: "should match .parent .child";
+    }
+    #{$self} { // does not work (see below)
+        content: "should match .parent.self2";
+    }
+}
+
+.parent {
+    $selfMultiple: unquote("&.self1, &.self2");
+    #{$selfMultiple} {
+        content: "should match .parent.self1, .parent.self2";
+    }
+}

tests/outputs/selectors.css

@@ -351,3 +351,13 @@ div.foo div {
 
 span a, p a, div a {
   color: red; }
+
+.parent.self {
+  content: "should match .parent.self"; }
+  .parent .child {
+    content: "should match .parent .child"; }
+  .parent.self2 {
+    content: "should match .parent.self2"; }
+
+.parent.self1, .parent.self2 {
+  content: "should match .parent.self1, .parent.self2"; }

tests/outputs_numbered/selectors.css

@@ -377,3 +377,19 @@ div.foo div {
 
 span a, p a, div a {
   color: red; }
+/* line 250, inputs/selectors.scss */
+/* line 253, inputs/selectors.scss */
+
+.parent.self {
+  content: "should match .parent.self"; }
+/* line 256, inputs/selectors.scss */
+.parent .child {
+  content: "should match .parent .child"; }
+/* line 259, inputs/selectors.scss */
+.parent.self2 {
+  content: "should match .parent.self2"; }
+/* line 264, inputs/selectors.scss */
+/* line 266, inputs/selectors.scss */
+
+.parent.self1, .parent.self2 {
+  content: "should match .parent.self1, .parent.self2"; }