Unwrap pre tags

Author: aarondfrancis

src/Blade/BladeManager.php

@@ -39,7 +39,11 @@ public static function openBlock($language = null, $code = null, $theme = null)
             $code = file_get_contents(resource_path($code));
         }
 
-        $block = Block::make()->setLanguage($language)->setTheme($theme);
+        $block = Block::make()->setLanguage($language);
+
+        if ($theme) {
+            $block->setTheme($theme);
+        }
 
         if ($code) {
             $block->setCode($code);
@@ -64,7 +68,7 @@ public static function closeBlock()
             // as the developer's code they'd like us to highlight.
             $code = ob_get_clean();
 
-            $block = $block->setCode($code);
+            $block = $block->setCode($code, $unrwapPreTags = true);
         }
 
         // Echo out a unique placeholder into the buffer, which is captured

src/Block.php

@@ -101,9 +101,24 @@ public function setTheme($theme)
      * @param $code
      * @return $this
      */
-    public function setCode($code)
+    public function setCode($code, $unwrapPreTags = false)
     {
-        $this->code = $this->clean($code);
+        $code = $this->clean($code);
+
+        if ($unwrapPreTags) {
+            $lines = explode("\n", $code);
+
+            if (trim(head($lines)) === '<pre>' && trim(last($lines)) === '</pre>') {
+                array_pop($lines);
+                array_shift($lines);
+
+                $code = implode("\n", $lines);
+
+                $code = $this->clean($code);
+            }
+        }
+
+        $this->code = $code;
 
         return $this;
     }
@@ -151,9 +166,7 @@ public function toRequestParams()
      */
     protected function clean($code)
     {
-        return $this->dedent(
-            Str::replaceLast("\n", '', $code)
-        );
+        return $this->dedent(rtrim($code));
     }
 
     /**