authorgravatar for kappaloris@gmail.comLoris Cro <kappaloris@gmail.com> 2023-04-17 20:14:57+02:00
committergravatar for noreply@github.comGitHub <noreply@github.com> 2023-04-17 20:14:57+02:00
log3cd19dd89743ae55329f7f5573db4750f902e830
tree95fe3ccb0e0a6e0a25f8c2abca7b89c4f0757bb9
parent3d33a09069533e40f22095472eab15b1ef8798c9
parent421ad51dc0651952e24d46a89c83b2a2b45f7d24
signaturebadge-question-mark Signed by PGP key 4AEE18F83AFDEB23

Merge pull request #15304 from der-teufel-programming/autodoc-defaults

autodoc: Fix errors in main.js; add support for defaults in exprName

1 files changed, 15 insertions(+), 7 deletions(-)

lib/docs/main.js+15-7
...@@ -1816,23 +1816,23 @@ const NAV_MODES = {...@@ -1816,23 +1816,23 @@ const NAV_MODES = {
1816 name = "struct { ";1816 name = "struct { ";
1817 }1817 }
1818 }1818 }
1819 if (structObj.fields.length > 1 && opts.wantHtml) { name += "</br>"; }1819 if (structObj.field_types.length > 1 && opts.wantHtml) { name += "</br>"; }
1820 let indent = "";1820 let indent = "";
1821 if (structObj.fields.length > 1 && opts.wantHtml) {1821 if (structObj.field_types.length > 1 && opts.wantHtml) {
1822 indent = "&nbsp;&nbsp;&nbsp;&nbsp;"1822 indent = "&nbsp;&nbsp;&nbsp;&nbsp;"
1823 }1823 }
1824 if (opts.indent && structObj.fields.length > 1) {1824 if (opts.indent && structObj.field_types.length > 1) {
1825 indent = opts.indent + indent;1825 indent = opts.indent + indent;
1826 }1826 }
1827 let structNode = getAstNode(structObj.src);1827 let structNode = getAstNode(structObj.src);
1828 let field_end = ",";1828 let field_end = ",";
1829 if (structObj.fields.length > 1 && opts.wantHtml) {1829 if (structObj.field_types.length > 1 && opts.wantHtml) {
1830 field_end += "</br>";1830 field_end += "</br>";
1831 } else {1831 } else {
1832 field_end += " ";1832 field_end += " ";
1833 }1833 }
18341834
1835 for (let i = 0; i < structObj.fields.length; i += 1) {1835 for (let i = 0; i < structObj.field_types.length; i += 1) {
1836 let fieldNode = getAstNode(structNode.fields[i]);1836 let fieldNode = getAstNode(structNode.fields[i]);
1837 let fieldName = fieldNode.name;1837 let fieldName = fieldNode.name;
1838 let html = indent;1838 let html = indent;
...@@ -1840,18 +1840,22 @@ const NAV_MODES = {...@@ -1840,18 +1840,22 @@ const NAV_MODES = {
1840 html += escapeHtml(fieldName);1840 html += escapeHtml(fieldName);
1841 }1841 }
18421842
1843 let fieldTypeExpr = structObj.fields[i];1843 let fieldTypeExpr = structObj.field_types[i];
1844 if (!structObj.is_tuple) {1844 if (!structObj.is_tuple) {
1845 html += ": ";1845 html += ": ";
1846 }1846 }
18471847
1848 html += exprName(fieldTypeExpr, { ...opts, indent: indent });1848 html += exprName(fieldTypeExpr, { ...opts, indent: indent });
18491849
1850 if (structObj.field_defaults[i] !== null) {
1851 html += " = " + exprName(structObj.field_defaults[i], opts);
1852 }
1853
1850 html += field_end;1854 html += field_end;
18511855
1852 name += html;1856 name += html;
1853 }1857 }
1854 if (opts.indent && structObj.fields.length > 1) {1858 if (opts.indent && structObj.field_types.length > 1) {
1855 name += opts.indent;1859 name += opts.indent;
1856 }1860 }
1857 name += "}";1861 name += "}";
...@@ -1897,6 +1901,10 @@ const NAV_MODES = {...@@ -1897,6 +1901,10 @@ const NAV_MODES = {
1897 let fieldName = fieldNode.name;1901 let fieldName = fieldNode.name;
1898 let html = indent + escapeHtml(fieldName);1902 let html = indent + escapeHtml(fieldName);
18991903
1904 if (enumObj.values[i] !== null) {
1905 html += " = " + exprName(enumObj.values[i], opts);
1906 }
1907
1900 html += field_end;1908 html += field_end;
19011909
1902 name += html;1910 name += html;