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

Remove OverrideResolver#filterOutOverriding, simplify the only usage

Browse Source
This commit is contained in:
Alexander Udalov
2016-07-20 19:19:41 +03:00
parent 5d04fa3c2f
commit 191f532675
3 changed files with 15 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-core/src/org/jetbrains/kotlin/idea/core/descriptorUtils.kt
+2 -2
View File
@@ -145,11 +145,11 @@ fun <D : CallableMemberDescriptor> D.getDirectlyOverriddenDeclarations(): Collec
return OverrideResolver.filterOutOverridden(result)
}
fun <D : CallableMemberDescriptor> D.getDeepestSuperDeclarations(): Set<D> {
fun <D : CallableMemberDescriptor> D.getDeepestSuperDeclarations(): Collection<D> {
val overriddenDeclarations = DescriptorUtils.getAllOverriddenDeclarations(this)
if (overriddenDeclarations.isEmpty()) {
return setOf(this)
}
return OverrideResolver.filterOutOverriding(overriddenDeclarations)
return overriddenDeclarations.filterNot(DescriptorUtils::isOverride)
}