Merge pull request #145 from JunioraTeam/main

brendt · web-flow · commit d767c3c78399 · 2024-08-30T09:51:35.000+02:00
Fix for extra added spaces at the start of lines
diff --git a/src/Languages/Base/Injections/GutterInjection.php b/src/Languages/Base/Injections/GutterInjection.php
@@ -8,6 +8,7 @@
 use Tempest\Highlight\Highlighter;
 use Tempest\Highlight\Injection;
 use Tempest\Highlight\ParsedInjection;
+use Tempest\Highlight\TerminalTheme;
 
 final class GutterInjection implements Injection
 {
@@ -62,13 +63,14 @@ public function parse(string $content, Highlighter $highlighter): ParsedInjectio
             $gutterClass = 'hl-gutter' . ($hasClasses ? ' ' . $hasClasses : '');
 
             $lines[$i] = sprintf(
-                Escape::tokens('<span class="%s">%s</span> %s'),
+                Escape::tokens('<span class="%s">%s</span>%s%s'),
                 $gutterClass,
                 str_pad(
                     string: (string) $gutterNumber,
                     length: $gutterWidth,
                     pad_type: STR_PAD_LEFT,
                 ),
+                $highlighter->getTheme() instanceof TerminalTheme ? ' ' : '',
                 $line,
             );
         }
diff --git a/src/Themes/Css/andromeeda.css b/src/Themes/Css/andromeeda.css
@@ -72,6 +72,7 @@ pre, code {
     font-size: 0.9em;
     color: #555;
     padding: 0 1ch;
+    margin-right: 1ch;
     user-select: none;
 }
 
diff --git a/src/Themes/Css/aurora-x.css b/src/Themes/Css/aurora-x.css
@@ -72,6 +72,7 @@ pre, code {
     font-size: 0.9em;
     color: #555;
     padding: 0 1ch;
+    margin-right: 1ch;
     user-select: none;
 }
 
diff --git a/src/Themes/Css/ayu-dark.css b/src/Themes/Css/ayu-dark.css
@@ -72,6 +72,7 @@ pre, code {
     font-size: 0.9em;
     color: #555;
     padding: 0 1ch;
+    margin-right: 1ch;
     user-select: none;
 }
 
diff --git a/src/Themes/Css/catppuccin-frappe.css b/src/Themes/Css/catppuccin-frappe.css
@@ -72,6 +72,7 @@ pre, code {
     font-size: 0.9em;
     color: #555;
     padding: 0 1ch;
+    margin-right: 1ch;
     user-select: none;
 }
 
diff --git a/src/Themes/Css/catppuccin-latte.css b/src/Themes/Css/catppuccin-latte.css
@@ -72,6 +72,7 @@ pre, code {
     font-size: 0.9em;
     color: #555;
     padding: 0 1ch;
+    margin-right: 1ch;
     user-select: none;
 }
 
diff --git a/src/Themes/Css/catppuccin-macchiato.css b/src/Themes/Css/catppuccin-macchiato.css
@@ -72,6 +72,7 @@ pre, code {
     font-size: 0.9em;
     color: #555;
     padding: 0 1ch;
+    margin-right: 1ch;
     user-select: none;
 }
 
diff --git a/src/Themes/Css/catppuccin-mocha.css b/src/Themes/Css/catppuccin-mocha.css
@@ -72,6 +72,7 @@ pre, code {
     font-size: 0.9em;
     color: #555;
     padding: 0 1ch;
+    margin-right: 1ch;
     user-select: none;
 }
 
diff --git a/src/Themes/Css/dark-plus.css b/src/Themes/Css/dark-plus.css
@@ -72,6 +72,7 @@ pre, code {
     font-size: 0.9em;
     color: #555;
     padding: 0 1ch;
+    margin-right: 1ch;
     user-select: none;
 }
 
diff --git a/src/Themes/Css/dracula-soft.css b/src/Themes/Css/dracula-soft.css
@@ -72,6 +72,7 @@ pre, code {
     font-size: 0.9em;
     color: #555;
     padding: 0 1ch;
+    margin-right: 1ch;
     user-select: none;
 }
 
diff --git a/src/Themes/Css/dracula.css b/src/Themes/Css/dracula.css
@@ -72,6 +72,7 @@ pre, code {
     font-size: 0.9em;
     color: #555;
     padding: 0 1ch;
+    margin-right: 1ch;
     user-select: none;
 }
 
diff --git a/src/Themes/Css/github-dark-default.css b/src/Themes/Css/github-dark-default.css
@@ -72,6 +72,7 @@ pre, code {
     font-size: 0.9em;
     color: #555;
     padding: 0 1ch;
+    margin-right: 1ch;
     user-select: none;
 }
 
diff --git a/src/Themes/Css/github-dark-dimmed.css b/src/Themes/Css/github-dark-dimmed.css
@@ -72,6 +72,7 @@ pre, code {
     font-size: 0.9em;
     color: #555;
     padding: 0 1ch;
+    margin-right: 1ch;
     user-select: none;
 }
 
diff --git a/src/Themes/Css/github-dark.css b/src/Themes/Css/github-dark.css
@@ -72,6 +72,7 @@ pre, code {
     font-size: 0.9em;
     color: #555;
     padding: 0 1ch;
+    margin-right: 1ch;
     user-select: none;
 }
 
diff --git a/src/Themes/Css/github-light-default.css b/src/Themes/Css/github-light-default.css
@@ -72,6 +72,7 @@ pre, code {
     font-size: 0.9em;
     color: #555;
     padding: 0 1ch;
+    margin-right: 1ch;
     user-select: none;
 }
 
diff --git a/src/Themes/Css/github-light.css b/src/Themes/Css/github-light.css
@@ -72,6 +72,7 @@ pre, code {
     font-size: 0.9em;
     color: #555;
     padding: 0 1ch;
+    margin-right: 1ch;
     user-select: none;
 }
 
diff --git a/src/Themes/Css/highlight-light-lite.css b/src/Themes/Css/highlight-light-lite.css
@@ -64,6 +64,7 @@ pre, code {
     font-size: 0.9em;
     color: #555;
     padding: 0 1ch;
+    margin-right: 1ch;
     user-select: none;
 }
 
diff --git a/src/Themes/Css/houston.css b/src/Themes/Css/houston.css
@@ -72,6 +72,7 @@ pre, code {
     font-size: 0.9em;
     color: #555;
     padding: 0 1ch;
+    margin-right: 1ch;
     user-select: none;
 }
 
diff --git a/src/Themes/Css/inspired-github.css b/src/Themes/Css/inspired-github.css
@@ -81,6 +81,7 @@ pre, code {
     font-size: 0.9em;
     color: #b3b3b3;
     padding: 0 1ch;
+    margin-right: 1ch;
     user-select: none;
 }
 
diff --git a/src/Themes/Css/light-plus.css b/src/Themes/Css/light-plus.css
@@ -72,6 +72,7 @@ pre, code {
     font-size: 0.9em;
     color: #555;
     padding: 0 1ch;
+    margin-right: 1ch;
     user-select: none;
 }
 
diff --git a/src/Themes/Css/material-theme-darker.css b/src/Themes/Css/material-theme-darker.css
@@ -72,6 +72,7 @@ pre, code {
     font-size: 0.9em;
     color: #555;
     padding: 0 1ch;
+    margin-right: 1ch;
     user-select: none;
 }
 
diff --git a/src/Themes/Css/material-theme-lighter.css b/src/Themes/Css/material-theme-lighter.css
@@ -72,6 +72,7 @@ pre, code {
     font-size: 0.9em;
     color: #555;
     padding: 0 1ch;
+    margin-right: 1ch;
     user-select: none;
 }
 
diff --git a/src/Themes/Css/material-theme-ocean.css b/src/Themes/Css/material-theme-ocean.css
@@ -72,6 +72,7 @@ pre, code {
     font-size: 0.9em;
     color: #555;
     padding: 0 1ch;
+    margin-right: 1ch;
     user-select: none;
 }
 
diff --git a/src/Themes/Css/material-theme-palenight.css b/src/Themes/Css/material-theme-palenight.css
@@ -72,6 +72,7 @@ pre, code {
     font-size: 0.9em;
     color: #555;
     padding: 0 1ch;
+    margin-right: 1ch;
     user-select: none;
 }
 
diff --git a/src/Themes/Css/material-theme.css b/src/Themes/Css/material-theme.css
@@ -72,6 +72,7 @@ pre, code {
     font-size: 0.9em;
     color: #555;
     padding: 0 1ch;
+    margin-right: 1ch;
     user-select: none;
 }
 
diff --git a/src/Themes/Css/min-dark.css b/src/Themes/Css/min-dark.css
@@ -72,6 +72,7 @@ pre, code {
     font-size: 0.9em;
     color: #555;
     padding: 0 1ch;
+    margin-right: 1ch;
     user-select: none;
 }
 
diff --git a/src/Themes/Css/min-light.css b/src/Themes/Css/min-light.css
@@ -72,6 +72,7 @@ pre, code {
     font-size: 0.9em;
     color: #555;
     padding: 0 1ch;
+    margin-right: 1ch;
     user-select: none;
 }
 
diff --git a/src/Themes/Css/monokai.css b/src/Themes/Css/monokai.css
@@ -72,6 +72,7 @@ pre, code {
     font-size: 0.9em;
     color: #555;
     padding: 0 1ch;
+    margin-right: 1ch;
     user-select: none;
 }
 
diff --git a/src/Themes/Css/night-owl.css b/src/Themes/Css/night-owl.css
@@ -72,6 +72,7 @@ pre, code {
     font-size: 0.9em;
     color: #555;
     padding: 0 1ch;
+    margin-right: 1ch;
     user-select: none;
 }
 
diff --git a/src/Themes/Css/nord.css b/src/Themes/Css/nord.css
@@ -72,6 +72,7 @@ pre, code {
     font-size: 0.9em;
     color: #555;
     padding: 0 1ch;
+    margin-right: 1ch;
     user-select: none;
 }
 
diff --git a/src/Themes/Css/one-dark-pro.css b/src/Themes/Css/one-dark-pro.css
@@ -72,6 +72,7 @@ pre, code {
     font-size: 0.9em;
     color: #555;
     padding: 0 1ch;
+    margin-right: 1ch;
     user-select: none;
 }
 
diff --git a/src/Themes/Css/poimandres.css b/src/Themes/Css/poimandres.css
@@ -72,6 +72,7 @@ pre, code {
     font-size: 0.9em;
     color: #555;
     padding: 0 1ch;
+    margin-right: 1ch;
     user-select: none;
 }
 
diff --git a/src/Themes/Css/red.css b/src/Themes/Css/red.css
@@ -72,6 +72,7 @@ pre, code {
     font-size: 0.9em;
     color: #555;
     padding: 0 1ch;
+    margin-right: 1ch;
     user-select: none;
 }
 
diff --git a/src/Themes/Css/rose-pine-dawn.css b/src/Themes/Css/rose-pine-dawn.css
@@ -72,6 +72,7 @@ pre, code {
     font-size: 0.9em;
     color: #555;
     padding: 0 1ch;
+    margin-right: 1ch;
     user-select: none;
 }
 
diff --git a/src/Themes/Css/rose-pine-moon.css b/src/Themes/Css/rose-pine-moon.css
@@ -72,6 +72,7 @@ pre, code {
     font-size: 0.9em;
     color: #555;
     padding: 0 1ch;
+    margin-right: 1ch;
     user-select: none;
 }
 
diff --git a/src/Themes/Css/rose-pine.css b/src/Themes/Css/rose-pine.css
@@ -72,6 +72,7 @@ pre, code {
     font-size: 0.9em;
     color: #555;
     padding: 0 1ch;
+    margin-right: 1ch;
     user-select: none;
 }
 
diff --git a/src/Themes/Css/slack-dark.css b/src/Themes/Css/slack-dark.css
@@ -72,6 +72,7 @@ pre, code {
     font-size: 0.9em;
     color: #555;
     padding: 0 1ch;
+    margin-right: 1ch;
     user-select: none;
 }
 
diff --git a/src/Themes/Css/slack-ochin.css b/src/Themes/Css/slack-ochin.css
@@ -72,6 +72,7 @@ pre, code {
     font-size: 0.9em;
     color: #555;
     padding: 0 1ch;
+    margin-right: 1ch;
     user-select: none;
 }
 
diff --git a/src/Themes/Css/solarized-dark.css b/src/Themes/Css/solarized-dark.css
@@ -72,6 +72,7 @@ pre, code {
     font-size: 0.9em;
     color: #555;
     padding: 0 1ch;
+    margin-right: 1ch;
     user-select: none;
 }
 
diff --git a/src/Themes/Css/solarized-light.css b/src/Themes/Css/solarized-light.css
@@ -72,6 +72,7 @@ pre, code {
     font-size: 0.9em;
     color: #555;
     padding: 0 1ch;
+    margin-right: 1ch;
     user-select: none;
 }
 
diff --git a/src/Themes/Css/synthwave-84.css b/src/Themes/Css/synthwave-84.css
@@ -72,6 +72,7 @@ pre, code {
     font-size: 0.9em;
     color: #555;
     padding: 0 1ch;
+    margin-right: 1ch;
     user-select: none;
 }
 
diff --git a/src/Themes/Css/tokyo-night.css b/src/Themes/Css/tokyo-night.css
@@ -72,6 +72,7 @@ pre, code {
     font-size: 0.9em;
     color: #555;
     padding: 0 1ch;
+    margin-right: 1ch;
     user-select: none;
 }
 
diff --git a/src/Themes/Css/vesper.css b/src/Themes/Css/vesper.css
@@ -72,6 +72,7 @@ pre, code {
     font-size: 0.9em;
     color: #555;
     padding: 0 1ch;
+    margin-right: 1ch;
     user-select: none;
 }
 
diff --git a/src/Themes/Css/vitesse-black.css b/src/Themes/Css/vitesse-black.css
@@ -72,6 +72,7 @@ pre, code {
     font-size: 0.9em;
     color: #555;
     padding: 0 1ch;
+    margin-right: 1ch;
     user-select: none;
 }
 
diff --git a/src/Themes/Css/vitesse-dark.css b/src/Themes/Css/vitesse-dark.css
@@ -72,6 +72,7 @@ pre, code {
     font-size: 0.9em;
     color: #555;
     padding: 0 1ch;
+    margin-right: 1ch;
     user-select: none;
 }
 
diff --git a/src/Themes/Css/vitesse-light.css b/src/Themes/Css/vitesse-light.css
@@ -72,6 +72,7 @@ pre, code {
     font-size: 0.9em;
     color: #555;
     padding: 0 1ch;
+    margin-right: 1ch;
     user-select: none;
 }
 
diff --git a/tests/CommonMark/CodeBlockRendererTest.php b/tests/CommonMark/CodeBlockRendererTest.php
@@ -53,7 +53,7 @@ class Foo {}
 TXT;
 
         $expected = <<<'TXT'
-<pre data-lang="php" class="notranslate"><span class="hl-gutter">10</span> <span class="hl-keyword">class</span> <span class="hl-type">Foo</span> {}</pre>
+<pre data-lang="php" class="notranslate"><span class="hl-gutter">10</span><span class="hl-keyword">class</span> <span class="hl-type">Foo</span> {}</pre>
 
 TXT;
 
diff --git a/tests/Languages/Base/Injections/GutterInjectionTest.php b/tests/Languages/Base/Injections/GutterInjectionTest.php

Original file line number	Diff line number	Diff line change
`@@ -72,6 +72,7 @@ pre, code {`
`72`	`72`	`font-size: 0.9em;`
`73`	`73`	`color: #555;`
`74`	`74`	`padding: 0 1ch;`
	`75`	`+ margin-right: 1ch;`
`75`	`76`	`user-select: none;`
`76`	`77`	`}`
`77`	`78`