Merge pull request #156 from tonysm/main

PHP Tags and Blade Namespaced Components

Author: brendt

src/Languages/Blade/BladeLanguage.php

@@ -9,6 +9,8 @@
 use Tempest\Highlight\Languages\Blade\Injections\BladePhpInjection;
 use Tempest\Highlight\Languages\Blade\Injections\BladeRawEchoInjection;
 use Tempest\Highlight\Languages\Blade\Patterns\BladeCommentPattern;
+use Tempest\Highlight\Languages\Blade\Patterns\BladeComponentCloseTagPattern;
+use Tempest\Highlight\Languages\Blade\Patterns\BladeComponentOpenTagPattern;
 use Tempest\Highlight\Languages\Blade\Patterns\BladeKeywordPattern;
 use Tempest\Highlight\Languages\Html\HtmlLanguage;
 
@@ -34,6 +36,8 @@ public function getPatterns(): array
     {
         return [
             ...parent::getPatterns(),
+            new BladeComponentOpenTagPattern(),
+            new BladeComponentCloseTagPattern(),
             new BladeKeywordPattern(),
             new BladeCommentPattern(),
         ];

src/Languages/Blade/Patterns/BladeComponentCloseTagPattern.php

@@ -0,0 +1,29 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tempest\Highlight\Languages\Blade\Patterns;
+
+use Tempest\Highlight\IsPattern;
+use Tempest\Highlight\Pattern;
+use Tempest\Highlight\PatternTest;
+use Tempest\Highlight\Tokens\TokenTypeEnum;
+
+#[PatternTest(input: '</a>', output: 'a')]
+#[PatternTest(input: '</x-hello>', output: 'x-hello')]
+#[PatternTest(input: '</x-hello::world>', output: 'x-hello::world')]
+#[PatternTest(input: '</x-hello::world.lorem>', output: 'x-hello::world.lorem')]
+final readonly class BladeComponentCloseTagPattern implements Pattern
+{
+    use IsPattern;
+
+    public function getPattern(): string
+    {
+        return '<\/(?<match>[\w\-\:\.]+)';
+    }
+
+    public function getTokenType(): TokenTypeEnum
+    {
+        return TokenTypeEnum::KEYWORD;
+    }
+}

src/Languages/Blade/Patterns/BladeComponentOpenTagPattern.php

@@ -0,0 +1,29 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tempest\Highlight\Languages\Blade\Patterns;
+
+use Tempest\Highlight\IsPattern;
+use Tempest\Highlight\Pattern;
+use Tempest\Highlight\PatternTest;
+use Tempest\Highlight\Tokens\TokenTypeEnum;
+
+#[PatternTest(input: '<a attr="">', output: 'a')]
+#[PatternTest(input: '<x-hello attr="">', output: 'x-hello')]
+#[PatternTest(input: '<x-hello::world attr="">', output: 'x-hello::world')]
+#[PatternTest(input: '<x-hello::world.lorem attr="">', output: 'x-hello::world.lorem')]
+final readonly class BladeComponentOpenTagPattern implements Pattern
+{
+    use IsPattern;
+
+    public function getPattern(): string
+    {
+        return '<(?<match>[\w\-\:\.]+)';
+    }
+
+    public function getTokenType(): TokenTypeEnum
+    {
+        return TokenTypeEnum::KEYWORD;
+    }
+}

src/Languages/Php/Patterns/PhpCloseTagPattern.php

@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tempest\Highlight\Languages\Php\Patterns;
+
+use Tempest\Highlight\IsPattern;
+use Tempest\Highlight\Pattern;
+use Tempest\Highlight\PatternTest;
+use Tempest\Highlight\Tokens\TokenTypeEnum;
+
+#[PatternTest(input: '?>', output: '?>')]
+final readonly class PhpCloseTagPattern implements Pattern
+{
+    use IsPattern;
+
+    public function getPattern(): string
+    {
+        return '(?<match>\?\>+)';
+    }
+
+    public function getTokenType(): TokenTypeEnum
+    {
+        return TokenTypeEnum::KEYWORD;
+    }
+}

src/Languages/Php/Patterns/PhpOpenTagPattern.php

@@ -0,0 +1,27 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tempest\Highlight\Languages\Php\Patterns;
+
+use Tempest\Highlight\IsPattern;
+use Tempest\Highlight\Pattern;
+use Tempest\Highlight\PatternTest;
+use Tempest\Highlight\Tokens\TokenTypeEnum;
+
+#[PatternTest(input: '<?php', output: '<?php')]
+#[PatternTest(input: '<?=', output: '<?=')]
+final readonly class PhpOpenTagPattern implements Pattern
+{
+    use IsPattern;
+
+    public function getPattern(): string
+    {
+        return '(?<match>\<\?[=|php]+)';
+    }
+
+    public function getTokenType(): TokenTypeEnum
+    {
+        return TokenTypeEnum::KEYWORD;
+    }
+}

src/Languages/Php/PhpLanguage.php

@@ -34,6 +34,8 @@
 use Tempest\Highlight\Languages\Php\Patterns\NestedFunctionCallPattern;
 use Tempest\Highlight\Languages\Php\Patterns\NewObjectPattern;
 use Tempest\Highlight\Languages\Php\Patterns\OperatorPattern;
+use Tempest\Highlight\Languages\Php\Patterns\PhpCloseTagPattern;
+use Tempest\Highlight\Languages\Php\Patterns\PhpOpenTagPattern;
 use Tempest\Highlight\Languages\Php\Patterns\PropertyAccessPattern;
 use Tempest\Highlight\Languages\Php\Patterns\PropertyHookGetPattern;
 use Tempest\Highlight\Languages\Php\Patterns\PropertyHookSetParameterTypePattern;
@@ -76,6 +78,8 @@ public function getPatterns(): array
         return [
             ...parent::getPatterns(),
 
+            new PhpOpenTagPattern(),
+            new PhpCloseTagPattern(),
             new UseFunctionNamePattern(),
             new UseFunctionPattern(),
             new ClassNamePattern(),