Merge pull request #14655 from McSinyx/md-ol

autodoc: fix markdown list rendering
This commit is contained in:
Loris Cro 2023-02-20 16:33:00 +01:00 committed by GitHub
commit dfd182cc7a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -3319,14 +3319,16 @@ const NAV_MODES = {
} else if (line.text.startsWith("#")) {
line.type = "h1";
line.text = line.text.substr(1);
} else if (line.text.startsWith("-")) {
line.type = "ul";
line.text = line.text.substr(1);
} else if (line.text.match(/^\d+\..*$/)) {
// if line starts with {number}{dot}
const match = line.text.match(/(\d+)\./);
} else if (line.text.match(/^-[ \t]+.*$/)) {
// line starts with a hyphen, followed by spaces or tabs
const match = line.text.match(/^-[ \t]+/);
line.type = "ul";
line.text = line.text.substr(match[0].length);
} else if (line.text.match(/^\d+\.[ \t]+.*$/)) {
// line starts with {number}{dot}{spaces or tabs}
const match = line.text.match(/(\d+)\.[ \t]+/);
line.type = "ol";
line.text = line.text.substr(match[0].length);
line.ordered_number = Number(match[1].length);
} else if (line.text == "```") {
line.type = "skip";
@ -3536,7 +3538,7 @@ const NAV_MODES = {
case "ul":
case "ol":
if (
!previousLineIs("ul", line_no) ||
!previousLineIs(line.type, line_no) ||
getPreviousLineIndent(line_no) < line.indent
) {
html += "<" + line.type + ">\n";
@ -3545,7 +3547,7 @@ const NAV_MODES = {
html += "<li>" + markdownInlines(line.text) + "</li>\n";
if (
!nextLineIs("ul", line_no) ||
!nextLineIs(line.type, line_no) ||
getNextLineIndent(line_no) < line.indent
) {
html += "</" + line.type + ">\n";
@ -4067,4 +4069,4 @@ function toggleExpand(event) {
if (!parent.open && parent.getBoundingClientRect().top < 0) {
parent.parentElement.parentElement.scrollIntoView(true);
}
}
}