Fix blade comments

tempestphp · May 2, 2024 · 6a2f9f7 · 6a2f9f7
1 parent 162a733
commit 6a2f9f7
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 5 deletions.
diff --git a/src/Languages/Base/Injections/DeletionInjection.php b/src/Languages/Base/Injections/DeletionInjection.php
@@ -18,7 +18,7 @@ public function parse(string $content, Highlighter $highlighter): ParsedInjectio
         $content = str_replace('❷span class=❹ignore❹❸{-❷/span❸', '{-', $content);
         $content = str_replace('❷span class=❹ignore❹❸-}❷/span❸', '-}', $content);
 
-        preg_match_all('/(\{-)((.|\n)*?)(-})/', $content, $matches, PREG_OFFSET_CAPTURE);
+        preg_match_all('/(\{-)(?!-)((.|\n)*?)(-})/', $content, $matches, PREG_OFFSET_CAPTURE);
 
         $parsedOffset = 0;
 

diff --git a/src/Languages/Base/Patterns/DeletionEndTokenPattern.php b/src/Languages/Base/Patterns/DeletionEndTokenPattern.php
@@ -11,13 +11,14 @@
 use Tempest\Highlight\Tokens\TokenType;
 
 #[PatternTest('{- pull_request_target: -}', '-}')]
+#[PatternTest('{-- pull_request_target: --}', null)]
 final readonly class DeletionEndTokenPattern implements Pattern
 {
     use IsPattern;
 
     public function getPattern(): string
     {
-        return '/(?<match>\-})/';
+        return '/(?<!-)(?<match>\-})/';
     }
 
     public function getTokenType(): TokenType

diff --git a/src/Languages/Base/Patterns/DeletionStartTokenPattern.php b/src/Languages/Base/Patterns/DeletionStartTokenPattern.php
@@ -11,13 +11,14 @@
 use Tempest\Highlight\Tokens\TokenType;
 
 #[PatternTest('{- pull_request_target: -}', '{-')]
+#[PatternTest('{-- pull_request_target: --}', null)]
 final readonly class DeletionStartTokenPattern implements Pattern
 {
     use IsPattern;
 
     public function getPattern(): string
     {
-        return '/(?<match>{\-)/';
+        return '/(?<match>{\-)(?!-)/';
     }
 
     public function getTokenType(): TokenType

diff --git a/tests/Languages/Blade/BladeLanguageTest.php b/tests/Languages/Blade/BladeLanguageTest.php
@@ -0,0 +1,30 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tempest\Highlight\Tests\Languages\Blade;
+
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\TestCase;
+use Tempest\Highlight\Highlighter;
+
+class BladeLanguageTest extends TestCase
+{
+    #[DataProvider('data')]
+    public function test_highlight(string $content, string $expected): void
+    {
+        $highlighter = new Highlighter();
+
+        $this->assertSame(
+            $expected,
+            $highlighter->parse($content, 'blade'),
+        );
+    }
+
+    public static function data(): array
+    {
+        return [
+            ['{{-- Blade comment --}}', '<span class="hl-comment">{{-- Blade comment --}}</span>'],
+        ];
+    }
+}
diff --git a/tests/targets/test.md b/tests/targets/test.md
@@ -1,3 +1,3 @@
-```php
-self::$staticProperty;
+```blade
+{{-- Blade comment --}}
 ```