StarMirror/showdown
1
0
Fork 0
mirror of https://github.com/showdownjs/showdown.git synced 2024-03-22 13:30:55 +08:00
Code Issues Projects Releases Wiki Activity

improve setext heading compliance

Browse Source
This commit is contained in:
Estevão Soares dos Santos 2022-11-15 03:55:16 +00:00
parent 42959b78c1
commit d080d30011
1 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/subParsers/makehtml/heading.js
View File

@ -209,7 +209,7 @@
// let's find the hr edge case first // let's find the hr edge case first
if (showdown.helper.trimEnd(line1).match(hrCheckRgx)) { if (showdown.helper.trimEnd(line1).match(hrCheckRgx)) {
// it's the edge case, so it's a false positive // it's the edge case, so it's a false positive
prepend = showdown.subParser('makehtml.horizontalRule')(line1, options, globals); prepend = showdown.subParser('makehtml.horizontalRule')(line1, options, globals);
if (prepend !== line1) { if (prepend !== line1) {
// it's an oneliner list // it's an oneliner list
return prepend.trim() + '\n' + line4; return prepend.trim() + '\n' + line4;
@ -236,7 +236,6 @@
prepend = showdown.subParser('makehtml.blockquote')(line1, options, globals); prepend = showdown.subParser('makehtml.blockquote')(line1, options, globals);
if (prepend !== line1) { if (prepend !== line1) {
// it's an oneliner blockquote // it's an oneliner blockquote
return prepend.trim() + '\n' + line4; return prepend.trim() + '\n' + line4;
} }
} }
@ -302,11 +301,27 @@
nPrepend = showdown.subParser('makehtml.blockGamut')(multilineText, options, globals, 'makehtml.heading.setext'); nPrepend = showdown.subParser('makehtml.blockGamut')(multilineText, options, globals, 'makehtml.heading.setext');
if (nPrepend !== multilineText) { if (nPrepend !== multilineText) {
// we found a block, so it should take precedence // we found one or more blocks, so we need to reparse (blocks should take precendence though)
prepend += nPrepend; nPrepend = showdown.helper.trimEnd(nPrepend);
headingText = ''; // let's check if the last line is a parsed block
let newLines = nPrepend.trim().split('\n');
let nLastLine = newLines.pop().toString();
if (/^¨K\d+K$/.test(nLastLine) || /^\s*$/gm.test(nLastLine)) {
// everything before --- or === is a block or empty line, so it's a false positive
prepend += nPrepend;
headingText = '';
} else {
// the last line is something else... so let's look at the line before that
let toHeading = nLastLine;
nLastLine = newLines.pop().toString();
if (/^¨K\d+K$/.test(nLastLine) === false && /^\s*$/gm.test(nLastLine) === false) {
toHeading = nLastLine + '\n' + toHeading;
}
headingText = toHeading;
prepend = newLines.join('\n').trim();
}
} }
console.log(prepend);
} }
// trim stuff // trim stuff