| ... | ... | @@ -1816,23 +1816,23 @@ const NAV_MODES = { |
| 1816 | 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 | 1820 | let indent = ""; |
| 1821 | | if (structObj.fields.length > 1 && opts.wantHtml) { |
| 1821 | if (structObj.field_types.length > 1 && opts.wantHtml) { |
| 1822 | 1822 | indent = " " |
| 1823 | 1823 | } |
| 1824 | | if (opts.indent && structObj.fields.length > 1) { |
| 1824 | if (opts.indent && structObj.field_types.length > 1) { |
| 1825 | 1825 | indent = opts.indent + indent; |
| 1826 | 1826 | } |
| 1827 | 1827 | let structNode = getAstNode(structObj.src); |
| 1828 | 1828 | let field_end = ","; |
| 1829 | | if (structObj.fields.length > 1 && opts.wantHtml) { |
| 1829 | if (structObj.field_types.length > 1 && opts.wantHtml) { |
| 1830 | 1830 | field_end += "</br>"; |
| 1831 | 1831 | } else { |
| 1832 | 1832 | field_end += " "; |
| 1833 | 1833 | } |
| 1834 | 1834 | |
| 1835 | | for (let i = 0; i < structObj.fields.length; i += 1) { |
| 1835 | for (let i = 0; i < structObj.field_types.length; i += 1) { |
| 1836 | 1836 | let fieldNode = getAstNode(structNode.fields[i]); |
| 1837 | 1837 | let fieldName = fieldNode.name; |
| 1838 | 1838 | let html = indent; |
| ... | ... | @@ -1840,18 +1840,22 @@ const NAV_MODES = { |
| 1840 | 1840 | html += escapeHtml(fieldName); |
| 1841 | 1841 | } |
| 1842 | 1842 | |
| 1843 | | let fieldTypeExpr = structObj.fields[i]; |
| 1843 | let fieldTypeExpr = structObj.field_types[i]; |
| 1844 | 1844 | if (!structObj.is_tuple) { |
| 1845 | 1845 | html += ": "; |
| 1846 | 1846 | } |
| 1847 | 1847 | |
| 1848 | 1848 | html += exprName(fieldTypeExpr, { ...opts, indent: indent }); |
| 1849 | 1849 | |
| 1850 | if (structObj.field_defaults[i] !== null) { |
| 1851 | html += " = " + exprName(structObj.field_defaults[i], opts); |
| 1852 | } |
| 1853 | |
| 1850 | 1854 | html += field_end; |
| 1851 | 1855 | |
| 1852 | 1856 | name += html; |
| 1853 | 1857 | } |
| 1854 | | if (opts.indent && structObj.fields.length > 1) { |
| 1858 | if (opts.indent && structObj.field_types.length > 1) { |
| 1855 | 1859 | name += opts.indent; |
| 1856 | 1860 | } |
| 1857 | 1861 | name += "}"; |
| ... | ... | @@ -1897,6 +1901,10 @@ const NAV_MODES = { |
| 1897 | 1901 | let fieldName = fieldNode.name; |
| 1898 | 1902 | let html = indent + escapeHtml(fieldName); |
| 1899 | 1903 | |
| 1904 | if (enumObj.values[i] !== null) { |
| 1905 | html += " = " + exprName(enumObj.values[i], opts); |
| 1906 | } |
| 1907 | |
| 1900 | 1908 | html += field_end; |
| 1901 | 1909 | |
| 1902 | 1910 | name += html; |
Loris Cro <kappaloris@gmail.com> 2023-04-17 20:14:57+02:00
GitHub <noreply@github.com> 2023-04-17 20:14:57+02:00
Signed by PGP key 4AEE18F83AFDEB23
lib