Merge 5da306e into c510fce

jonschlinkert · Oct 17, 2019 · 9c03ec8 · 9c03ec8
2 parents c510fce + 5da306e
commit 9c03ec8
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/lib/rules.js b/lib/rules.js
@@ -67,7 +67,7 @@ rules.fence = function(tokens, idx, options, env, instance) {
     highlighted = escapeHtml(token.content);
   }
 
-  return '<pre><code' + langClass + '>'
+  return '<pre' + langClass + '><code' + langClass + '>'
         + highlighted
         + '</code></pre>'
         + getBreak(tokens, idx);

diff --git a/test/fixtures/commonmark/good.txt b/test/fixtures/commonmark/good.txt
@@ -1162,7 +1162,7 @@ def foo(x)
 end
 ```
 .
-<pre><code class="language-ruby">def foo(x)
+<pre class="language-ruby"><code class="language-ruby">def foo(x)
   return 3
 end
 </code></pre>
@@ -1178,7 +1178,7 @@ def foo(x)
 end
 ~~~~~~~
 .
-<pre><code class="language-ruby startline=3 $%@#$ ruby-example">def foo(x)
+<pre class="language-ruby startline=3 $%@#$ ruby-example"><code class="language-ruby startline=3 $%@#$ ruby-example">def foo(x)
   return 3
 end
 </code></pre>
@@ -1191,7 +1191,7 @@ src line: 1430
 ````;
 ````
 .
-<pre><code class="language-;"></code></pre>
+<pre class="language-;"><code class="language-;"></code></pre>
 .
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -3288,7 +3288,7 @@ src line: 3929
 foo
 ```
 .
-<pre><code class="language-foo+bar">foo
+<pre class="language-foo+bar"><code class="language-foo+bar">foo
 </code></pre>
 .
 
@@ -3383,7 +3383,7 @@ src line: 4040
 foo
 ```
 .
-<pre><code class="language-föö">foo
+<pre class="language-föö"><code class="language-föö">foo
 </code></pre>
 .
 

diff --git a/test/fixtures/commonmark/spec.txt b/test/fixtures/commonmark/spec.txt
@@ -1408,7 +1408,7 @@ def foo(x)
 end
 ```
 .
-<pre><code class="language-ruby">def foo(x)
+<pre class="language-ruby"><code class="language-ruby">def foo(x)
   return 3
 end
 </code></pre>
@@ -1421,7 +1421,7 @@ def foo(x)
 end
 ~~~~~~~
 .
-<pre><code class="language-ruby">def foo(x)
+<pre class="language-ruby"><code class="language-ruby">def foo(x)
   return 3
 end
 </code></pre>
@@ -1431,7 +1431,7 @@ end
 ````;
 ````
 .
-<pre><code class="language-;"></code></pre>
+<pre class="language-;"><code class="language-;"></code></pre>
 .
 
 Info strings for backtick code blocks cannot contain backticks:
@@ -3931,7 +3931,7 @@ blocks](#fenced-code-block):
 foo
 ```
 .
-<pre><code class="language-foo+bar">foo
+<pre class="language-foo+bar"><code class="language-foo+bar">foo
 </code></pre>
 .