Skip to content

Adding a span around code blocks that start with $ #78

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 19, 2021
Merged

Adding a span around code blocks that start with $ #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7da60e6
Adding a span around code blocks that start with $
weaverryan Mar 18, 2021
fd77b3b
Adding Windows terminal support and test case for comments
weaverryan Mar 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/Renderers/CodeNodeRenderer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,11 @@ public function render(): string
$highlightedCode = str_replace('<span class="hljs-variable">$', '<span class="hljs-variable"><span class="hljs-variable-other-marker">$</span>', $highlightedCode);
}

if ('terminal' === $language) {
$highlightedCode = preg_replace('/^\$/m', '<span class="hljs-prompt">$</span>', $highlightedCode);
$highlightedCode = preg_replace('/^C:\\\&gt;/m', '<span class="hljs-prompt">C:\&gt;</span>', $highlightedCode);
}

$numOfLines = \count(preg_split('/\r\n|\r|\n/', $highlightedCode));
$lines = implode("\n", range(1, $numOfLines - 1));

Expand Down
31 changes: 30 additions & 1 deletion tests/fixtures/expected/blocks/code-blocks/terminal.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,34 @@
</div>
</div>

<div translate="no" class="notranslate codeblock codeblock-loc-1 codeblock-terminal codeblock-bash">
<div class="codeblock-scroll">
<pre class="codeblock-lines">1
2</pre>
<pre class="codeblock-code">
<code>
<span class="hljs-prompt">$</span> cowsay
<span class="hljs-string">'eat more chicken'</span>
<span class="hljs-prompt">$</span> cowsay
<span class="hljs-string">'mmmm'</span>
</code>
</pre>
</div>
</div>

<div translate="no" class="notranslate codeblock codeblock-loc-1 codeblock-terminal codeblock-bash">
<div class="codeblock-scroll">
<pre class="codeblock-lines">1
2
3</pre>
<pre class="codeblock-code">
<code>
<span class="hljs-prompt">C:\&gt;</span> CIV
<span class="hljs-comment"># Civilization for DOS - my first computer game!</span>
</code>
</pre>
</div>
</div>

</body>
</html>
</html>
11 changes: 11 additions & 0 deletions tests/fixtures/source/blocks/code-blocks/terminal.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@

.. code-block:: terminal
git clone git@github.com:symfony/symfony.git

.. code-block:: terminal

$ cowsay 'eat more chicken'
$ cowsay 'mmmm'

.. code-block:: terminal

C:\> CIV

# Civilization for DOS - my first computer game!