codewalker/marked
1
0
Fork 0
Code Pull Requests Actions Packages Releases Activity

Merge pull request #1011 from Feder1co5oave/fix-645

Browse Source 
Preserve trailing newlines in code fences
This commit is contained in:
Josh Bruce 2018-01-12 17:10:26 -05:00 committed by GitHub
commit 3668af8182
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/marked.js
View File

@ -76,7 +76,7 @@ block.normal = merge({}, block);
*/ */
block.gfm = merge({}, block.normal, { 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: /^/, paragraph: /^/,
heading: /^ *(#{1,6}) +([^\n]+?) *#* *(?:\n+|$)/ heading: /^ *(#{1,6}) +([^\n]+?) *#* *(?:\n+|$)/
}); });

6
test/new/gfm_code.html
View File

@ -8,3 +8,9 @@ console.log(a + &#39; world&#39;);</code></pre>
<p>How about a code block with only an empty line?</p> <p>How about a code block with only an empty line?</p>
<pre><code class="lang-js"> <pre><code class="lang-js">
</code></pre> </code></pre>
<p>With some trailing empty lines:</p>
<pre><code>ciao
</code></pre>

8
test/new/gfm_code.md
View File

@ -24,4 +24,12 @@ How about a code block with only an empty line?
```js ```js
```
With some trailing empty lines:
```
ciao
``` ```