Fix "Cannot resolve method" error in Java for methods from trait

2014-08-27 20:29:02 +04:00
parent 9859b10854
commit 97a95d6a6a
4 changed files with 21 additions and 2 deletions
@@ -112,7 +112,10 @@ public class KotlinLightMethodForDeclaration(
    override fun getUseScope(): SearchScope = origin.getUseScope()

    override fun equals(other: Any?): Boolean =
-            other is KotlinLightMethodForDeclaration && getName() == other.getName() && origin == other.origin
+            other is KotlinLightMethodForDeclaration &&
+            getName() == other.getName() &&
+            origin == other.origin &&
+            getContainingClass() == other.getContainingClass()

-    override fun hashCode(): Int = getName().hashCode() * 31 + origin.hashCode()
+    override fun hashCode(): Int = (getName().hashCode() * 31 + origin.hashCode()) * 31 + getContainingClass()!!.hashCode()
 }