azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

KT-315 I need list of FunctionDEscriptors to be taken from traits

Browse Source 
One of the duplicates must remain in the list
This commit is contained in:
Andrey Breslav
2011-09-22 20:08:50 +04:00
parent 29470fa1d1
commit b759fb59e6
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverridingUtil.java
+2
View File
@@ -42,6 +42,8 @@ public class OverridingUtil {
if (overrides(other, me)) { if (overrides(other, me)) {
continue outerLoop; continue outerLoop;
} }
}
for (D other : candidates) {
if (me.getOriginal() == other.getOriginal() if (me.getOriginal() == other.getOriginal()
&& isOverridableBy(JetTypeChecker.INSTANCE, other, me).isSuccess() && isOverridableBy(JetTypeChecker.INSTANCE, other, me).isSuccess()
&& isOverridableBy(JetTypeChecker.INSTANCE, me, other).isSuccess()) { && isOverridableBy(JetTypeChecker.INSTANCE, me, other).isSuccess()) {