From 6367bc321b1e7bc95af53bcf5c3b2f5c42c8800a Mon Sep 17 00:00:00 2001
From: Javier Eguiluz <javier.eguiluz@gmail.com>
Date: Thu, 10 Feb 2022 16:22:32 +0100
Subject: [PATCH 1/2] Add support for CSS classes in code blocks

---
 src/Renderers/CodeNodeRenderer.php            |  1 +
 src/Templates/default/html/code.html.twig     |  2 +-
 .../expected/blocks/code-blocks/bash.html     |  2 +-
 .../expected/blocks/code-blocks/diff.html     |  4 ++--
 .../expected/blocks/code-blocks/html-php.html |  2 +-
 .../blocks/code-blocks/html-twig.html         |  2 +-
 .../expected/blocks/code-blocks/html.html     |  2 +-
 .../expected/blocks/code-blocks/ini.html      |  2 +-
 .../blocks/code-blocks/php-annotations.html   |  2 +-
 .../expected/blocks/code-blocks/php.html      |  2 +-
 .../expected/blocks/code-blocks/terminal.html | 19 ++++++++++++++++---
 .../expected/blocks/code-blocks/text.html     |  2 +-
 .../expected/blocks/code-blocks/twig.html     |  2 +-
 .../expected/blocks/code-blocks/xml.html      |  2 +-
 .../expected/blocks/code-blocks/yaml.html     |  2 +-
 .../directives/configuration-block.html       |  4 ++--
 .../directives/note-code-block-nested.html    |  2 +-
 .../directives/sidebar-code-block-nested.html |  2 +-
 .../expected/blocks/nodes/literal.html        |  2 +-
 .../source/blocks/code-blocks/terminal.rst    |  5 +++++
 20 files changed, 41 insertions(+), 22 deletions(-)

diff --git a/src/Renderers/CodeNodeRenderer.php b/src/Renderers/CodeNodeRenderer.php
index 26f16ff..356e923 100644
--- a/src/Renderers/CodeNodeRenderer.php
+++ b/src/Renderers/CodeNodeRenderer.php
@@ -84,6 +84,7 @@ public function render(): string
         return $this->templateRenderer->render(
             'code.html.twig',
             [
+                'css_classes' => $this->codeNode->getClassesString(),
                 'languages' => $languages,
                 'line_numbers' => $lineNumbers,
                 'code' => $highlightedCode,
diff --git a/src/Templates/default/html/code.html.twig b/src/Templates/default/html/code.html.twig
index fa6ff8a..df32cb6 100644
--- a/src/Templates/default/html/code.html.twig
+++ b/src/Templates/default/html/code.html.twig
@@ -1,4 +1,4 @@
-<div translate="no" data-loc="{{ loc }}" class="notranslate codeblock codeblock-length-{{ length }} {{ languages|map(language => "codeblock-#{language}")|join(' ') }}">
+<div translate="no" data-loc="{{ loc }}" class="notranslate codeblock codeblock-length-{{ length }} {{ languages|map(language => "codeblock-#{language}")|join(' ') }} {{ css_classes }}">
     <div class="codeblock-scroll">
         <pre class="codeblock-lines">{{ line_numbers }}</pre>
         <pre class="codeblock-code"><code>{{ code|raw }}</code></pre>
diff --git a/tests/fixtures/expected/blocks/code-blocks/bash.html b/tests/fixtures/expected/blocks/code-blocks/bash.html
index 499d001..2bd5494 100644
--- a/tests/fixtures/expected/blocks/code-blocks/bash.html
+++ b/tests/fixtures/expected/blocks/code-blocks/bash.html
@@ -1,4 +1,4 @@
-<div translate="no" data-loc="1" class="notranslate codeblock codeblock-length-sm codeblock-bash">
+<div translate="no" data-loc="1" class="notranslate codeblock codeblock-length-sm codeblock-bash ">
     <div class="codeblock-scroll">
         <pre class="codeblock-lines">1</pre>
         <pre class="codeblock-code"><code>git <span class="hljs-built_in">clone</span> git@github.com:symfony/symfony.git</code></pre>
diff --git a/tests/fixtures/expected/blocks/code-blocks/diff.html b/tests/fixtures/expected/blocks/code-blocks/diff.html
index 0a020cf..b28fd0b 100644
--- a/tests/fixtures/expected/blocks/code-blocks/diff.html
+++ b/tests/fixtures/expected/blocks/code-blocks/diff.html
@@ -1,4 +1,4 @@
-<div translate="no" data-loc="5" class="notranslate codeblock codeblock-length-sm codeblock-diff">
+<div translate="no" data-loc="5" class="notranslate codeblock codeblock-length-sm codeblock-diff ">
     <div class="codeblock-scroll">
         <pre class="codeblock-lines">1
 2
@@ -17,7 +17,7 @@
     </div>
 </div>
 
-<div translate="no" data-loc="6" class="notranslate codeblock codeblock-length-sm codeblock-diff">
+<div translate="no" data-loc="6" class="notranslate codeblock codeblock-length-sm codeblock-diff ">
     <div class="codeblock-scroll">
         <pre class="codeblock-lines">1
 2
diff --git a/tests/fixtures/expected/blocks/code-blocks/html-php.html b/tests/fixtures/expected/blocks/code-blocks/html-php.html
index d77a92e..a6a97c8 100644
--- a/tests/fixtures/expected/blocks/code-blocks/html-php.html
+++ b/tests/fixtures/expected/blocks/code-blocks/html-php.html
@@ -1,4 +1,4 @@
-<div translate="no" data-loc="12" class="notranslate codeblock codeblock-length-md codeblock-html+php codeblock-html">
+<div translate="no" data-loc="12" class="notranslate codeblock codeblock-length-md codeblock-html+php codeblock-html ">
     <div class="codeblock-scroll">
         <pre class="codeblock-lines">1
 2
diff --git a/tests/fixtures/expected/blocks/code-blocks/html-twig.html b/tests/fixtures/expected/blocks/code-blocks/html-twig.html
index dbe3101..fd757ff 100644
--- a/tests/fixtures/expected/blocks/code-blocks/html-twig.html
+++ b/tests/fixtures/expected/blocks/code-blocks/html-twig.html
@@ -1,4 +1,4 @@
-<div translate="no" data-loc="2" class="notranslate codeblock codeblock-length-sm codeblock-html+twig codeblock-twig">
+<div translate="no" data-loc="2" class="notranslate codeblock codeblock-length-sm codeblock-html+twig codeblock-twig ">
     <div class="codeblock-scroll">
         <pre class="codeblock-lines">1
 2</pre>
diff --git a/tests/fixtures/expected/blocks/code-blocks/html.html b/tests/fixtures/expected/blocks/code-blocks/html.html
index f35e7e3..bdc5621 100644
--- a/tests/fixtures/expected/blocks/code-blocks/html.html
+++ b/tests/fixtures/expected/blocks/code-blocks/html.html
@@ -1,4 +1,4 @@
-<div translate="no" data-loc="1" class="notranslate codeblock codeblock-length-sm codeblock-html">
+<div translate="no" data-loc="1" class="notranslate codeblock codeblock-length-sm codeblock-html ">
     <div class="codeblock-scroll">
         <pre class="codeblock-lines">1</pre>
         <pre class="codeblock-code"><code><span class="hljs-comment">&lt;!-- some code --&gt;</span>
diff --git a/tests/fixtures/expected/blocks/code-blocks/ini.html b/tests/fixtures/expected/blocks/code-blocks/ini.html
index 01600a9..5bc6410 100644
--- a/tests/fixtures/expected/blocks/code-blocks/ini.html
+++ b/tests/fixtures/expected/blocks/code-blocks/ini.html
@@ -1,4 +1,4 @@
-<div translate="no" data-loc="1" class="notranslate codeblock codeblock-length-sm codeblock-ini">
+<div translate="no" data-loc="1" class="notranslate codeblock codeblock-length-sm codeblock-ini ">
     <div class="codeblock-scroll">
         <pre class="codeblock-lines">1</pre>
         <pre class="codeblock-code"><code><span class="hljs-attr">fetch</span> = +refs/notes/*:refs/notes/*</code></pre>
diff --git a/tests/fixtures/expected/blocks/code-blocks/php-annotations.html b/tests/fixtures/expected/blocks/code-blocks/php-annotations.html
index d43ecf0..afe2a3c 100644
--- a/tests/fixtures/expected/blocks/code-blocks/php-annotations.html
+++ b/tests/fixtures/expected/blocks/code-blocks/php-annotations.html
@@ -1,4 +1,4 @@
-<div translate="no" data-loc="14" class="notranslate codeblock codeblock-length-md codeblock-php-annotations codeblock-php">
+<div translate="no" data-loc="14" class="notranslate codeblock codeblock-length-md codeblock-php-annotations codeblock-php ">
     <div class="codeblock-scroll">
         <pre class="codeblock-lines">1
 2
diff --git a/tests/fixtures/expected/blocks/code-blocks/php.html b/tests/fixtures/expected/blocks/code-blocks/php.html
index c005a13..e5d78ab 100644
--- a/tests/fixtures/expected/blocks/code-blocks/php.html
+++ b/tests/fixtures/expected/blocks/code-blocks/php.html
@@ -1,4 +1,4 @@
-<div translate="no" data-loc="7" class="notranslate codeblock codeblock-length-sm codeblock-php">
+<div translate="no" data-loc="7" class="notranslate codeblock codeblock-length-sm codeblock-php ">
     <div class="codeblock-scroll">
         <pre class="codeblock-lines">1
 2
diff --git a/tests/fixtures/expected/blocks/code-blocks/terminal.html b/tests/fixtures/expected/blocks/code-blocks/terminal.html
index 15436ab..2879f6a 100644
--- a/tests/fixtures/expected/blocks/code-blocks/terminal.html
+++ b/tests/fixtures/expected/blocks/code-blocks/terminal.html
@@ -1,11 +1,11 @@
-<div translate="no" data-loc="1" class="notranslate codeblock codeblock-length-sm codeblock-terminal codeblock-bash">
+<div translate="no" data-loc="1" class="notranslate codeblock codeblock-length-sm codeblock-terminal codeblock-bash ">
     <div class="codeblock-scroll">
         <pre class="codeblock-lines">1</pre>
         <pre class="codeblock-code"><code>git <span
             class="hljs-built_in">clone</span> git@github.com:symfony/symfony.git</code></pre>
     </div>
 </div>
-<div translate="no" data-loc="2" class="notranslate codeblock codeblock-length-sm codeblock-terminal codeblock-bash">
+<div translate="no" data-loc="2" class="notranslate codeblock codeblock-length-sm codeblock-terminal codeblock-bash ">
    <div class="codeblock-scroll">
        <pre class="codeblock-lines">1
 2</pre>
@@ -20,7 +20,7 @@
    </div>
 </div>
 
-<div translate="no" data-loc="3" class="notranslate codeblock codeblock-length-sm codeblock-terminal codeblock-bash">
+<div translate="no" data-loc="3" class="notranslate codeblock codeblock-length-sm codeblock-terminal codeblock-bash ">
    <div class="codeblock-scroll">
        <pre class="codeblock-lines">1
 2
@@ -33,3 +33,16 @@
        </pre>
    </div>
 </div>
+
+<div translate="no" data-loc="1" class="notranslate codeblock codeblock-length-sm codeblock-terminal codeblock-bash hide">
+    <div class="codeblock-scroll">
+        <pre class="codeblock-lines">1</pre>
+        <pre class="codeblock-code">
+            <code>
+                <span class="hljs-prompt">$ </span>
+                git branch -D sessions-in-db ||
+               <span class="hljs-literal">true</span>
+           </code>
+        </pre>
+    </div>
+</div>
diff --git a/tests/fixtures/expected/blocks/code-blocks/text.html b/tests/fixtures/expected/blocks/code-blocks/text.html
index a30c3ed..91c0038 100644
--- a/tests/fixtures/expected/blocks/code-blocks/text.html
+++ b/tests/fixtures/expected/blocks/code-blocks/text.html
@@ -1,4 +1,4 @@
-<div translate="no" data-loc="1" class="notranslate codeblock codeblock-length-sm codeblock-text">
+<div translate="no" data-loc="1" class="notranslate codeblock codeblock-length-sm codeblock-text ">
     <div class="codeblock-scroll">
         <pre class="codeblock-lines">1</pre>
         <pre class="codeblock-code"><code>some text</code></pre>
diff --git a/tests/fixtures/expected/blocks/code-blocks/twig.html b/tests/fixtures/expected/blocks/code-blocks/twig.html
index fab139d..2011c20 100644
--- a/tests/fixtures/expected/blocks/code-blocks/twig.html
+++ b/tests/fixtures/expected/blocks/code-blocks/twig.html
@@ -1,4 +1,4 @@
-<div translate="no" data-loc="1" class="notranslate codeblock codeblock-length-sm codeblock-twig">
+<div translate="no" data-loc="1" class="notranslate codeblock codeblock-length-sm codeblock-twig ">
     <div class="codeblock-scroll">
         <pre class="codeblock-lines">1</pre>
         <pre class="codeblock-code"><code><span class="hljs-comment">{# some code #}</span></code></pre>
diff --git a/tests/fixtures/expected/blocks/code-blocks/xml.html b/tests/fixtures/expected/blocks/code-blocks/xml.html
index 4772257..1bf8d0b 100644
--- a/tests/fixtures/expected/blocks/code-blocks/xml.html
+++ b/tests/fixtures/expected/blocks/code-blocks/xml.html
@@ -1,4 +1,4 @@
-<div translate="no" data-loc="1" class="notranslate codeblock codeblock-length-sm codeblock-xml">
+<div translate="no" data-loc="1" class="notranslate codeblock codeblock-length-sm codeblock-xml ">
     <div class="codeblock-scroll">
         <pre class="codeblock-lines">1</pre>
         <pre class="codeblock-code"><code><span class="hljs-comment">&lt;!-- some code --&gt;</span>
diff --git a/tests/fixtures/expected/blocks/code-blocks/yaml.html b/tests/fixtures/expected/blocks/code-blocks/yaml.html
index fceca11..5f24eef 100644
--- a/tests/fixtures/expected/blocks/code-blocks/yaml.html
+++ b/tests/fixtures/expected/blocks/code-blocks/yaml.html
@@ -1,4 +1,4 @@
-<div translate="no" data-loc="1" class="notranslate codeblock codeblock-length-sm codeblock-yaml">
+<div translate="no" data-loc="1" class="notranslate codeblock codeblock-length-sm codeblock-yaml ">
     <div class="codeblock-scroll">
         <pre class="codeblock-lines">1</pre>
         <pre class="codeblock-code"><code><span class="hljs-comment"># some code</span>
diff --git a/tests/fixtures/expected/blocks/directives/configuration-block.html b/tests/fixtures/expected/blocks/directives/configuration-block.html
index bdff934..7a4a230 100644
--- a/tests/fixtures/expected/blocks/directives/configuration-block.html
+++ b/tests/fixtures/expected/blocks/directives/configuration-block.html
@@ -4,7 +4,7 @@
         <li data-language="php" > <span>PHP</span> </li>
     </ul>
     <div class="configuration-codeblock" data-language="yaml" style="">
-        <div translate="no" data-loc="1" class="notranslate codeblock codeblock-length-sm codeblock-yaml">
+        <div translate="no" data-loc="1" class="notranslate codeblock codeblock-length-sm codeblock-yaml ">
             <div class="codeblock-scroll">
                 <pre class="codeblock-lines">1</pre>
                 <pre class="codeblock-code"><code><span class="hljs-comment"># app/config/services.yml</span></code></pre>
@@ -12,7 +12,7 @@
         </div>
     </div>
     <div class="configuration-codeblock" data-language="php" style="display: none">
-        <div translate="no" data-loc="1" class="notranslate codeblock codeblock-length-sm codeblock-php">
+        <div translate="no" data-loc="1" class="notranslate codeblock codeblock-length-sm codeblock-php ">
             <div class="codeblock-scroll">
                 <pre class="codeblock-lines">1</pre>
                 <pre class="codeblock-code"><code><span class="hljs-comment">// config/routes.php</span></code></pre>
diff --git a/tests/fixtures/expected/blocks/directives/note-code-block-nested.html b/tests/fixtures/expected/blocks/directives/note-code-block-nested.html
index 8976188..cc3aa87 100644
--- a/tests/fixtures/expected/blocks/directives/note-code-block-nested.html
+++ b/tests/fixtures/expected/blocks/directives/note-code-block-nested.html
@@ -3,7 +3,7 @@
         <svg xmlns="http://www.w3.org/2000/svg" fill="none" width="24" height="24" viewBox="0 0 24 24" stroke="currentColor"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M11 5H6a2 2 0 00-2 2v11a2 2 0 002 2h11a2 2 0 002-2v-5m-1.414-9.414a2 2 0 112.828 2.828L11.828 15H9v-2.828l8.586-8.586z" /></svg>
         <span>Note</span>
     </p><p>test</p>
-<div translate="no" data-loc="1" class="notranslate codeblock codeblock-length-sm codeblock-php">
+<div translate="no" data-loc="1" class="notranslate codeblock codeblock-length-sm codeblock-php ">
     <div class="codeblock-scroll">
         <pre class="codeblock-lines">1</pre>
         <pre class="codeblock-code"><code><span class="hljs-comment">// code</span>
diff --git a/tests/fixtures/expected/blocks/directives/sidebar-code-block-nested.html b/tests/fixtures/expected/blocks/directives/sidebar-code-block-nested.html
index 0c1b270..f1289ee 100644
--- a/tests/fixtures/expected/blocks/directives/sidebar-code-block-nested.html
+++ b/tests/fixtures/expected/blocks/directives/sidebar-code-block-nested.html
@@ -1,5 +1,5 @@
 <div class="admonition-wrapper"><div class="admonition admonition-sidebar"><p class="sidebar-title"><span>The sidebar's title</span></p><p>some text before code block</p>
-<div translate="no" data-loc="1" class="notranslate codeblock codeblock-length-sm codeblock-php">
+<div translate="no" data-loc="1" class="notranslate codeblock codeblock-length-sm codeblock-php ">
     <div class="codeblock-scroll">
         <pre class="codeblock-lines">1</pre>
         <pre class="codeblock-code"><code><span class="hljs-comment">// some code</span>
diff --git a/tests/fixtures/expected/blocks/nodes/literal.html b/tests/fixtures/expected/blocks/nodes/literal.html
index 1c12afa..ace45e0 100644
--- a/tests/fixtures/expected/blocks/nodes/literal.html
+++ b/tests/fixtures/expected/blocks/nodes/literal.html
@@ -1,5 +1,5 @@
 <p>here is some php code from literal:</p>
-<div translate="no" data-loc="7" class="notranslate codeblock codeblock-length-sm codeblock-php">
+<div translate="no" data-loc="7" class="notranslate codeblock codeblock-length-sm codeblock-php ">
     <div class="codeblock-scroll">
         <pre class="codeblock-lines">1
 2
diff --git a/tests/fixtures/source/blocks/code-blocks/terminal.rst b/tests/fixtures/source/blocks/code-blocks/terminal.rst
index ede3e22..d68c238 100644
--- a/tests/fixtures/source/blocks/code-blocks/terminal.rst
+++ b/tests/fixtures/source/blocks/code-blocks/terminal.rst
@@ -12,3 +12,8 @@
     C:\> CIV
 
     # Civilization for DOS - my first computer game!
+
+.. code-block:: terminal
+    :class: hide
+
+    $ git branch -D sessions-in-db || true

From ee044c1f3ff90adc00be8220c80aef267be2b839 Mon Sep 17 00:00:00 2001
From: Ryan Weaver <ryan@thatsquality.com>
Date: Thu, 10 Feb 2022 13:08:43 -0500
Subject: [PATCH 2/2] Forwarding CSS classes to CodeNode

---
 src/Directive/CodeBlockDirective.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/Directive/CodeBlockDirective.php b/src/Directive/CodeBlockDirective.php
index 72518db..6618c66 100644
--- a/src/Directive/CodeBlockDirective.php
+++ b/src/Directive/CodeBlockDirective.php
@@ -33,6 +33,9 @@ public function process(Parser $parser, ?Node $node, string $variable, string $d
         }
 
         $node->setLanguage($data);
+        // grab the "class" option and forward it onto the Node
+        // CodeNodeRenderer can then use it when rendering
+        $node->setClasses(isset($options['class']) ? explode(' ', $options['class']) : []);
 
         if ('' !== $variable) {
             $environment = $parser->getEnvironment();