Small fixes

tempestphp · Mar 21, 2024 · 04a546d · 04a546d
1 parent 986c73c
commit 04a546d
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 15 deletions.
diff --git a/README.md b/README.md
@@ -72,7 +72,6 @@ You can build your own CSS theme with just a couple of classes:
     color: #D14F57;
 }
 
-.hl-generic .hl-type,
 .hl-generic {
     color: #9D3AF6;
 }

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/Languages/Php/PhpLanguage.php b/src/Languages/Php/PhpLanguage.php
@@ -67,6 +67,9 @@ public function getPatterns(): array
             new OperatorPattern('\?'),
 
             // KEYWORDS
+            new KeywordPattern('null'),
+            new KeywordPattern('true'),
+            new KeywordPattern('false'),
             new KeywordPattern('__halt_compiler'),
             new KeywordPattern('abstract'),
             new KeywordPattern('and'),

diff --git a/src/Themes/highlight-light-lite.css b/src/Themes/highlight-light-lite.css
@@ -26,7 +26,6 @@
     color: var(--type-color);
 }
 
-.hl-generic .hl-type,
 .hl-generic {
     color: var(--generic-color);
 }

diff --git a/src/Themes/highlight-tempest.css b/src/Themes/highlight-tempest.css
@@ -26,7 +26,6 @@
     color: var(--type-color);
 }
 
-.hl-generic .hl-type,
 .hl-generic {
     color: var(--generic-color);
 }

diff --git a/src/Tokens/TokenType.php b/src/Tokens/TokenType.php
@@ -21,6 +21,8 @@ public function canContain(self $other): bool
     {
         return match ($this) {
             self::OPERATOR, self::VARIABLE, self::VALUE, self::INJECTION, self::COMMENT => false,
+            self::TYPE => ! in_array($other->value, [self::KEYWORD->value]),
+            self::GENERIC => ! in_array($other->value, [self::TYPE->value]),
             default => true,
         };
     }

diff --git a/tests/Languages/Php/PhpLanguageTest.php b/tests/Languages/Php/PhpLanguageTest.php
@@ -42,12 +42,17 @@ public static function data(): array
             ['use Illuminate\Contracts\Container\Container as ContainerContract', '<span class="hl-keyword">use</span> <span class="hl-type">Illuminate\Contracts\Container\Container</span> <span class="hl-keyword">as</span> <span class="hl-type">ContainerContract</span>'],
             ['$foo::class;', '<span class="hl-variable">$foo</span>::<span class="hl-keyword">class</span>;'],
             ['function ((Foo&Bar)|null $bar)', '<span class="hl-keyword">function</span> (<span class="hl-type">(Foo&amp;Bar)</span><span class="hl-type">|null</span> <span class="hl-variable">$bar</span>)'],
-            ['while (true) {', '<span class="hl-keyword">while</span> (true) {'],
+            ['function (Foo|false $bar)', '<span class="hl-keyword">function</span> (<span class="hl-type">Foo|false</span> <span class="hl-variable">$bar</span>)'],
+            ['function (Foo|true $bar)', '<span class="hl-keyword">function</span> (<span class="hl-type">Foo|true</span> <span class="hl-variable">$bar</span>)'],
+            ['while (true) {', '<span class="hl-keyword">while</span> (<span class="hl-keyword">true</span>) {'],
             ['catch (Foo|Bar) {}', '<span class="hl-keyword">catch</span> (<span class="hl-type">Foo|Bar</span>) {}'],
             ['fn&(', '<span class="hl-keyword">fn</span>&amp;('],
             ['enum Foo: string', '<span class="hl-keyword">enum</span> <span class="hl-type">Foo</span>: <span class="hl-type">string</span>'],
             ['case Foo;', '<span class="hl-keyword">case</span> <span class="hl-property">Foo</span>;'],
             ['$this->extends("View/base.view.php");', '<span class="hl-variable">$this</span>-&gt;<span class="hl-property">extends</span>(&quot;<span class="hl-value">View/base.view.php</span>&quot;);'],
+            ['$foo = null;', '<span class="hl-variable">$foo</span> = <span class="hl-keyword">null</span>;'],
+            ['$foo = true;', '<span class="hl-variable">$foo</span> = <span class="hl-keyword">true</span>;'],
+            ['$foo = false;', '<span class="hl-variable">$foo</span> = <span class="hl-keyword">false</span>;'],
             ['/** @var Foo $var */', '<span class="hl-comment">/** <span class="hl-value">@var</span> <span class="hl-type">Foo</span> <span class="hl-variable">$var</span> */</span>'],
             [
                 "// We'll

diff --git a/tests/test.md b/tests/test.md
@@ -1,11 +1,11 @@
-```json
-{
-    "name": "tempest/highlight",
-    "description": "Fast, extensible, server-side code highlighting",
-    "autoload": {
-        "psr-4": {
-            "Tempest\\Highlight\\": "src/"
-        }
-    }
-}
+```php
+$foo = null;
+$foo = true;
+$foo = false;
+while(true) {}
+
+function (Foo|null $bar);
+function (Foo|true $bar);
+function (Foo|false $bar);
+function ((Foo&Bar)|null $bar);
 ```