diff options
| author | Dmitry Jemerov <yole@jetbrains.com> | 2015-02-10 19:09:19 +0100 |
|---|---|---|
| committer | Dmitry Jemerov <yole@jetbrains.com> | 2015-02-10 19:09:19 +0100 |
| commit | a187baa606f1dd6ce63bc38247f4b5331d78f42b (patch) | |
| tree | 4d4290b107ae85ce735756bc04c21c812870d86d | |
| parent | 550efc262fbd678da3d08972280b41e666c68065 (diff) | |
| download | dokka-a187baa606f1dd6ce63bc38247f4b5331d78f42b.tar.gz dokka-a187baa606f1dd6ce63bc38247f4b5331d78f42b.tar.bz2 dokka-a187baa606f1dd6ce63bc38247f4b5331d78f42b.zip | |
consider ContentNodeLink nodes to be equal if they point to nodes with the same name (so that links to parameters with the same name in different overloads would still allow grouping)
| -rw-r--r-- | src/Model/Content.kt | 4 | ||||
| -rw-r--r-- | test/data/format/overloadsWithDescription.html | 2 | ||||
| -rw-r--r-- | test/data/format/overloadsWithDescription.kt | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/Model/Content.kt b/src/Model/Content.kt index f264d623..7a0f6c2e 100644 --- a/src/Model/Content.kt +++ b/src/Model/Content.kt @@ -40,10 +40,10 @@ public class ContentBlockCode() : ContentBlock() public class ContentNodeLink(val node : DocumentationNode) : ContentBlock() { override fun equals(other: Any?): Boolean = - super.equals(other) && other is ContentNodeLink && node == other.node + super.equals(other) && other is ContentNodeLink && node.name == other.node.name override fun hashCode(): Int = - children.hashCode() * 31 + node.hashCode() + children.hashCode() * 31 + node.name.hashCode() } public class ContentExternalLink(val href : String) : ContentBlock() { diff --git a/test/data/format/overloadsWithDescription.html b/test/data/format/overloadsWithDescription.html index 6b593fcd..37f5cd08 100644 --- a/test/data/format/overloadsWithDescription.html +++ b/test/data/format/overloadsWithDescription.html @@ -6,7 +6,7 @@ <a href="out.html">test</a> / <a href="out.html"></a> / <a href="out.html">f</a><br/> <br/> <h1>f</h1> -<pre><code><span class="keyword">fun </span><span class="identifier">f</span><span class="symbol">(</span><span class="identifier">x</span><span class="symbol">: </span><span class="identifier">Int</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">Unit</span></code></pre><pre><code><span class="keyword">fun </span><span class="identifier">f</span><span class="symbol">(</span><span class="identifier">x</span><span class="symbol">: </span><span class="identifier">String</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">Unit</span></code></pre><p>Performs an action on x.</p> +<pre><code><span class="keyword">fun </span><span class="identifier">f</span><span class="symbol">(</span><span class="identifier">x</span><span class="symbol">: </span><span class="identifier">Int</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">Unit</span></code></pre><pre><code><span class="keyword">fun </span><span class="identifier">f</span><span class="symbol">(</span><span class="identifier">x</span><span class="symbol">: </span><span class="identifier">String</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">Unit</span></code></pre><p>Performs an action on <a href="out.html">x</a>.</p> <br/> <br/> <h3>Description</h3> diff --git a/test/data/format/overloadsWithDescription.kt b/test/data/format/overloadsWithDescription.kt index 13c219a2..740e642f 100644 --- a/test/data/format/overloadsWithDescription.kt +++ b/test/data/format/overloadsWithDescription.kt @@ -1,5 +1,5 @@ /** - * Performs an action on x. + * Performs an action on [x]. * * This is a long description. * @param x the value to perform the action on. @@ -7,7 +7,7 @@ fun f(x: Int) { } /** - * Performs an action on x. + * Performs an action on [x]. * * This is a long description. * @param x the value to perform the action on. |