Fix deletion markers conflicting with Twig whitespace control

Author: xHeaven

src/Languages/Base/Injections/DeletionInjection.php

@@ -22,7 +22,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;
 

src/Languages/Base/Patterns/DeletionEndTokenPattern.php

@@ -12,13 +12,14 @@
 
 #[PatternTest('{- pull_request_target: -}', '-}')]
 #[PatternTest('{-- pull_request_target: --}', null)]
+#[PatternTest('{{- variable -}}', null)]
 final readonly class DeletionEndTokenPattern implements Pattern
 {
     use IsPattern;
 
     public function getPattern(): string
     {
-        return '/(?<!-)(?<match>\-})/';
+        return '/(?<!-)(?<match>\-})(?!})/';
     }
 
     public function getTokenType(): TokenType

src/Languages/Base/Patterns/DeletionStartTokenPattern.php

@@ -12,13 +12,14 @@
 
 #[PatternTest('{- pull_request_target: -}', '{-')]
 #[PatternTest('{-- pull_request_target: --}', null)]
+#[PatternTest('{{- variable -}}', null)]
 final readonly class DeletionStartTokenPattern implements Pattern
 {
     use IsPattern;
 
     public function getPattern(): string
     {
-        return '/(?<match>{\-)(?!-)/';
+        return '/(?<!\{)(?<match>{\-)(?!-)/';
     }
 
     public function getTokenType(): TokenType

tests/Languages/Base/Injections/DeletionInjectionTest.php

@@ -25,4 +25,31 @@ public function test_deletion_injection()
 
         $this->assertSame($expected, Escape::html($parsedInjection->content));
     }
+
+    public function test_deletion_not_triggered_by_twig_whitespace_control()
+    {
+        $content = '{{- block(outerBlocks.content) -}}';
+
+        $parsedInjection = (new DeletionInjection())->parse($content, new Highlighter());
+
+        $this->assertSame($content, $parsedInjection->content);
+    }
+
+    public function test_deletion_not_triggered_when_preceded_by_brace()
+    {
+        $content = '{{- variable -}}';
+
+        $parsedInjection = (new DeletionInjection())->parse($content, new Highlighter());
+
+        $this->assertSame($content, $parsedInjection->content);
+    }
+
+    public function test_deletion_not_triggered_by_tag_whitespace_control()
+    {
+        $content = '{%- if true -%}';
+
+        $parsedInjection = (new DeletionInjection())->parse($content, new Highlighter());
+
+        $this->assertSame($content, $parsedInjection->content);
+    }
 }

tests/Languages/Twig/TwigLanguageTest.php

@@ -39,6 +39,7 @@ public static function provide_highlight_cases(): iterable
             ['<script>const mainSearchUrl = "";</script>', '&lt;<span class="hl-keyword">script</span>&gt;<span class="hl-keyword">const</span> mainSearchUrl = <span class="hl-value">&quot;&quot;</span>;&lt;/<span class="hl-keyword">script</span>&gt;'],
             ['{% cache "cache key" %}', '<span class="hl-injection">{% <span class="hl-keyword">cache</span> &quot;<span class="hl-value">cache key</span>&quot; %}</span>'],
             ['{{ "<b>foobar</b>"|data_uri(mime="text/html", parameters={charset: "ascii"}) }}', '<span class="hl-injection">{{ &quot;<span class="hl-value">&lt;b&gt;foobar&lt;/b&gt;</span>&quot;|<span class="hl-property">data_uri</span>(<span class="hl-property">mime</span>=&quot;<span class="hl-value">text/html</span>&quot;, <span class="hl-property">parameters</span>={<span class="hl-property">charset</span>: &quot;<span class="hl-value">ascii</span>&quot;}) }}</span>'],
+            ['{{- block(outerBlocks.content) -}}', '<span class="hl-injection">{{- <span class="hl-property">block</span>(outerBlocks.<span class="hl-property">content</span>) -}}</span>'],
         ];
     }
 }