Merge pull request #88 from javiereguiluz/code_lines_tweak

Made the counting of code lines more robust

Author: weaverryan

src/Renderers/CodeNodeRenderer.php

@@ -53,7 +53,7 @@ public function __construct(CodeNode $codeNode, TemplateRenderer $templateRender
 
     public function render(): string
     {
-        $code = $this->codeNode->getValue();
+        $code = trim($this->codeNode->getValue());
         if ($this->codeNode->isRaw()) {
             return $code;
         }
@@ -80,7 +80,7 @@ public function render(): string
         }
 
         $numOfLines = \count(preg_split('/\r\n|\r|\n/', $highlightedCode));
-        $lines = implode("\n", range(1, $numOfLines - 1));
+        $lines = implode("\n", range(1, $numOfLines));
 
         return $this->templateRenderer->render(
             'code.html.twig',

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

@@ -1,7 +1,6 @@
 <div translate="no" class="notranslate codeblock codeblock-loc-1 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>
+        <pre class="codeblock-code"><code>git <span class="hljs-built_in">clone</span> git@github.com:symfony/symfony.git</code></pre>
     </div>
 </div>

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

@@ -1,7 +1,6 @@
 <div translate="no" class="notranslate codeblock codeblock-loc-1 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>
+        <pre class="codeblock-code"><code><span class="hljs-attr">fetch</span> = +refs/notes/*:refs/notes/*</code></pre>
     </div>
 </div>

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

@@ -27,7 +27,6 @@
      * )
      */</span>
     <span class="hljs-keyword">protected</span> <span class="hljs-variable"><span class="hljs-variable-other-marker">$</span>bankAccountNumber</span>;
-}
-</code></pre>
+}</code></pre>
     </div>
 </div>

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

@@ -13,7 +13,6 @@
 <span class="hljs-keyword">return</span> <span class="hljs-function"><span class="hljs-keyword">function</span> <span class="hljs-params">(RoutingConfigurator <span class="hljs-variable"><span class="hljs-variable-other-marker">$</span>routes</span>)</span> </span>{
     <span class="hljs-variable"><span class="hljs-variable-other-marker">$</span>routes</span><span class="hljs-operator">-&gt;</span>add(<span class="hljs-string">'about_us'</span>, [<span class="hljs-string">'nl'</span> =&gt; <span class="hljs-string">'/over-ons'</span>, <span class="hljs-string">'en'</span> =&gt; <span class="hljs-string">'/about-us'</span>])
         <span class="hljs-operator">-&gt;</span>controller(<span class="hljs-string">'App\Controller\CompanyController::about'</span>);
-};
-</code></pre>
+};</code></pre>
     </div>
 </div>

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

@@ -2,8 +2,7 @@
     <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>
+            class="hljs-built_in">clone</span> git@github.com:symfony/symfony.git</code></pre>
     </div>
 </div>
 <div translate="no" class="notranslate codeblock codeblock-loc-1 codeblock-terminal codeblock-bash">

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

@@ -1,7 +1,6 @@
 <div translate="no" class="notranslate codeblock codeblock-loc-1 codeblock-text">
     <div class="codeblock-scroll">
         <pre class="codeblock-lines">1</pre>
-        <pre class="codeblock-code"><code>some text
-</code></pre>
+        <pre class="codeblock-code"><code>some text</code></pre>
     </div>
 </div>

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

@@ -1,7 +1,6 @@
 <div translate="no" class="notranslate codeblock codeblock-loc-1 codeblock-twig">
     <div class="codeblock-scroll">
         <pre class="codeblock-lines">1</pre>
-        <pre class="codeblock-code"><code><span class="hljs-comment">{# some code #}</span><span class="xml">
-</span></code></pre>
+        <pre class="codeblock-code"><code><span class="hljs-comment">{# some code #}</span></code></pre>
     </div>
 </div>

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

@@ -14,8 +14,7 @@
 <span class="hljs-keyword">return</span> <span class="hljs-function"><span class="hljs-keyword">function</span> <span class="hljs-params">(RoutingConfigurator <span class="hljs-variable"><span class="hljs-variable-other-marker">$</span>routes</span>)</span> </span>{
     <span class="hljs-variable"><span class="hljs-variable-other-marker">$</span>routes</span><span class="hljs-operator">-&gt;</span>add(<span class="hljs-string">'about_us'</span>, [<span class="hljs-string">'nl'</span> =&gt; <span class="hljs-string">'/over-ons'</span>, <span class="hljs-string">'en'</span> =&gt; <span class="hljs-string">'/about-us'</span>])
         <span class="hljs-operator">-&gt;</span>controller(<span class="hljs-string">'App\Controller\CompanyController::about'</span>);
-};
-</code></pre>
+};</code></pre>
     </div>
 </div>
 <p>The CRUD controller of <code translate="no" class="notranslate">App\Entity\Example</code> must implement

tests/fixtures/expected/main/datetime.html

@@ -109,8 +109,7 @@ <h3 id="placeholder"><a class="headerlink" href="#placeholder" title="Permalink
 
 <span class="hljs-variable"><span class="hljs-variable-other-marker">$</span>builder</span><span class="hljs-operator">-&gt;</span>add(<span class="hljs-string">'startDateTime'</span>, DateTimeType<span class="hljs-operator">::</span>class, <span class="hljs-keyword">array</span>(
     <span class="hljs-string">'placeholder'</span> =&gt; <span class="hljs-string">'Select a value'</span>,
-));
-</code></pre>
+));</code></pre>
     </div>
 </div>
 <div class="admonition admonition-seealso ">