Merge pull request #10 from jolicode/fix/html-siblings-fenced-code

Fix HTML fenced code siblings management

src/Fixer/HtmlBlockFixer.php

@@ -84,8 +84,12 @@ protected function applyReplacementNodes(iterable $nodes, array $replacements):
                                 $exploded = explode($key, $newNode->getLiteral());
 
                                 if (2 === \count($exploded)) {
-                                    $className = $newNode::class;
-                                    $newNodes = [...\array_slice($newNodes, 0, $newNodeKey), new $className($exploded[0]), $replacement, new $className($exploded[1]), ...\array_slice($newNodes, $newNodeKey + 1)];
+                                    if ($newNode instanceof FencedCode) {
+                                        $newNode->setLiteral(str_replace($key, '', $newNode->getLiteral()));
+                                    } else {
+                                        $className = $newNode::class;
+                                        $newNodes = [...\array_slice($newNodes, 0, $newNodeKey), new $className($exploded[0]), $replacement, new $className($exploded[1]), ...\array_slice($newNodes, $newNodeKey + 1)];
+                                    }
                                 }
                             }
                         }

tests/data/attribute-class-in.md

@@ -0,0 +1,11 @@
+{class="some-class(value)"}
+[Some text here!](/link){class="link(variant)" target="_blank"}
+
+{.-hello}
+Some text
+
+{.smile-😎 .yolo}
+Some text
+
+{id="smile-😎"}
+Some text

tests/data/attribute-class-out.html

@@ -0,0 +1,4 @@
+<p class="some-class(value)"><a class="link(variant)" target="_blank" href="/link" rel="noopener noreferrer">Some text here!</a></p>
+<p class="-hello">Some text</p>
+<p class="smile-😎 yolo">Some text</p>
+<p id="smile-😎">Some text</p>

tests/data/attribute-class-out.md

@@ -0,0 +1,11 @@
+{.some-class(value)}
+[Some text here!](/link){.link(variant) target="_blank"}
+
+{.-hello}
+Some text
+
+{.smile-😎 .yolo}
+Some text
+
+{#smile-😎}
+Some text

tests/data/html-siblings-in.md

@@ -0,0 +1,20 @@
+# First case
+
+<p>Intro</p>
+
+<pre><code>Multiline
+
+code</code></pre>
+
+# Second case
+
+<p>Intro</p>
+<pre><code>Multiline
+code</code></pre>
+
+# Third case
+
+<p>Intro</p>
+<pre><code>Multiline
+
+code</code></pre>

tests/data/html-siblings-out.html

@@ -0,0 +1,16 @@
+<h1>First case</h1>
+<p>Intro</p>
+<pre><code>Multiline
+
+code
+</code></pre>
+<h1>Second case</h1>
+<p>Intro</p>
+<pre><code>Multiline
+code
+</code></pre>
+<h1>Third case</h1>
+<p>Intro</p>
+<pre><code>Multiline
+</code></pre>
+<p>code</p>

tests/data/html-siblings-out.md

@@ -0,0 +1,28 @@
+# First case
+
+Intro
+
+```
+Multiline
+
+code
+```
+
+# Second case
+
+Intro
+
+```
+Multiline
+code
+```
+
+# Third case
+
+Intro
+
+```
+Multiline
+```
+
+code

tests/data/ordered_lists-in.md

@@ -0,0 +1,6 @@
+1. one
+1. two
+1. three
+    1. three dot one
+    1. three dot two
+1. four

tests/data/ordered_lists-out.html

@@ -0,0 +1,11 @@
+<ol>
+<li>one</li>
+<li>two</li>
+<li>three
+<ol>
+<li>three dot one</li>
+<li>three dot two</li>
+</ol>
+</li>
+<li>four</li>
+</ol>

tests/data/ordered_lists-out.md

@@ -0,0 +1,6 @@
+1. one
+2. two
+3. three
+    1. three dot one
+    2. three dot two
+4. four

tests/data/pre-broken-in.md

@@ -0,0 +1,6 @@
+<p>Header</p>
+<pre><code>Some code
+
+Broken
+
+<p>Footer</p>

tests/data/pre-broken-out.html

@@ -0,0 +1,6 @@
+<p>Header</p>
+<pre><code>Some code
+
+Broken
+
+<p>Footer</p></code></pre>

tests/data/pre-broken-out.md

@@ -0,0 +1,7 @@
+Header
+
+<pre><code>Some code
+
+Broken
+
+<p>Footer</p></code></pre>