authorgravatar for der.teufel.mail@gmail.comKrzysztof Wolicki <der.teufel.mail@gmail.com> 2023-04-16 01:29:20+02:00
committergravatar for der.teufel.mail@gmail.comKrzysztof Wolicki <der.teufel.mail@gmail.com> 2023-04-16 01:37:24+02:00
log421ad51dc0651952e24d46a89c83b2a2b45f7d24
tree5e357f3b63932e13a9cff67eb43ee7be7d337b69
parent23ac4dd87b740012ba33e8ab2ea6fb25c04b6268

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 = {
18161816 name = "struct { ";
18171817 }
18181818 }
1819 if (structObj.fields.length > 1 && opts.wantHtml) { name += "</br>"; }
1819 if (structObj.field_types.length > 1 && opts.wantHtml) { name += "</br>"; }
18201820 let indent = "";
1821 if (structObj.fields.length > 1 && opts.wantHtml) {
1821 if (structObj.field_types.length > 1 && opts.wantHtml) {
18221822 indent = "&nbsp;&nbsp;&nbsp;&nbsp;"
18231823 }
1824 if (opts.indent && structObj.fields.length > 1) {
1824 if (opts.indent && structObj.field_types.length > 1) {
18251825 indent = opts.indent + indent;
18261826 }
18271827 let structNode = getAstNode(structObj.src);
18281828 let field_end = ",";
1829 if (structObj.fields.length > 1 && opts.wantHtml) {
1829 if (structObj.field_types.length > 1 && opts.wantHtml) {
18301830 field_end += "</br>";
18311831 } else {
18321832 field_end += " ";
18331833 }
18341834
1835 for (let i = 0; i < structObj.fields.length; i += 1) {
1835 for (let i = 0; i < structObj.field_types.length; i += 1) {
18361836 let fieldNode = getAstNode(structNode.fields[i]);
18371837 let fieldName = fieldNode.name;
18381838 let html = indent;
......@@ -1840,18 +1840,22 @@ const NAV_MODES = {
18401840 html += escapeHtml(fieldName);
18411841 }
18421842
1843 let fieldTypeExpr = structObj.fields[i];
1843 let fieldTypeExpr = structObj.field_types[i];
18441844 if (!structObj.is_tuple) {
18451845 html += ": ";
18461846 }
18471847
18481848 html += exprName(fieldTypeExpr, { ...opts, indent: indent });
18491849
1850 if (structObj.field_defaults[i] !== null) {
1851 html += " = " + exprName(structObj.field_defaults[i], opts);
1852 }
1853
18501854 html += field_end;
18511855
18521856 name += html;
18531857 }
1854 if (opts.indent && structObj.fields.length > 1) {
1858 if (opts.indent && structObj.field_types.length > 1) {
18551859 name += opts.indent;
18561860 }
18571861 name += "}";
......@@ -1897,6 +1901,10 @@ const NAV_MODES = {
18971901 let fieldName = fieldNode.name;
18981902 let html = indent + escapeHtml(fieldName);
18991903
1904 if (enumObj.values[i] !== null) {
1905 html += " = " + exprName(enumObj.values[i], opts);
1906 }
1907
19001908 html += field_end;
19011909
19021910 name += html;