Fix static keyword

tempestphp · Mar 20, 2024 · cb895f2 · cb895f2
1 parent 129d8ac
commit cb895f2
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/src/Languages/Php/Patterns/KeywordPattern.php b/src/Languages/Php/Patterns/KeywordPattern.php
@@ -27,7 +27,7 @@ public function caseInsensitive(): self
 
     public function getPattern(): string
     {
-        $pattern = "/\b(?<!\\$)(?<match>{$this->keyword})(\s|\()/";
+        $pattern = "/\b(?<!\\$)(?<match>{$this->keyword})(\:|\s|\()/";
 
         if ($this->caseInsensitive) {
             $pattern .= 'i';

diff --git a/src/Tokens/GroupTokens.php b/src/Tokens/GroupTokens.php
@@ -12,7 +12,7 @@
      */
     public function __invoke(array $tokens): array
     {
-        //        dump($tokens);
+//                dump($tokens);
         // Sort tokens in the right order
         usort($tokens, function (Token $a, Token $b) {
             if ($a->start === $b->start) {

diff --git a/tests/Languages/Php/PhpLanguageTest.php b/tests/Languages/Php/PhpLanguageTest.php
@@ -32,6 +32,7 @@ public static function data(): array
             ["public string|\Stringable \$message;", '<span class="hl-keyword">public</span> <span class="hl-type">string|\<span class="hl-type">Stringable</span></span> <span class="hl-property">$message</span>;'],
             ['for($x = 0; $x < 150; $x++) {', '<span class="hl-keyword">for</span>(<span class="hl-variable">$x</span> = 0; <span class="hl-variable">$x</span> &lt; 150; <span class="hl-variable">$x</span>++) {'],
             ["'namespace ';", "'<span class=\"hl-value\">namespace </span>';"],
+            ["static::foo()", '<span class="hl-keyword">static</span>::<span class="hl-property">foo</span>()'],
             ['$class', '<span class="hl-variable">$class</span>'],
             ['protected $resolved = [];', '<span class="hl-keyword">protected</span> <span class="hl-property">$resolved</span> = [];'],
             ['protected Foo $resolved = [];', '<span class="hl-keyword">protected</span> <span class="hl-type">Foo</span> <span class="hl-property">$resolved</span> = [];'],

diff --git a/tests/test.md b/tests/test.md
@@ -1,5 +1,3 @@
 ```php
-$foo && $bar 
-$foo || $bar 
-$foo <=> $bar 
+static::$instance
 ```