implements, extends

tempestphp · Mar 20, 2024 · 6f86073 · 6f86073
1 parent 1ee03d6
commit 6f86073
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 28 deletions.
diff --git a/src/Languages/Php/Patterns/ExtendsPattern.php b/src/Languages/Php/Patterns/ExtendsPattern.php
@@ -6,15 +6,17 @@
 
 use Tempest\Highlight\IsPattern;
 use Tempest\Highlight\Pattern;
+use Tempest\Highlight\PatternTest;
 use Tempest\Highlight\Tokens\TokenType;
 
+#[PatternTest(input: 'extends Foo', output: 'Foo')]
 final readonly class ExtendsPattern implements Pattern
 {
     use IsPattern;
 
     public function getPattern(): string
     {
-        return 'extends\s(?<match>.*)';
+        return 'extends\s(?<match>[\w]+)';
     }
 
     public function getTokenType(): TokenType

diff --git a/src/Languages/Php/Patterns/ImplementsPattern.php b/src/Languages/Php/Patterns/ImplementsPattern.php
@@ -6,15 +6,18 @@
 
 use Tempest\Highlight\IsPattern;
 use Tempest\Highlight\Pattern;
+use Tempest\Highlight\PatternTest;
 use Tempest\Highlight\Tokens\TokenType;
 
+#[PatternTest(input: 'implements Foo', output: ' Foo')]
+#[PatternTest(input: 'implements Foo, Bar', output: ' Foo, Bar')]
 final readonly class ImplementsPattern implements Pattern
 {
     use IsPattern;
 
     public function getPattern(): string
     {
-        return 'implements\s(?<match>[\w]+)';
+        return 'implements(?<match>[\s\,\w]+)';
     }
 
     public function getTokenType(): TokenType

diff --git a/tests/Languages/Php/Patterns/ImplementsPatternTest.php b/tests/Languages/Php/Patterns/ImplementsPatternTest.php
diff --git a/tests/Languages/Php/PhpLanguageTest.php b/tests/Languages/Php/PhpLanguageTest.php
@@ -33,6 +33,7 @@ public static function data(): array
             ['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> = [];'],
             ['$concrete instanceof Closure', '$concrete <span class="hl-keyword">instanceof</span> <span class="hl-type">Closure</span>'],
+            ['extends Foo implements ArrayAccess, ContainerContract', '<span class="hl-keyword">extends</span> <span class="hl-type">Foo</span> <span class="hl-keyword">implements</span><span class="hl-type"> ArrayAccess, ContainerContract</span>'],
             [
                 "// We'll
 

diff --git a/tests/index.php b/tests/index.php
@@ -20,7 +20,7 @@
 
 $markdown = new MarkdownConverter($environment);
 
-$contents = $markdown->convert(file_get_contents(__DIR__ . '/test-big.md'))->getContent();
+$contents = $markdown->convert(file_get_contents(__DIR__ . '/test.md'))->getContent();
 
 ?>
 

diff --git a/tests/test.md b/tests/test.md
@@ -1,4 +1,6 @@
 ```php
-$abstract;
-$class
+extends Foo implements ArrayAccess, ContainerContract
+{
+
+}
 ```