commit a187baa606f1dd6ce63bc38247f4b5331d78f42b
author Dmitry Jemerov <yole@jetbrains.com> Tue Feb 10 19:09:19 2015 +0100
committer Dmitry Jemerov <yole@jetbrains.com> Tue Feb 10 19:09:19 2015 +0100
tree 4d4290b107ae85ce735756bc04c21c812870d86d
parent 550efc262fbd678da3d08972280b41e666c68065

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)

src/Model/Content.kt

diff --git a/src/Model/Content.kt b/src/Model/Content.kt
index f264d62..7a0f6c2 100644
--- a/src/Model/Content.kt
+++ b/src/Model/Content.kt
@@ -40,10 +40,10 @@
 
 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() {

test/data/format/overloadsWithDescription.html

diff --git a/test/data/format/overloadsWithDescription.html b/test/data/format/overloadsWithDescription.html
index 6b593fc..37f5cd0 100644
--- a/test/data/format/overloadsWithDescription.html
+++ b/test/data/format/overloadsWithDescription.html
@@ -6,7 +6,7 @@
 <a href="out.html">test</a>&nbsp;/&nbsp;<a href="out.html"></a>&nbsp;/&nbsp;<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>

test/data/format/overloadsWithDescription.kt

diff --git a/test/data/format/overloadsWithDescription.kt b/test/data/format/overloadsWithDescription.kt
index 13c219a..740e642 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.