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

fix: fix Setext continuation in blockquote (#3257)

Browse Source
This commit is contained in:
Tony Brix 2024-04-18 23:06:58 -06:00 committed by GitHub
parent a90223b680
commit e9f0eed707
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
8 changed files with 42 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Tokenizer.ts
View File

@ -156,7 +156,9 @@ export class _Tokenizer {
blockquote(src: string): Tokens.Blockquote | undefined { blockquote(src: string): Tokens.Blockquote | undefined {
const cap = this.rules.block.blockquote.exec(src); const cap = this.rules.block.blockquote.exec(src);
if (cap) { if (cap) {
const text = rtrim(cap[0].replace(/^ *>[ \t]?/gm, ''), '\n'); // precede setext continuation with 4 spaces so it isn't a setext
let text = cap[0].replace(/\n {0,3}((?:=+|-+) *)(?=\n|$)/g, '\n $1');
text = rtrim(text.replace(/^ *>[ \t]?/gm, ''), '\n');
const top = this.lexer.state.top; const top = this.lexer.state.top;
this.lexer.state.top = true; this.lexer.state.top = true;
const tokens = this.lexer.blockTokens(text); const tokens = this.lexer.blockTokens(text);

4
src/rules.ts
View File

@ -58,7 +58,7 @@ const html = edit(
const paragraph = edit(_paragraph) const paragraph = edit(_paragraph)
.replace('hr', hr) .replace('hr', hr)
.replace('heading', ' {0,3}#{1,6}(?:\\s|$)') .replace('heading', ' {0,3}#{1,6}(?:\\s|$)')
.replace('|lheading', '') // setex headings don't interrupt commonmark paragraphs .replace('|lheading', '') // setext headings don't interrupt commonmark paragraphs
.replace('|table', '') .replace('|table', '')
.replace('blockquote', ' {0,3}>') .replace('blockquote', ' {0,3}>')
.replace('fences', ' {0,3}(?:`{3,}(?=[^`\\n]*\\n)|~{3,})[^\\n]*\\n') .replace('fences', ' {0,3}(?:`{3,}(?=[^`\\n]*\\n)|~{3,})[^\\n]*\\n')
@ -117,7 +117,7 @@ const blockGfm: Record<BlockKeys, RegExp> = {
paragraph: edit(_paragraph) paragraph: edit(_paragraph)
.replace('hr', hr) .replace('hr', hr)
.replace('heading', ' {0,3}#{1,6}(?:\\s|$)') .replace('heading', ' {0,3}#{1,6}(?:\\s|$)')
.replace('|lheading', '') // setex headings don't interrupt commonmark paragraphs .replace('|lheading', '') // setext headings don't interrupt commonmark paragraphs
.replace('table', gfmTable) // interrupt paragraphs with table .replace('table', gfmTable) // interrupt paragraphs with table
.replace('blockquote', ' {0,3}>') .replace('blockquote', ' {0,3}>')
.replace('fences', ' {0,3}(?:`{3,}(?=[^`\\n]*\\n)|~{3,})[^\\n]*\\n') .replace('fences', ' {0,3}(?:`{3,}(?=[^`\\n]*\\n)|~{3,})[^\\n]*\\n')

3
test/specs/commonmark/commonmark.0.31.json
View File

@ -743,8 +743,7 @@
"example": 93, "example": 93,
"start_line": 1527, "start_line": 1527,
"end_line": 1537, "end_line": 1537,
"section": "Setext headings", "section": "Setext headings"
"shouldFail": true
}, },
{ {
"markdown": "- Foo\n---\n", "markdown": "- Foo\n---\n",

3
test/specs/gfm/commonmark.0.31.json
View File

@ -743,8 +743,7 @@
"example": 93, "example": 93,
"start_line": 1527, "start_line": 1527,
"end_line": 1537, "end_line": 1537,
"section": "Setext headings", "section": "Setext headings"
"shouldFail": true
}, },
{ {
"markdown": "- Foo\n---\n", "markdown": "- Foo\n---\n",

19
test/specs/new/blockquote_setext.html Normal file
View File

@ -0,0 +1,19 @@
<blockquote>
<p>not heading 1 ==</p>
</blockquote>
<blockquote>
<p>not heading 2 --</p>
</blockquote>
<blockquote>
<h1>heading 1</h1>
</blockquote>
<blockquote>
<h2>heading 2</h2>
</blockquote>
<blockquote>
<p>not heading 1 == not heading 2 with br<br />--</p>
</blockquote>

16
test/specs/new/blockquote_setext.md Normal file
View File

@ -0,0 +1,16 @@
> not heading 1
==
> not heading 2
--
> heading 1
> ==
> heading 2
> --
> not heading 1
==
> not heading 2 with br
--

2
test/specs/new/setext_no_blankline.html
View File

@ -4,8 +4,6 @@
<p>fenced code block</p> <p>fenced code block</p>
<pre><code>= <pre><code>=
</code></pre> </code></pre>
<blockquote><h1>blockquote</h1>
</blockquote>
<h3>heading</h3> <h3>heading</h3>
<p>=</p> <p>=</p>
<html> <html>

3
test/specs/new/setext_no_blankline.md
View File

@ -6,9 +6,6 @@ fenced code block
= =
``` ```
> blockquote
=
### heading ### heading
= =