Merge pull request #1011 from Feder1co5oave/fix-645

Preserve trailing newlines in code fences
markedjs · Jan 12, 2018 · 3668af8 · 3668af8
2 parents 3175599 + 2c11624
commit 3668af8
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 1 deletion.
diff --git a/lib/marked.js b/lib/marked.js
@@ -76,7 +76,7 @@ block.normal = merge({}, block);
  */
 
 block.gfm = merge({}, block.normal, {
-  fences: /^ *(`{3,}|~{3,})[ \.]*(\S+)? *\n([\s\S]*?)\s*\1 *(?:\n+|$)/,
+  fences: /^ *(`{3,}|~{3,})[ \.]*(\S+)? *\n([\s\S]*?)\n? *\1 *(?:\n+|$)/,
   paragraph: /^/,
   heading: /^ *(#{1,6}) +([^\n]+?) *#* *(?:\n+|$)/
 });

diff --git a/test/new/gfm_code.html b/test/new/gfm_code.html
@@ -8,3 +8,9 @@
 <p>How about a code block with only an empty line?</p>
 <pre><code class="lang-js">
 </code></pre>
+
+<p>With some trailing empty lines:</p>
+<pre><code>ciao
+
+
+</code></pre>
diff --git a/test/new/gfm_code.md b/test/new/gfm_code.md
@@ -24,4 +24,12 @@ How about a code block with only an empty line?
 
 ```js
 
+```
+
+With some trailing empty lines:
+
+```
+ciao
+
+
 ```