Merge pull request #652 from Cerdic/Issue/leafo/620

Fix for #620

Author: robocoder

src/Compiler.php

@@ -2271,6 +2271,11 @@ protected function reduce($value, $inExp = false)
             case Type::T_FUNCTION_CALL:
                 return $this->fncall($value[1], $value[2]);
 
+            case Type::T_SELF:
+                $selfSelector = $this->multiplySelectors($this->env);
+                $selfSelector = $this->collapseSelectors($selfSelector);
+                return [Type::T_STRING, '', [$selfSelector]];
+
             default:
                 return $value;
         }

src/Parser.php

@@ -1402,6 +1402,11 @@ protected function value(&$out)
             }
         }
 
+        if ($this->matchChar('&', true)) {
+            $out = [Type::T_SELF];
+            return true;
+        }
+
         if ($char === '$' && $this->variable($out)) {
             return true;
         }
@@ -1991,28 +1996,18 @@ protected function interpolation(&$out, $lookWhite = true)
         $s = $this->count;
 
         if ($this->literal('#{', 2) && $this->valueList($value) && $this->matchChar('}', false)) {
-            if ($lookWhite) {
-                $left = preg_match('/\s/', $this->buffer[$s - 1]) ? ' ' : '';
-                $right = preg_match('/\s/', $this->buffer[$this->count]) ? ' ': '';
+            if ($value === [Type::T_SELF]) {
+                $out = $value;
             } else {
-                $left = $right = false;
-            }
-
-            $out = [Type::T_INTERPOLATE, $value, $left, $right];
-            $this->eatWhiteDefault = $oldWhite;
+                if ($lookWhite) {
+                    $left = preg_match('/\s/', $this->buffer[$s - 1]) ? ' ' : '';
+                    $right = preg_match('/\s/', $this->buffer[$this->count]) ? ' ': '';
+                } else {
+                    $left = $right = false;
+                }
 
-            if ($this->eatWhiteDefault) {
-                $this->whitespace();
+                $out = [Type::T_INTERPOLATE, $value, $left, $right];
             }
-
-            return true;
-        }
-
-        $this->seek($s);
-
-        if ($this->literal('#{', 2) && $this->selectorSingle($sel) && $this->matchChar('}', false)) {
-            $out = $sel[0];
-
             $this->eatWhiteDefault = $oldWhite;
 
             if ($this->eatWhiteDefault) {
@@ -2023,6 +2018,7 @@ protected function interpolation(&$out, $lookWhite = true)
         }
 
         $this->seek($s);
+
         $this->eatWhiteDefault = $oldWhite;
 
         return false;

tests/inputs/values.scss

@@ -41,3 +41,8 @@ multiline string.";
     d: +foo(12px);
 }
 
+#self {
+    $self1: #{&};
+    $self2: &;
+    content:'#{$self2}';
+}

tests/outputs/values.css

@@ -32,3 +32,6 @@ multiline string.";
   b: 0.5em;
   c: -foo(12px);
   d: +foo(12px); }
+
+#self {
+  content: "#self"; }

tests/outputs_numbered/values.css

@@ -33,3 +33,6 @@ multiline string.";
   b: 0.5em;
   c: -foo(12px);
   d: +foo(12px); }
+/* line 44, inputs/values.scss */
+#self {
+  content: "#self"; }