Fix for blade echo highlighting within comments

tempestphp · Aug 27, 2024 · 7ee0367 · 7ee0367
1 parent 6ff070c
commit 7ee0367
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/UPGRADING.md b/UPGRADING.md
@@ -1,6 +1,7 @@
 ## 2.9.0
 
 - Fix for promoted property hooks (#110) 
+- Fix for blade echo highlighting within comments (#113) 
 
 ## 2.8.2
 

diff --git a/src/Languages/Blade/Injections/BladeEchoInjection.php b/src/Languages/Blade/Injections/BladeEchoInjection.php
@@ -14,7 +14,7 @@
 
     public function getPattern(): string
     {
-        return '({{)(?<match>.*)(}})';
+        return '({{(?!--))(?<match>.*)(}})';
     }
 
     public function parseContent(string $content, Highlighter $highlighter): string

diff --git a/tests/Languages/Blade/BladeLanguageTest.php b/tests/Languages/Blade/BladeLanguageTest.php
@@ -25,6 +25,7 @@ public static function data(): array
     {
         return [
             ['{{-- Blade comment --}}', '<span class="hl-comment">{{-- Blade comment --}}</span>'],
+            ['{{-- if --}}', '<span class="hl-comment">{{-- if --}}</span>'],
         ];
     }
 }
diff --git a/tests/targets/test.md b/tests/targets/test.md
@@ -1,5 +1,3 @@
-```php
-public function __construct(
-    public string $username { set => strtolower($value); }
-) {}
+```blade
+{{-- if --}}
 ```