Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix #171 - Class list for overview members is off #187

Merged
merged 2 commits into from
Dec 25, 2017
Merged

Fix #171 - Class list for overview members is off #187

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
edffd66
Fix #171 - Class list for overview members is off
wilzbach Dec 5, 2017
33ae2ac
Update HTML tests
wilzbach Dec 5, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions source/ddox/api.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ string getAttributeString(Declaration decl, AttributeStringKind kind)

enum AttributeStringKind { normal, functionPrefix, functionSuffix }

string[] declStyleClasses(Declaration decl)
auto declStyleClasses(Declaration decl)
{
string[] ret;
ret ~= decl.protection.to!string().toLower();
Expand All @@ -257,7 +257,7 @@ string[] declStyleClasses(Declaration decl)
if (tdecl.type.attributes.canFind("@property")) ret ~= "property";
if (tdecl.type.attributes.canFind("static")) ret ~= "static";
}
return ret;
return ret.join(" ");
}

string formatType()(CachedType type, scope string delegate(in Entity) link_to, bool include_code_tags = true)
Expand Down
2 changes: 1 addition & 1 deletion tests/issue110_xref_to_package_d/docs/test.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ <h2>Functions</h2>
<tr>
<td>
<code>
<a id="foo" class="[&quot;public&quot;]" href="./test/foo.html">foo</a><span class="decoration">()</span>
<a id="foo" class="public" href="./test/foo.html">foo</a><span class="decoration">()</span>
</code>
</td>
<td>Link to <code class="lang-d"><a href="./mod.html"><span class="pln">mod</span></a></code>.
Expand Down
4 changes: 2 additions & 2 deletions tests/issue116_inherit_macros/docs/test.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ <h2>Functions</h2>
<tr>
<td>
<code>
<a id="f" class="[&quot;public&quot;]" href="./test/f.html">f</a><span class="decoration">()</span>
<a id="f" class="public" href="./test/f.html">f</a><span class="decoration">()</span>
</code>
</td>
<td>module macro
Expand All @@ -58,7 +58,7 @@ <h2>Structs</h2>
<tr>
<td>
<code>
<a id="S" class="[&quot;public&quot;]" href="./test/S.html">S</a>
<a id="S" class="public" href="./test/S.html">S</a>
</code>
</td>
<td></td>
Expand Down
2 changes: 1 addition & 1 deletion tests/issue116_inherit_macros/docs/test/S.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ <h1>Struct S</h1><p></p>
</tr>
<tr>
<td>
<a href="../test/S.g.html" class="[&quot;public&quot;]">
<a href="../test/S.g.html" class="public">
<code>g</code>
</a>
</td>
Expand Down
2 changes: 1 addition & 1 deletion tests/issue151_derived/docs/file_hashes.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"index.html":"AA12F47D5707936509BC0F91DAA875B9","sitemap.xml":"C5C5EAA55FCB329A4B7A94A3DA8D5B60","test/CBase.func.html":"C9EE320D0C2E7447F4ACB60CA81D14E9","test/CDerived.func2.html":"7E34C8A3125FCE341F58D48270756C93","test/CBase.html":"44C1D314A55555CFC3616FA57146096F","test.html":"AD50C937AF681CA5188FCFF515A407AB","test/IDerived.html":"7F9F519982CAE6CB799DC9681B850475","test/IDerived.func2.html":"B9576721F73F36B365DC75A2794C2882","test/CDerived.html":"50D9F0B621C623EB8D27AEB3A98443AE","test/IBase.func.html":"F4810671B3A7815FA21744BD7723F187","test/IBase.html":"48E11AAE23D80C65E93030B287EF673C","symbols.js":"326743E878641FBFC479A7546F447796"}
{"index.html":"AA12F47D5707936509BC0F91DAA875B9","sitemap.xml":"C5C5EAA55FCB329A4B7A94A3DA8D5B60","test/CBase.func.html":"C9EE320D0C2E7447F4ACB60CA81D14E9","test/CDerived.func2.html":"7E34C8A3125FCE341F58D48270756C93","test/CBase.html":"FFB556B9FED83B9D9A22D2F5E2B30D25","test.html":"AF0EA41BD118D2588F446E6D48C24B55","test/IDerived.html":"02B1B25E8EE9B038F95D5B96AFCD3245","test/IDerived.func2.html":"B9576721F73F36B365DC75A2794C2882","test/CDerived.html":"18CF959072D9C1B14E5D3B53377A5B50","test/IBase.func.html":"F4810671B3A7815FA21744BD7723F187","test/IBase.html":"D89FB1224992FF8EE1BBA846B32D63FE","symbols.js":"326743E878641FBFC479A7546F447796"}
8 changes: 4 additions & 4 deletions tests/issue151_derived/docs/test.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ <h2>Interfaces</h2>
<tr>
<td>
<code>
<a id="IBase" class="[&quot;public&quot;]" href="./test/IBase.html">IBase</a>
<a id="IBase" class="public" href="./test/IBase.html">IBase</a>
</code>
</td>
<td>IBase
Expand All @@ -49,7 +49,7 @@ <h2>Interfaces</h2>
<tr>
<td>
<code>
<a id="IDerived" class="[&quot;public&quot;]" href="./test/IDerived.html">IDerived</a>
<a id="IDerived" class="public" href="./test/IDerived.html">IDerived</a>
</code>
</td>
<td>IDerived
Expand All @@ -67,7 +67,7 @@ <h2>Classes</h2>
<tr>
<td>
<code>
<a id="CBase" class="[&quot;public&quot;]" href="./test/CBase.html">CBase</a>
<a id="CBase" class="public" href="./test/CBase.html">CBase</a>
</code>
</td>
<td>CBase
Expand All @@ -76,7 +76,7 @@ <h2>Classes</h2>
<tr>
<td>
<code>
<a id="CDerived" class="[&quot;public&quot;]" href="./test/CDerived.html">CDerived</a>
<a id="CDerived" class="public" href="./test/CDerived.html">CDerived</a>
</code>
</td>
<td>CDerived
Expand Down
2 changes: 1 addition & 1 deletion tests/issue151_derived/docs/test/CBase.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ <h1>Class CBase</h1><p>CBase
</tr>
<tr>
<td>
<a href="../test/CBase.func.html" class="[&quot;public&quot;]">
<a href="../test/CBase.func.html" class="public">
<code>func</code>
</a>
</td>
Expand Down
4 changes: 2 additions & 2 deletions tests/issue151_derived/docs/test/CDerived.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,15 +48,15 @@ <h1>Class CDerived</h1><p>CDerived
</tr>
<tr>
<td>
<a href="../test/CDerived.func2.html" class="[&quot;public&quot;]">
<a href="../test/CDerived.func2.html" class="public">
<code>func2</code>
</a>
</td>
<td></td>
</tr>
<tr>
<td>
<a href="../test/CBase.func.html" class="[&quot;public&quot;, &quot;inherited&quot;]">
<a href="../test/CBase.func.html" class="public inherited">
<code>func</code>
</a>
</td>
Expand Down
2 changes: 1 addition & 1 deletion tests/issue151_derived/docs/test/IBase.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ <h1>Interface IBase</h1><p>IBase
</tr>
<tr>
<td>
<a href="../test/IBase.func.html" class="[&quot;public&quot;]">
<a href="../test/IBase.func.html" class="public">
<code>func</code>
</a>
</td>
Expand Down
4 changes: 2 additions & 2 deletions tests/issue151_derived/docs/test/IDerived.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,15 +48,15 @@ <h1>Interface IDerived</h1><p>IDerived
</tr>
<tr>
<td>
<a href="../test/IDerived.func2.html" class="[&quot;public&quot;]">
<a href="../test/IDerived.func2.html" class="public">
<code>func2</code>
</a>
</td>
<td></td>
</tr>
<tr>
<td>
<a href="../test/IBase.func.html" class="[&quot;public&quot;, &quot;inherited&quot;]">
<a href="../test/IBase.func.html" class="public inherited">
<code>func</code>
</a>
</td>
Expand Down
8 changes: 4 additions & 4 deletions tests/issue15_templates/docs/test.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ <h2>Templates</h2>
<tr>
<td>
<code>
<a id="isEqual" class="[&quot;public&quot;]" href="./test/isEqual.html">isEqual</a>
<a id="isEqual" class="public" href="./test/isEqual.html">isEqual</a>
</code>
</td>
<td>doc 3
Expand All @@ -57,7 +57,7 @@ <h2>Manifest constants</h2>
</tr>
<tr>
<td>
<a id="isEqual" class="[&quot;public&quot;]" href="./test/isEqual.html">
<a id="isEqual" class="public" href="./test/isEqual.html">
<code>isEqual</code>
</a>
</td>
Expand All @@ -68,7 +68,7 @@ <h2>Manifest constants</h2>
</tr>
<tr>
<td>
<a id="isValue" class="[&quot;public&quot;]" href="./test/isValue.html">
<a id="isValue" class="public" href="./test/isValue.html">
<code>isValue</code>
</a>
</td>
Expand All @@ -79,7 +79,7 @@ <h2>Manifest constants</h2>
</tr>
<tr>
<td>
<a id="isValue" class="[&quot;public&quot;]" href="./test/isValue.html">
<a id="isValue" class="public" href="./test/isValue.html">
<code>isValue</code>
</a>
</td>
Expand Down
2 changes: 1 addition & 1 deletion tests/issue174_enum_members/docs/test.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ <h2>Enums</h2>
<tr>
<td>
<code>
<a id="Enum" class="[&quot;public&quot;]" href="./test/Enum.html">Enum</a>
<a id="Enum" class="public" href="./test/Enum.html">Enum</a>
</code>
</td>
<td></td>
Expand Down
2 changes: 1 addition & 1 deletion tests/issue174_enum_members_2/docs/test.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ <h2>Enums</h2>
<tr>
<td>
<code>
<a id="Enum" class="[&quot;public&quot;]" href="./test/Enum.html">Enum</a>
<a id="Enum" class="public" href="./test/Enum.html">Enum</a>
</code>
</td>
<td></td>
Expand Down
24 changes: 12 additions & 12 deletions tests/issue177_variadic/docs/test.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ <h2>Functions</h2>
<tr>
<td>
<code>
<a id="bug" class="[&quot;public&quot;]" href="./test/bug.html">bug</a><span class="decoration">(args)</span>
<a id="bug" class="public" href="./test/bug.html">bug</a><span class="decoration">(args)</span>
</code>
</td>
<td></td>
Expand All @@ -57,7 +57,7 @@ <h2>Classes</h2>
<tr>
<td>
<code>
<a id="C" class="[&quot;public&quot;]" href="./test/C.html">C</a>
<a id="C" class="public" href="./test/C.html">C</a>
</code>
</td>
<td></td>
Expand All @@ -73,7 +73,7 @@ <h2>Global variables</h2>
</tr>
<tr>
<td>
<a id="var1" class="[&quot;public&quot;]" href="./test/var1.html">
<a id="var1" class="public" href="./test/var1.html">
<code>var1</code>
</a>
</td>
Expand All @@ -84,7 +84,7 @@ <h2>Global variables</h2>
</tr>
<tr>
<td>
<a id="var2" class="[&quot;public&quot;]" href="./test/var2.html">
<a id="var2" class="public" href="./test/var2.html">
<code>var2</code>
</a>
</td>
Expand All @@ -95,7 +95,7 @@ <h2>Global variables</h2>
</tr>
<tr>
<td>
<a id="var3" class="[&quot;public&quot;]" href="./test/var3.html">
<a id="var3" class="public" href="./test/var3.html">
<code>var3</code>
</a>
</td>
Expand All @@ -106,7 +106,7 @@ <h2>Global variables</h2>
</tr>
<tr>
<td>
<a id="var4" class="[&quot;public&quot;]" href="./test/var4.html">
<a id="var4" class="public" href="./test/var4.html">
<code>var4</code>
</a>
</td>
Expand All @@ -117,7 +117,7 @@ <h2>Global variables</h2>
</tr>
<tr>
<td>
<a id="var5" class="[&quot;public&quot;]" href="./test/var5.html">
<a id="var5" class="public" href="./test/var5.html">
<code>var5</code>
</a>
</td>
Expand All @@ -137,7 +137,7 @@ <h2>Aliases</h2>
</tr>
<tr>
<td>
<a id="FT1" class="[&quot;public&quot;]" href="./test/FT1.html">
<a id="FT1" class="public" href="./test/FT1.html">
<code>FT1</code>
</a>
</td>
Expand All @@ -148,7 +148,7 @@ <h2>Aliases</h2>
</tr>
<tr>
<td>
<a id="FT2" class="[&quot;public&quot;]" href="./test/FT2.html">
<a id="FT2" class="public" href="./test/FT2.html">
<code>FT2</code>
</a>
</td>
Expand All @@ -159,7 +159,7 @@ <h2>Aliases</h2>
</tr>
<tr>
<td>
<a id="FT3" class="[&quot;public&quot;]" href="./test/FT3.html">
<a id="FT3" class="public" href="./test/FT3.html">
<code>FT3</code>
</a>
</td>
Expand All @@ -170,7 +170,7 @@ <h2>Aliases</h2>
</tr>
<tr>
<td>
<a id="FT4" class="[&quot;public&quot;]" href="./test/FT4.html">
<a id="FT4" class="public" href="./test/FT4.html">
<code>FT4</code>
</a>
</td>
Expand All @@ -181,7 +181,7 @@ <h2>Aliases</h2>
</tr>
<tr>
<td>
<a id="FT5" class="[&quot;public&quot;]" href="./test/FT5.html">
<a id="FT5" class="public" href="./test/FT5.html">
<code>FT5</code>
</a>
</td>
Expand Down
4 changes: 2 additions & 2 deletions tests/issue180_return/docs/test.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ <h2>Functions</h2>
<tr>
<td>
<code>
<a id="foo" class="[&quot;public&quot;]" href="./test/foo.html">foo</a><span class="decoration">(a)</span>
<a id="foo" class="public" href="./test/foo.html">foo</a><span class="decoration">(a)</span>
</code>
</td>
<td></td>
Expand All @@ -57,7 +57,7 @@ <h2>Structs</h2>
<tr>
<td>
<code>
<a id="S" class="[&quot;public&quot;]" href="./test/S.html">S</a>
<a id="S" class="public" href="./test/S.html">S</a>
</code>
</td>
<td></td>
Expand Down
4 changes: 2 additions & 2 deletions tests/issue180_return/docs/test/S.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ <h1>Struct S</h1><p></p>
</tr>
<tr>
<td>
<a href="../test/S.p.html" class="[&quot;public&quot;]"><code>p</code></a>
<a href="../test/S.p.html" class="public"><code>p</code></a>
</td>
<td class="typecol"><code class="prettyprint lang-d"><span class="typ">int</span><span class="pun">*</span></code></td><td></td>
</tr>
Expand All @@ -60,7 +60,7 @@ <h1>Struct S</h1><p></p>
</tr>
<tr>
<td>
<a href="../test/S.foo.html" class="[&quot;public&quot;]">
<a href="../test/S.foo.html" class="public">
<code>foo</code>
</a>
</td>
Expand Down
2 changes: 1 addition & 1 deletion tests/issue24_parens/docs/test.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ <h2>Global variables</h2>
</tr>
<tr>
<td>
<a id="a" class="[&quot;public&quot;]" href="./test/a.html">
<a id="a" class="public" href="./test/a.html">
<code>a</code>
</a>
</td>
Expand Down
4 changes: 2 additions & 2 deletions tests/issue31_template_spec/docs/test.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,15 +40,15 @@ <h2>Functions</h2>
<tr>
<td>
<code>
<a id="consume" class="[&quot;public&quot;]" href="./test/consume.html">consume</a><span class="decoration">()</span>
<a id="consume" class="public" href="./test/consume.html">consume</a><span class="decoration">()</span>
</code>
</td>
<td></td>
</tr>
<tr>
<td>
<code>
<a id="consume" class="[&quot;public&quot;]" href="./test/consume.html">consume</a><span class="decoration">()</span>
<a id="consume" class="public" href="./test/consume.html">consume</a><span class="decoration">()</span>
</code>
</td>
<td></td>
Expand Down
4 changes: 2 additions & 2 deletions tests/issue33_global_ref/docs/test.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ <h2>Classes</h2>
<tr>
<td>
<code>
<a id="Test" class="[&quot;public&quot;]" href="./test/Test.html">Test</a>
<a id="Test" class="public" href="./test/Test.html">Test</a>
</code>
</td>
<td></td>
Expand All @@ -56,7 +56,7 @@ <h2>Global variables</h2>
</tr>
<tr>
<td>
<a id="f" class="[&quot;public&quot;]" href="./test/f.html">
<a id="f" class="public" href="./test/f.html">
<code>f</code>
</a>
</td>
Expand Down
Loading