Skip to content

Commit 4b1e49a

Browse files
javiereguiluzjaviereguiluz
committed
minor #139 Improve the handling of custom CSS classes in code blocks (javiereguiluz)
This PR was merged into the main branch. Discussion ---------- Improve the handling of custom CSS classes in code blocks This tweaks #138 a bit to avoid unnecessary white spaces. Commits ------- 3b0db51 Improve the handling of custom CSS classes in code blocks
2 parents 4ec4b55 + 3b0db51 commit 4b1e49a

File tree

19 files changed

+23
-23
lines changed

19 files changed

+23
-23
lines changed

‎src/Renderers/CodeNodeRenderer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ public function render(): string
8484
return $this->templateRenderer->render(
8585
'code.html.twig',
8686
[
87-
'css_classes' => $this->codeNode->getClassesString(),
87+
'custom_css_classes' => $this->codeNode->getClassesString(),
8888
'languages' => $languages,
8989
'line_numbers' => $lineNumbers,
9090
'code' => $highlightedCode,

‎src/Templates/default/html/code.html.twig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div translate="no" data-loc="{{ loc }}" class="notranslate codeblock codeblock-length-{{ length }} {{ languages|map(language => "codeblock-#{language}")|join(' ') }} {{ css_classes }}">
1+
<div translate="no" data-loc="{{ loc }}" class="notranslate codeblock codeblock-length-{{ length }} {{ languages|map(language => "codeblock-#{language}")|join(' ') }}{% if custom_css_classes %} {{ custom_css_classes }}{% endif %}">
22
<div class="codeblock-scroll">
33
<pre class="codeblock-lines">{{ line_numbers }}</pre>
44
<pre class="codeblock-code"><code>{{ code|raw }}</code></pre>

‎tests/fixtures/expected/blocks/code-blocks/bash.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div translate="no" data-loc="1" class="notranslate codeblock codeblock-length-sm codeblock-bash ">
1+
<div translate="no" data-loc="1" class="notranslate codeblock codeblock-length-sm codeblock-bash">
22
<div class="codeblock-scroll">
33
<pre class="codeblock-lines">1</pre>
44
<pre class="codeblock-code"><code>git <span class="hljs-built_in">clone</span> git@github.com:symfony/symfony.git</code></pre>

‎tests/fixtures/expected/blocks/code-blocks/diff.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div translate="no" data-loc="5" class="notranslate codeblock codeblock-length-sm codeblock-diff ">
1+
<div translate="no" data-loc="5" class="notranslate codeblock codeblock-length-sm codeblock-diff">
22
<div class="codeblock-scroll">
33
<pre class="codeblock-lines">1
44
2
@@ -17,7 +17,7 @@
1717
</div>
1818
</div>
1919

20-
<div translate="no" data-loc="6" class="notranslate codeblock codeblock-length-sm codeblock-diff ">
20+
<div translate="no" data-loc="6" class="notranslate codeblock codeblock-length-sm codeblock-diff">
2121
<div class="codeblock-scroll">
2222
<pre class="codeblock-lines">1
2323
2

‎tests/fixtures/expected/blocks/code-blocks/html-php.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div translate="no" data-loc="12" class="notranslate codeblock codeblock-length-md codeblock-html+php codeblock-html ">
1+
<div translate="no" data-loc="12" class="notranslate codeblock codeblock-length-md codeblock-html+php codeblock-html">
22
<div class="codeblock-scroll">
33
<pre class="codeblock-lines">1
44
2

‎tests/fixtures/expected/blocks/code-blocks/html-twig.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div translate="no" data-loc="2" class="notranslate codeblock codeblock-length-sm codeblock-html+twig codeblock-twig ">
1+
<div translate="no" data-loc="2" class="notranslate codeblock codeblock-length-sm codeblock-html+twig codeblock-twig">
22
<div class="codeblock-scroll">
33
<pre class="codeblock-lines">1
44
2</pre>

‎tests/fixtures/expected/blocks/code-blocks/html.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div translate="no" data-loc="1" class="notranslate codeblock codeblock-length-sm codeblock-html ">
1+
<div translate="no" data-loc="1" class="notranslate codeblock codeblock-length-sm codeblock-html">
22
<div class="codeblock-scroll">
33
<pre class="codeblock-lines">1</pre>
44
<pre class="codeblock-code"><code><span class="hljs-comment">&lt;!-- some code --&gt;</span>

‎tests/fixtures/expected/blocks/code-blocks/ini.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div translate="no" data-loc="1" class="notranslate codeblock codeblock-length-sm codeblock-ini ">
1+
<div translate="no" data-loc="1" class="notranslate codeblock codeblock-length-sm codeblock-ini">
22
<div class="codeblock-scroll">
33
<pre class="codeblock-lines">1</pre>
44
<pre class="codeblock-code"><code><span class="hljs-attr">fetch</span> = +refs/notes/*:refs/notes/*</code></pre>

‎tests/fixtures/expected/blocks/code-blocks/php-annotations.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div translate="no" data-loc="14" class="notranslate codeblock codeblock-length-md codeblock-php-annotations codeblock-php ">
1+
<div translate="no" data-loc="14" class="notranslate codeblock codeblock-length-md codeblock-php-annotations codeblock-php">
22
<div class="codeblock-scroll">
33
<pre class="codeblock-lines">1
44
2

‎tests/fixtures/expected/blocks/code-blocks/php.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div translate="no" data-loc="7" class="notranslate codeblock codeblock-length-sm codeblock-php ">
1+
<div translate="no" data-loc="7" class="notranslate codeblock codeblock-length-sm codeblock-php">
22
<div class="codeblock-scroll">
33
<pre class="codeblock-lines">1
44
2

‎tests/fixtures/expected/blocks/code-blocks/terminal.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
<div translate="no" data-loc="1" class="notranslate codeblock codeblock-length-sm codeblock-terminal codeblock-bash ">
1+
<div translate="no" data-loc="1" class="notranslate codeblock codeblock-length-sm codeblock-terminal codeblock-bash">
22
<div class="codeblock-scroll">
33
<pre class="codeblock-lines">1</pre>
44
<pre class="codeblock-code"><code>git <span
55
class="hljs-built_in">clone</span> git@github.com:symfony/symfony.git</code></pre>
66
</div>
77
</div>
8-
<div translate="no" data-loc="2" class="notranslate codeblock codeblock-length-sm codeblock-terminal codeblock-bash ">
8+
<div translate="no" data-loc="2" class="notranslate codeblock codeblock-length-sm codeblock-terminal codeblock-bash">
99
<div class="codeblock-scroll">
1010
<pre class="codeblock-lines">1
1111
2</pre>
@@ -20,7 +20,7 @@
2020
</div>
2121
</div>
2222

23-
<div translate="no" data-loc="3" class="notranslate codeblock codeblock-length-sm codeblock-terminal codeblock-bash ">
23+
<div translate="no" data-loc="3" class="notranslate codeblock codeblock-length-sm codeblock-terminal codeblock-bash">
2424
<div class="codeblock-scroll">
2525
<pre class="codeblock-lines">1
2626
2

‎tests/fixtures/expected/blocks/code-blocks/text.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div translate="no" data-loc="1" class="notranslate codeblock codeblock-length-sm codeblock-text ">
1+
<div translate="no" data-loc="1" class="notranslate codeblock codeblock-length-sm codeblock-text">
22
<div class="codeblock-scroll">
33
<pre class="codeblock-lines">1</pre>
44
<pre class="codeblock-code"><code>some text</code></pre>

‎tests/fixtures/expected/blocks/code-blocks/twig.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div translate="no" data-loc="1" class="notranslate codeblock codeblock-length-sm codeblock-twig ">
1+
<div translate="no" data-loc="1" class="notranslate codeblock codeblock-length-sm codeblock-twig">
22
<div class="codeblock-scroll">
33
<pre class="codeblock-lines">1</pre>
44
<pre class="codeblock-code"><code><span class="hljs-comment">{# some code #}</span></code></pre>

‎tests/fixtures/expected/blocks/code-blocks/xml.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div translate="no" data-loc="1" class="notranslate codeblock codeblock-length-sm codeblock-xml ">
1+
<div translate="no" data-loc="1" class="notranslate codeblock codeblock-length-sm codeblock-xml">
22
<div class="codeblock-scroll">
33
<pre class="codeblock-lines">1</pre>
44
<pre class="codeblock-code"><code><span class="hljs-comment">&lt;!-- some code --&gt;</span>

‎tests/fixtures/expected/blocks/code-blocks/yaml.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div translate="no" data-loc="1" class="notranslate codeblock codeblock-length-sm codeblock-yaml ">
1+
<div translate="no" data-loc="1" class="notranslate codeblock codeblock-length-sm codeblock-yaml">
22
<div class="codeblock-scroll">
33
<pre class="codeblock-lines">1</pre>
44
<pre class="codeblock-code"><code><span class="hljs-comment"># some code</span>

‎tests/fixtures/expected/blocks/directives/configuration-block.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44
<li data-language="php" > <span>PHP</span> </li>
55
</ul>
66
<div class="configuration-codeblock" data-language="yaml" style="">
7-
<div translate="no" data-loc="1" class="notranslate codeblock codeblock-length-sm codeblock-yaml ">
7+
<div translate="no" data-loc="1" class="notranslate codeblock codeblock-length-sm codeblock-yaml">
88
<div class="codeblock-scroll">
99
<pre class="codeblock-lines">1</pre>
1010
<pre class="codeblock-code"><code><span class="hljs-comment"># app/config/services.yml</span></code></pre>
1111
</div>
1212
</div>
1313
</div>
1414
<div class="configuration-codeblock" data-language="php" style="display: none">
15-
<div translate="no" data-loc="1" class="notranslate codeblock codeblock-length-sm codeblock-php ">
15+
<div translate="no" data-loc="1" class="notranslate codeblock codeblock-length-sm codeblock-php">
1616
<div class="codeblock-scroll">
1717
<pre class="codeblock-lines">1</pre>
1818
<pre class="codeblock-code"><code><span class="hljs-comment">// config/routes.php</span></code></pre>

‎tests/fixtures/expected/blocks/directives/note-code-block-nested.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<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>
44
<span>Note</span>
55
</p><p>test</p>
6-
<div translate="no" data-loc="1" class="notranslate codeblock codeblock-length-sm codeblock-php ">
6+
<div translate="no" data-loc="1" class="notranslate codeblock codeblock-length-sm codeblock-php">
77
<div class="codeblock-scroll">
88
<pre class="codeblock-lines">1</pre>
99
<pre class="codeblock-code"><code><span class="hljs-comment">// code</span>

‎tests/fixtures/expected/blocks/directives/sidebar-code-block-nested.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<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>
2-
<div translate="no" data-loc="1" class="notranslate codeblock codeblock-length-sm codeblock-php ">
2+
<div translate="no" data-loc="1" class="notranslate codeblock codeblock-length-sm codeblock-php">
33
<div class="codeblock-scroll">
44
<pre class="codeblock-lines">1</pre>
55
<pre class="codeblock-code"><code><span class="hljs-comment">// some code</span>

‎tests/fixtures/expected/blocks/nodes/literal.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<p>here is some php code from literal:</p>
2-
<div translate="no" data-loc="7" class="notranslate codeblock codeblock-length-sm codeblock-php ">
2+
<div translate="no" data-loc="7" class="notranslate codeblock codeblock-length-sm codeblock-php">
33
<div class="codeblock-scroll">
44
<pre class="codeblock-lines">1
55
2

0 commit comments

Comments
 (0)