fixes leafo#281

Author: robocoder

src/Compiler.php

@@ -530,6 +530,34 @@ protected function mediaParent($scope)
         return $scope;
     }
 
+    /**
+     * Compile keyframe block
+     *
+     * @param \stdClass $block
+     * @param array     $selectors
+     */
+    protected function compileKeyframeBlock($block, $selectors)
+    {
+        $env = $this->pushEnv($block);
+
+        $envs = $this->compactEnv($env);
+
+        $this->env = $this->extractEnv(array_filter($envs, function ($e) {
+            return ! isset($e->block->selectors);
+        }));
+
+        $this->scope = $this->makeOutputBlock($block->type, $selectors);
+        $this->scope->depth = 1;
+        $this->scope->parent->children[] = $this->scope;
+
+        $this->compileChildren($block->children, $this->scope);
+
+        $this->scope = $this->scope->parent;
+        $this->env   = $this->extractEnv($envs);
+
+        $this->popEnv();
+    }
+
     /**
      * Compile nested block
      *
@@ -1049,7 +1077,11 @@ protected function compileChild($child, $out)
                     $s .= ' ' . $this->compileValue($directive->value);
                 }
 
-                $this->compileNestedBlock($directive, array($s));
+                if ($directive->name === 'keyframes' || substr($directive->name, -10) === '-keyframes') {
+                    $this->compileKeyframeBlock($directive, array($s));
+                } else {
+                    $this->compileNestedBlock($directive, array($s));
+                }
                 break;
 
             case 'media':
@@ -2245,7 +2277,7 @@ protected function extractInterpolation($list)
         foreach ($items as $i => $item) {
             if ($item[0] === 'interpolate') {
                 $before = array('list', $list[1], array_slice($items, 0, $i));
-                $after = array('list', $list[1], array_slice($items, $i + 1));
+                $after  = array('list', $list[1], array_slice($items, $i + 1));
 
                 return array('interpolated', $item, $before, $after);
             }
@@ -2263,16 +2295,15 @@ protected function extractInterpolation($list)
      */
     protected function multiplySelectors($env)
     {
-        for ($envs = array(); $env; $env = $env->parent) {
-            if (count($env->selectors)) {
-                $envs[] = $env;
-            }
-        }
-
-        $selectors = array();
+        $envs            = $this->compactEnv($env);
+        $selectors       = array();
         $parentSelectors = array(array());
 
         while ($env = array_pop($envs)) {
+            if (empty($env->selectors)) {
+                continue;
+            }
+
             $selectors = array();
 
             foreach ($env->selectors as $selector) {
@@ -2366,6 +2397,39 @@ protected function multiplyMedia($env, $childQueries = null)
         return $this->multiplyMedia($env->parent, $childQueries);
     }
 
+    /**
+     * Convert env linked list to stack
+     *
+     * @param \stdClass $env
+     *
+     * @return array
+     */
+    private function compactEnv($env)
+    {
+        for ($envs = array(); $env; $env = $env->parent) {
+            $envs[] = $env;
+        }
+
+        return $envs;
+    }
+
+    /**
+     * Convert env stack to singly linked list
+     *
+     * @param array $envs
+     *
+     * @return \stdClass
+     */
+    private function extractEnv($envs)
+    {
+        for ($env = null; $e = array_pop($envs);) {
+            $e->parent = $env;
+            $env = $e;
+        }
+
+        return $env;
+    }
+
     /**
      * Push environment
      *

tests/FailingTest.php

@@ -124,53 +124,6 @@ public function provideFailing()
 
 small {
   font-weight: italic; }
-END_OF_EXPECTED
-            ),
-            array(
-                '#281 - nested animation selector', <<<'END_OF_SCSS'
-.custom-selector {
-
-& {
-  color:blue;
-}
-
-@-webkit-keyframes zoomer {
-  from {
-    transform:scale(0.5);
-  }
-
-  to {
-    transform:scale(1);
-  }
-}
-
-@keyframes zoomer {
-  from {
-    transform:scale(0.5);
-  }
-
-  to {
-    transform:scale(1);
-  }
-}
-
-}
-END_OF_SCSS
-                , <<<END_OF_EXPECTED
-.custom-selector {
-  color: blue; }
-
-@-webkit-keyframes zoomer {
-  from {
-    transform: scale(0.5); }
-  to {
-    transform: scale(1); } }
-
-@keyframes zoomer {
-  from {
-    transform: scale(0.5); }
-  to {
-    transform: scale(1); } }
 END_OF_EXPECTED
             ),
 /*************************************************************

tests/inputs/directives.scss

@@ -125,3 +125,31 @@ div {
 .icon-ajax {
     @extend .bold;
 }
+
+.custom-selector {
+
+& {
+  color:blue;
+}
+
+@-webkit-keyframes zoomer {
+  from {
+    transform:scale(0.5);
+  }
+
+  to {
+    transform:scale(1);
+  }
+}
+
+@keyframes zoomer {
+  from {
+    transform:scale(0.5);
+  }
+
+  to {
+    transform:scale(1);
+  }
+}
+
+}

tests/outputs/directives.css

@@ -85,3 +85,18 @@ div {
 
 .bold, .icon-ajax {
   font-weight: 700; }
+
+.custom-selector {
+  color: blue; }
+
+@-webkit-keyframes zoomer {
+    from {
+      transform: scale(0.5); }
+    to {
+      transform: scale(1); } }
+
+@keyframes zoomer {
+    from {
+      transform: scale(0.5); }
+    to {
+      transform: scale(1); } }

tests/outputs_numbered/directives.css

@@ -95,3 +95,24 @@ body {
 .bold, .icon-ajax {
   font-weight: 700; }
 /* line 125, inputs/directives.scss */
+/* line 129, inputs/directives.scss */
+
+/* line 131, inputs/directives.scss */
+  .custom-selector {
+    color: blue; }
+
+@-webkit-keyframes zoomer {
+/* line 136, inputs/directives.scss */
+from {
+  transform: scale(0.5); }
+/* line 140, inputs/directives.scss */
+to {
+  transform: scale(1); } }
+
+@keyframes zoomer {
+/* line 146, inputs/directives.scss */
+from {
+  transform: scale(0.5); }
+/* line 150, inputs/directives.scss */
+to {
+  transform: scale(1); } }