fix(documentator): Preprocessor regexp to find instruction when `<t…

…arget "value">`. Origin: 32e0d3b
LastDragon-ru · Jul 13, 2024 · 16686b9 · 16686b9
1 parent a0aba35
commit 16686b9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/packages/documentator/src/Preprocessor/Preprocessor.php b/packages/documentator/src/Preprocessor/Preprocessor.php
@@ -69,7 +69,7 @@ class Preprocessor {
     protected const Regexp  = <<<'REGEXP'
         /^
         (?P<expression>
-          \[(?P<instruction>[^\]=]+)(?:=[^]]+)?\]:\s(?P<target>(?:[^ ]+?)|(?:<[^>]+?>))
+          \[(?P<instruction>[^\]=]+)(?:=[^]]+)?\]:\s+(?P<target>(?:[^<][^ ]+?)|(?:<[^>]+?>))
           (?P<pBlock>\s(?:\(|(?P<pStart>['"]))(?P<parameters>.+?)(?:\)|(?P=pStart)))?
         )
         (?P<content>\R
@@ -141,7 +141,7 @@ public function process(string $path, string $string): string {
                 callback: function (array $matches) use (&$cache, $path): string {
                     // Hash
                     $instruction = $this->getInstruction($matches['instruction']);
-                    $target      = $matches['target'];
+                    $target      = trim($matches['target']);
                     $target      = str_starts_with($target, '<') && str_ends_with($target, '>')
                         ? mb_substr($target, 1, -1)
                         : rawurldecode($target);

diff --git a/packages/documentator/src/Preprocessor/PreprocessorTest.php b/packages/documentator/src/Preprocessor/PreprocessorTest.php
@@ -23,7 +23,7 @@ public function testProcess(): void {
 
             [unknown]: ./path/to/file
 
-            [empty]: ./path/to/file
+            [empty]: <./path/to/file "value">
 
             [processable]: ./path/to/file
 
@@ -101,11 +101,11 @@ public function testProcess(): void {
 
             [unknown]: ./path/to/file
 
-            [empty]: ./path/to/file
-            [//]: # (start: 8619b6a617a04e2b1ed8916cd29b8e9947a9157ffdef8d2e8a51fe60fbc13948)
+            [empty]: <./path/to/file "value">
+            [//]: # (start: 99c91ec6684e9a6f1353966bb4f72dd70ab4241618b106ef24da7cbaeb5dbfab)
             [//]: # (warning: Generated automatically. Do not edit.)
             [//]: # (empty)
-            [//]: # (end: 8619b6a617a04e2b1ed8916cd29b8e9947a9157ffdef8d2e8a51fe60fbc13948)
+            [//]: # (end: 99c91ec6684e9a6f1353966bb4f72dd70ab4241618b106ef24da7cbaeb5dbfab)
 
             [processable]: ./path/to/file
             [//]: # (start: 378a07bc67ecbe88f5d2f642e70681461f61d3f2f5e83379015b879110c83947)