Fix rendering

Author: AydinHassan

src/Markdown/Block/ContextSpecificBlock.php

@@ -10,8 +10,9 @@
 use League\CommonMark\Block\Element\AbstractStringContainerBlock;
 use PhpSchool\PhpWorkshop\Exception\InvalidArgumentException;
 use PhpSchool\PhpWorkshop\Markdown\Parser\ContextSpecificBlockParser;
+use League\CommonMark\Block\Element\InlineContainerInterface;
 
-final class ContextSpecificBlock extends AbstractStringContainerBlock
+final class ContextSpecificBlock extends AbstractBlock
 {
     /**
      * @var string
@@ -25,8 +26,6 @@ public function __construct(string $type)
         }
 
         $this->type = $type;
-
-        parent::__construct();
     }
 
     public function getType(): string
@@ -36,36 +35,17 @@ public function getType(): string
 
     public function canContain(AbstractBlock $block): bool
     {
-        return false;
+        return true;
     }
 
     public function isCode(): bool
     {
-        return true;
+        return false;
     }
 
     public function matchesNextLine(Cursor $cursor): bool
     {
-        return true;
-    }
-
-    public function finalize(ContextInterface $context, int $endLineNumber)
-    {
-        parent::finalize($context, $endLineNumber);
-
-        $this->finalStringContents = \implode("\n", $this->strings->toArray());
-    }
-
-    public function handleRemainingContents(ContextInterface $context, Cursor $cursor)
-    {
-        $tagged = $cursor->match(ContextSpecificBlockParser::getParserRegex());
-        if ($tagged !== null) {
-            $this->finalize($context, $context->getLineNumber());
-            return;
-        }
-
-        /** @var self $tip */
-        $tip = $context->getTip();
-        $tip->addLine($cursor->getRemainder());
+        $content = $cursor->match(ContextSpecificBlockParser::getEndBlockRegex($this->type));
+        return $content === null;
     }
 }

src/Markdown/Parser/ContextSpecificBlockParser.php

@@ -5,6 +5,7 @@
 namespace PhpSchool\PhpWorkshop\Markdown\Parser;
 
 use League\CommonMark\Block\Parser\BlockParserInterface;
+use PhpSchool\PhpWorkshop\Exception\InvalidArgumentException;
 use PhpSchool\PhpWorkshop\Markdown\Block\ContextSpecificBlock;
 use League\CommonMark\ContextInterface;
 use League\CommonMark\Cursor;
@@ -19,6 +20,15 @@ public static function getParserRegex(): string
         return '/^{{\s?(' . implode('|', self::TYPES) . ')\s?}}/';
     }
 
+    public static function getEndBlockRegex(string $type): string
+    {
+        if (!in_array($type, self::TYPES, true)) {
+            throw InvalidArgumentException::notValidParameter('type', self::TYPES, $type);
+        }
+
+        return '/^{{\s?(' . $type . ')\s?}}/';
+    }
+
     public function parse(ContextInterface $context, Cursor $cursor): bool
     {
         if ($cursor->getCharacter() !== '{') {
@@ -34,8 +44,6 @@ public function parse(ContextInterface $context, Cursor $cursor): bool
 
         $context->addBlock(new ContextSpecificBlock($type));
 
-        // TODO: How to handle the entire block?!?
-
         return true;
     }
 }

src/Markdown/Renderer/ContextSpecificRenderer.php

@@ -35,6 +35,8 @@ public function render(AbstractBlock $block, ElementRendererInterface $renderer,
             return '';
         }
 
-        return $renderer->renderInlines($block->children());
+        /** @var iterable<AbstractBlock> $children */
+        $children = $block->children();
+        return $renderer->renderBlocks($children);
     }
 }