Fix for comments in function argument lists

UPGRADING.md

@@ -4,6 +4,7 @@
 - Fix for blade echo highlighting within comments (#113) 
 - Fix for static property types (#129)
 - Fix for attribute in promoted property (#133)
+- Fix for comments in function argument lists (#134)
 
 ## 2.8.2
 

src/Languages/Php/PhpTypeLanguage.php

@@ -7,9 +7,12 @@
 use Tempest\Highlight\Languages\Base\BaseLanguage;
 use Tempest\Highlight\Languages\Php\Injections\PhpAttributeInstanceInjection;
 use Tempest\Highlight\Languages\Php\Injections\PhpAttributePlainInjection;
+use Tempest\Highlight\Languages\Php\Injections\PhpDocCommentInjection;
 use Tempest\Highlight\Languages\Php\Patterns\ClassPropertyPattern;
 use Tempest\Highlight\Languages\Php\Patterns\KeywordPattern;
+use Tempest\Highlight\Languages\Php\Patterns\MultilineSingleDocCommentPattern;
 use Tempest\Highlight\Languages\Php\Patterns\NewObjectPattern;
+use Tempest\Highlight\Languages\Php\Patterns\SinglelineCommentPattern;
 use Tempest\Highlight\Languages\Php\Patterns\TypeForVariablePattern;
 
 final class PhpTypeLanguage extends BaseLanguage
@@ -25,6 +28,7 @@ public function getInjections(): array
             ...parent::getInjections(),
             new PhpAttributePlainInjection(),
             new PhpAttributeInstanceInjection(),
+            new PhpDocCommentInjection(),
         ];
     }
 
@@ -33,6 +37,10 @@ public function getPatterns(): array
         return [
             ...parent::getPatterns(),
 
+            // COMMENTS
+            new MultilineSingleDocCommentPattern(),
+            new SinglelineCommentPattern(),
+
             new KeywordPattern('public'),
             new KeywordPattern('private'),
             new KeywordPattern('protected'),

tests/Languages/Php/PhpLanguageTest.php

@@ -115,7 +115,26 @@ public function info(
     #[Lazy] public Author $author,
 ) {}', '<span class="hl-keyword">public</span> <span class="hl-keyword">function</span> <span class="hl-property">__construct</span>(<span class="hl-injection">
     <span class="hl-attribute">#[<span class="hl-type">Lazy</span>]</span> <span class="hl-keyword">public</span> <span class="hl-type">Author</span> <span class="hl-property">$author</span>,
-</span>) {}']
+</span>) {}'],
+            ['    public function __construct(
+        // Allow a union on a special "missing relation" type:
+        public Relation|Author $author,
+
+        // Making the relation nullable would be an option as well:
+        /** @var Chapter[] $chapters */
+        /**
+         * hello */
+        public ?array $chapters,
+    ) {}', '    <span class="hl-keyword">public</span> <span class="hl-keyword">function</span> <span class="hl-property">__construct</span>(<span class="hl-injection">
+        <span class="hl-comment">// Allow a union on a special &quot;missing relation&quot; type:</span>
+        <span class="hl-keyword">public</span> <span class="hl-type">Relation|Author</span> <span class="hl-property">$author</span>,
+
+        <span class="hl-comment">// Making the relation nullable would be an option as well:</span>
+        <span class="hl-comment">/** <span class="hl-value"><span class="hl-value">@var</span></span> <span class="hl-type">Chapter[]</span> <span class="hl-variable"><span class="hl-variable">$chapters</span></span> */</span>
+        <span class="hl-comment">/**
+         * hello */</span>
+        <span class="hl-keyword">public</span> <span class="hl-type">?array</span> <span class="hl-property">$chapters</span>,
+    </span>) {}'],
         ];
     }
 }

tests/targets/test.md

@@ -1,5 +1,12 @@
 ```php
-public function __construct(
-    #[Lazy] public Author $author,
-) {}
+    public function __construct(
+        // Allow a union on a special "missing relation" type:
+        public Relation|Author $author,
+
+        // Making the relation nullable would be an option as well:
+        /** @var Chapter[] $chapters */
+        /**
+         * hello */
+        public ?array $chapters,
+    ) {}
 ```