Dedent properly in certain situations

Author: aarondfrancis

src/Blade/CodeComponent.php

@@ -5,6 +5,7 @@
 
 namespace Torchlight\Blade;
 
+use Illuminate\Support\Str;
 use Illuminate\View\Component;
 use Torchlight\Block;
 use Torchlight\Torchlight;
@@ -19,6 +20,8 @@ class CodeComponent extends Component
 
     public $block;
 
+    protected $trimFixDelimiter = '##LARAVEL_TRIM_FIXER##';
+
     /**
      * Create a new component instance.
      *
@@ -36,11 +39,48 @@ public function __construct($language, $theme = null, $contents = null, $torchli
         $this->block = Block::make($torchlightId)->language($this->language)->theme($this->theme);
     }
 
+    public function withAttributes(array $attributes)
+    {
+        // By default Laravel trims slot content in the ManagesComponents
+        // trait. The line that does the trimming looks like this:
+        // `$defaultSlot = new HtmlString(trim(ob_get_clean()));`
+
+        // The problem with this is that when you have a Blade Component
+        // that is indented in this way:
+
+        // <pre>
+        //    <x-torchlight-code>
+        //        public function {
+        //            // test
+        //        }
+        //    </x-torchlight-code>
+        // </pre>
+
+        // Then Laravel will strip the leading whitespace off of the first
+        // line, of content making it impossible for us to know how
+        // much to dedent the rest of the code.
+
+        // We're hijacking this `withAttributes` method because it is called
+        // _after_ the buffer is opened but before the content. So we echo
+        // out some nonsense which will prevent Laravel from trimming
+        // the whitespace. We'll replace it later. We only do this
+        // if it's not a file-based-contents component.
+        if (is_null($this->contents)) {
+            echo $this->trimFixDelimiter;
+        }
+
+        return parent::withAttributes($attributes);
+    }
+
     public function capture($contents)
     {
         $contents = $contents ?: $this->contents;
         $contents = Torchlight::processFileContents($contents) ?: $contents;
 
+        if (Str::startsWith($contents, $this->trimFixDelimiter)) {
+            $contents = Str::replaceFirst($this->trimFixDelimiter, '', $contents);
+        }
+
         BladeManager::registerBlock($this->block->code($contents));
     }
 

tests/MiddlewareAndComponentTest.php

@@ -186,6 +186,37 @@ public function code_contents_can_be_a_file_2()
         });
     }
 
+    /** @test */
+    public function dedent_works_properly()
+    {
+        $this->withoutExceptionHandling();
+        $this->fakeNullResponse('component');
+
+        $response = $this->getView('dedent_works_properly.blade.php');
+
+        $result = "<code class=\"torchlight\" style=\"\"><div class='line'>public function {</div><div class='line'>    // test</div><div class='line'>}</div></code>";
+        $this->assertEquals(
+            "<pre>\n    $result</pre>\n<pre>$result</pre>\n<pre>$result</pre>",
+            $response->content()
+        );
+    }
+
+    /** @test */
+    public function two_code_in_one_pre()
+    {
+        $this->withoutExceptionHandling();
+        $this->fakeNullResponse('component');
+
+        $response = $this->getView('two-codes-in-one-tag.blade.php');
+
+        $result = "<code class=\"torchlight\" style=\"\"><div class='line'>public function {</div><div class='line'>    // test</div><div class='line'>}</div></code>";
+        $this->assertEquals(
+            "<pre>\n    $result    $result</pre>",
+            $response->content()
+        );
+    }
+
+
     /** @test */
     public function two_components_work()
     {

tests/Support/dedent_works_properly.blade.php

@@ -0,0 +1,16 @@
+<pre>
+    <x-torchlight-code torchlight-id='component' language='php'>
+        public function {
+            // test
+        }
+    </x-torchlight-code>
+</pre>
+<pre><x-torchlight-code torchlight-id='component' language='php'>
+    public function {
+        // test
+    }
+</x-torchlight-code></pre>
+<pre><x-torchlight-code torchlight-id='component' language='php'>public function {
+    // test
+}
+</x-torchlight-code></pre>

tests/Support/two-codes-in-one-tag.blade.php

@@ -0,0 +1,12 @@
+<pre>
+    <x-torchlight-code torchlight-id='component' language='php'>
+        public function {
+            // test
+        }
+    </x-torchlight-code>
+    <x-torchlight-code torchlight-id='component' language='php'>
+        public function {
+            // test
+        }
+    </x-torchlight-code>
+</pre>