Merge pull request #371 from tighten/drift/ignore-escaped-blade

Ignore escaped blade on `SpacesAroundBladeRenderContent` linters and formatters
tighten · Nov 29, 2024 · bb64e99 · bb64e99
2 parents adee126 + dc55f84
commit bb64e99
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 2 deletions.
diff --git a/src/Linters/SpacesAroundBladeRenderContent.php b/src/Linters/SpacesAroundBladeRenderContent.php
@@ -14,9 +14,9 @@ class SpacesAroundBladeRenderContent extends BaseLinter
     public const DESCRIPTION = 'Spaces around blade rendered content:'
         . '`{{1 + 1}}` -> `{{ 1 + 1 }}`';
 
-    public const SEARCH_NORMAL = '/\{\{\s*(.+?)\s*\}\}/';
+    public const SEARCH_NORMAL = '/(?<!@)\{\{\s*(.+?)\s*\}\}/';
 
-    public const SEARCH_RAW = '/\{\!\!\s*(.+?)\s*\!\!\}/';
+    public const SEARCH_RAW = '/(?<!@)\{\!\!\s*(.+?)\s*\!\!\}/';
 
     public function lint(Parser $parser)
     {

diff --git a/tests/Formatting/Formatters/SpacesAroundBladeRenderContentTest.php b/tests/Formatting/Formatters/SpacesAroundBladeRenderContentTest.php
@@ -189,4 +189,19 @@ public function catches_space_to_render_content_complex()
 
         $this->assertEquals($correctlyFormatted, $formatted);
     }
+
+    /** @test */
+    public function does_not_trigger_on_escaped_blade()
+    {
+        $file = <<<'file'
+            @{{NOT_BLADE}}
+            @{!!NOT_BLADE!!}
+            file;
+
+        $formatted = (new TFormat)->format(
+            new SpacesAroundBladeRenderContent($file)
+        );
+
+        $this->assertEquals($file, $formatted);
+    }
 }
diff --git a/tests/Linting/Linters/SpacesAroundBladeRenderContentTest.php b/tests/Linting/Linters/SpacesAroundBladeRenderContentTest.php
@@ -121,4 +121,19 @@ public function does_not_trigger_on_blade_comment()
 
         $this->assertEmpty($lints);
     }
+
+    /** @test */
+    public function does_not_trigger_on_escaped_blade()
+    {
+        $file = <<<'file'
+            @{{NOT_BLADE}}
+            @{!!NOT_BLADE!!}
+            file;
+
+        $lints = (new TLint)->lint(
+            new SpacesAroundBladeRenderContent($file)
+        );
+
+        $this->assertEmpty($lints);
+    }
 }