Handle nested contents in code blocks

Author: kylekatarnls

src/Phug/AbstractNodeCompiler.php

@@ -6,6 +6,7 @@
 use Phug\Formatter\Element\CodeElement;
 use Phug\Formatter\Element\VariableElement;
 use Phug\Formatter\ElementInterface;
+use Phug\Parser\Node\CommentNode;
 use Phug\Parser\Node\TextNode;
 use Phug\Parser\NodeInterface as ParserNodeInterface;
 
@@ -30,26 +31,35 @@ public function __construct(CompilerInterface $compiler)
 
     protected function getTextChildren($node)
     {
+        $children = array_filter($node->getChildren(), function (NodeInterface $node) {
+            return !($node instanceof CommentNode);
+        });
+
         return implode("\n", array_map(function (TextNode $text) {
             return $text->getValue();
-        }, $node->getChildren()));
+        }, $children));
     }
 
     public function getCompiler()
     {
         return $this->compiler;
     }
 
-    public function getCompiledChildren(NodeInterface $node, ElementInterface $element = null)
+    public function getCompiledNodeList($nodeList, ElementInterface $element = null)
     {
         return array_values(array_filter(array_map(
             function (NodeInterface $childNode) use ($element) {
                 return $this->compileParserNode($childNode, $element);
             },
-            array_filter($node->getChildren())
+            array_filter($nodeList)
         )));
     }
 
+    public function getCompiledChildren(NodeInterface $node, ElementInterface $element = null)
+    {
+        return $this->getCompiledNodeList($node->getChildren(), $element);
+    }
+
     public function compileNodeChildren(NodeInterface $node, ElementInterface $element = null)
     {
         $children = array_filter($node->getChildren());

src/Phug/Compiler/CodeCompiler.php

@@ -7,6 +7,8 @@
 use Phug\Formatter\Element\CodeElement;
 use Phug\Formatter\ElementInterface;
 use Phug\Parser\Node\CodeNode;
+use Phug\Parser\Node\CommentNode;
+use Phug\Parser\Node\TextNode;
 use Phug\Parser\NodeInterface;
 
 class CodeCompiler extends AbstractNodeCompiler
@@ -19,6 +21,25 @@ public function compileNode(NodeInterface $node, ElementInterface $parent = null
             );
         }
 
-        return new CodeElement($this->getTextChildren($node));
+        $children = array_filter($node->getChildren(), function (NodeInterface $node) {
+            return !($node instanceof CommentNode);
+        });
+
+        $texts = array_filter($children, function (NodeInterface $node) {
+            return $node instanceof TextNode;
+        });
+
+        if (count($texts) === count($children)) {
+            return new CodeElement($this->getTextChildren($node));
+        }
+
+        $code = new CodeElement();
+        if ($children[0] instanceof TextNode) {
+            $code->setValue($children[0]->getValue());
+            $children = array_slice($children, 1);
+        }
+        $code->setChildren($this->getCompiledNodeList($children, $parent));
+
+        return $code;
     }
 }

src/Phug/NodeCompilerInterface.php

@@ -9,6 +9,14 @@
 
 interface NodeCompilerInterface
 {
+    /**
+     * @param array            $node
+     * @param ElementInterface $parent
+     *
+     * @return array
+     */
+    public function getCompiledNodeList($nodeList, ElementInterface $parent = null);
+
     /**
      * @param NodeInterface    $node
      * @param ElementInterface $parent