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

Stabilized order of methods inherited by delegation.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2014-10-15 16:34:51 +04:00
parent db45f4a062
commit 84c7b05781
2 changed files with 27 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend-common/src/org/jetbrains/jet/backend/common/CodegenUtilKt.kt
+4
View File
@@ -23,6 +23,8 @@ import kotlin.platform.platformStatic
import org.jetbrains.jet.lang.descriptors.CallableDescriptor
import org.jetbrains.jet.utils.keysToMapExceptNulls
import org.jetbrains.jet.lang.resolve.DescriptorUtils
import org.jetbrains.jet.lang.resolve.MemberComparator
import java.util.Comparator
public object CodegenUtilKt {
@@ -40,6 +42,8 @@ public object CodegenUtilKt {
return descriptor.getDefaultType().getMemberScope().getAllDescriptors().stream()
.filterIsInstance(javaClass<CallableMemberDescriptor>())
.filter { it.getKind() == CallableMemberDescriptor.Kind.DELEGATION }
.toList()
.sortBy(MemberComparator.INSTANCE as Comparator<CallableMemberDescriptor>) // Workaround for KT-6030
.keysToMapExceptNulls {
delegatingMember ->