Skip to content

Commit

Permalink
Fix GFM Example 116
Browse files Browse the repository at this point in the history
Only code fences made from backticks cannot have other backticks in the same line. Fences with tildes can have both tildes and backticks. This allows the tilde case to work correctly.

Also test for detection of these fences as they break or do not break paragraphs.
  • Loading branch information
calculuschild committed Feb 10, 2020
1 parent a42413d commit 63454d2
Show file tree
Hide file tree
Showing 5 changed files with 45 additions and 6 deletions.
4 changes: 2 additions & 2 deletions src/rules.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ const {
const block = {
newline: /^\n+/,
code: /^( {4}[^\n]+\n*)+/,
fences: /^ {0,3}(`{3,}|~{3,})([^`~\n]*)\n(?:|([\s\S]*?)\n)(?: {0,3}\1[~`]* *(?:\n+|$)|$)/,
fences: /^ {0,3}(`{3,}(?=[^`\n]*\n)|~{3,})([^\n]*)\n(?:|([\s\S]*?)\n)(?: {0,3}\1[~`]* *(?:\n+|$)|$)/,
hr: /^ {0,3}((?:- *){3,}|(?:_ *){3,}|(?:\* *){3,})(?:\n+|$)/,
heading: /^ {0,3}(#{1,6}) +([^\n]*?)(?: +#+)? *(?:\n+|$)/,
blockquote: /^( {0,3}> ?(paragraph|[^\n]*)(?:\n|$))+/,
Expand Down Expand Up @@ -72,7 +72,7 @@ block.paragraph = edit(block._paragraph)
.replace('heading', ' {0,3}#{1,6} +')
.replace('|lheading', '') // setex headings don't interrupt commonmark paragraphs
.replace('blockquote', ' {0,3}>')
.replace('fences', ' {0,3}(?:`{3,}|~{3,})[^`\\n]*\\n')
.replace('fences', ' {0,3}(?:`{3,}(?=[^`\\n]*\\n)|~{3,})[^\\n]*\\n')
.replace('list', ' {0,3}(?:[*+-]|1[.)]) ') // only lists starting from 1 can interrupt
.replace('html', '</?(?:tag)(?: +|\\n|/?>)|<(?:script|pre|style|!--)')
.replace('tag', block._tag) // pars can be interrupted by type (6) html blocks
Expand Down
3 changes: 1 addition & 2 deletions test/specs/commonmark/commonmark.0.29.json
Original file line number Diff line number Diff line change
Expand Up @@ -930,8 +930,7 @@
"example": 116,
"start_line": 1996,
"end_line": 2003,
"section": "Fenced code blocks",
"shouldFail": true
"section": "Fenced code blocks"
},
{
"markdown": "```\n``` aaa\n```\n",
Expand Down
3 changes: 1 addition & 2 deletions test/specs/gfm/commonmark.0.29.json
Original file line number Diff line number Diff line change
Expand Up @@ -930,8 +930,7 @@
"example": 116,
"start_line": 1996,
"end_line": 2003,
"section": "Fenced code blocks",
"shouldFail": true
"section": "Fenced code blocks"
},
{
"markdown": "```\n``` aaa\n```\n",
Expand Down
14 changes: 14 additions & 0 deletions test/specs/new/fences_breaking_paragraphs.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<p>A paragraph</p>
<pre><code class="language-A">Here is code in
backtick fences</code></pre>
<p>B paragraph</p>
<pre><code class="language-B">Here is code in
tilde fences</code></pre>
<p>C paragraph</p>
<pre><code class="language-`C~">Alternative
tilde fences</code></pre>
<p>D paragraph ```~D` Invalid use of backtick fences</p>
<pre><code>
This will be read as
part of a codeblock
that ends with the file</code></pre>
27 changes: 27 additions & 0 deletions test/specs/new/fences_breaking_paragraphs.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
A paragraph
```A
Here is code in
backtick fences
```

B paragraph
~~~B
Here is code in
tilde fences
~~~

C paragraph
~~~`C~
Alternative
tilde fences
~~~

D paragraph
```~D`
Invalid use of
backtick fences
```
This will be read as
part of a codeblock
that ends with the file

0 comments on commit 63454d2

Please sign in to comment.