Merge pull request #915 from phpDocumentor/backport/1.x/pr-912

[1.x] Merge pull request #912 from phpDocumentor/bugfix/emphasize-lines

Author: phpdoc-bot

packages/guides-restructured-text/src/RestructuredText/Directives/OptionMapper/DefaultCodeNodeOptionMapper.php

@@ -21,6 +21,7 @@
 use Psr\Log\LoggerInterface;
 
 use function preg_match;
+use function sprintf;
 use function strval;
 use function trim;
 
@@ -30,8 +31,8 @@
  */
 final class DefaultCodeNodeOptionMapper implements CodeNodeOptionMapper
 {
-    /** @see https://regex101.com/r/I3KttH/1 */
-    public const LINE_NUMBER_RANGES_REGEX = '/^\d+(-\d+)?(?:,\s*\d+(-\d+)?)*$/';
+    /** @see https://regex101.com/r/czvfnV/2 */
+    public const LINE_NUMBER_RANGES_REGEX = '/^\d+(-\d*)?(?:,\s*\d+(-\d*)?)*$/';
 
     public function __construct(
         private readonly LoggerInterface $logger,
@@ -79,7 +80,10 @@ private function setEmphasizeLinesBasedOnOptions(array $options, CodeNode $node,
             $emphasizeLines = (string) $options['emphasize-lines']->getValue();
             if (!preg_match(self::LINE_NUMBER_RANGES_REGEX, $emphasizeLines)) {
                 // Input does not fit the pattern, log a warning
-                $this->logger->warning('Invalid value for option emphasize-lines. Expected format: \'1-5, 7, 33\'', $blockContext->getLoggerInformation());
+                $this->logger->warning(
+                    sprintf('Invalid value for option emphasize-lines: "%s". Expected format: \'1-5, 7, 33\'', $emphasizeLines),
+                    $blockContext->getLoggerInformation(),
+                );
             }
         }
 

tests/Integration/tests/code/code-block-emphasize/expected/index.html

@@ -7,6 +7,13 @@ <h1>Title</h1>
     print(&#039;This line is highlighted.&#039;)
     print(&#039;This one is not...&#039;)
     print(&#039;...but this one is.&#039;)</code></pre>
+            <pre><code class="language-yaml line-numbers" data-start="1" data-emphasize-lines="3-">Email:
+    formEditor:
+        predefinedDefaults:
+            defaultValue: &#039;&#039;
+            validators:
+                -
+                identifier: EmailAddress</code></pre>
     </div>
 
 <!-- content end -->

tests/Integration/tests/code/code-block-emphasize/input/index.rst

@@ -9,3 +9,15 @@ Title
         print('This line is highlighted.')
         print('This one is not...')
         print('...but this one is.')
+
+..  code-block:: yaml
+    :linenos:
+    :emphasize-lines: 3-
+
+    Email:
+        formEditor:
+            predefinedDefaults:
+                defaultValue: ''
+                validators:
+                    -
+                    identifier: EmailAddress