Merge pull request #8 from jolicode/fix/html-code-with-children

Do not transform HTML code blocks with multiple children
jolicode · Sep 26, 2023 · 9222e45 · 9222e45
2 parents 8ff6447 + a975f78
commit 9222e45
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 10 deletions.
diff --git a/src/Fixer/HtmlBlockFixer.php b/src/Fixer/HtmlBlockFixer.php
@@ -164,6 +164,11 @@ protected function buildNodeFromDomElement(\DOMNode $element, bool $allowLtrim =
                 }
             } elseif ('pre' === $element->tagName) {
                 foreach ($element->childNodes as $key => $child) {
+                    if (1 !== $child->childNodes->length) {
+                        $node = null;
+
+                        break;
+                    }
                     if ($child instanceof \DOMElement && 'code' === $child->tagName) {
                         $node = new FencedCode(0, '', 0);
                         $childAttributes = $this->getAttributes($child);

diff --git a/tests/data/code_block_html-out.html b/tests/data/code_block_html-out.html
@@ -1,10 +1,9 @@
 <pre><code class="language-javascript">{
-  &quot;example&quot;: &quot;example&quot;,
-  &quot;authors&quot;: [
-    &quot;John Appleseed &quot;
+  "example": "example",
+  "authors": [
+    "John Appleseed <john at="" example.com="">"
   ]
-}
-</code></pre>
+}</john></code></pre>
 <pre><code class="language-javascript">{
   &quot;example&quot;: &quot;example&quot;,
   &quot;authors&quot;: [

diff --git a/tests/data/code_block_html-out.md b/tests/data/code_block_html-out.md
@@ -1,11 +1,9 @@
-```javascript
-{
+<pre><code class="language-javascript">{
   "example": "example",
   "authors": [
-    "John Appleseed "
+    "John Appleseed <john at="" example.com="">"
   ]
-}
-```
+}</john></code></pre>
 
 ```javascript
 {

diff --git a/tests/data/html_code-in.md b/tests/data/html_code-in.md
@@ -0,0 +1,2 @@
+<pre><code class="language-bash">Some <strong>HTML</strong> goes here
+Some <em>HTML</em> goes here</code></pre>
diff --git a/tests/data/html_code-out.html b/tests/data/html_code-out.html
@@ -0,0 +1,2 @@
+<pre><code class="language-bash">Some <strong>HTML</strong> goes here
+Some <em>HTML</em> goes here</code></pre>
diff --git a/tests/data/html_code-out.md b/tests/data/html_code-out.md
@@ -0,0 +1,2 @@
+<pre><code class="language-bash">Some <strong>HTML</strong> goes here
+Some <em>HTML</em> goes here</code></pre>