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

Minor. Adjust generic parameter naming

Browse Source
This commit is contained in:
Denis Zharkov
2015-12-14 19:01:34 +03:00
parent b4bb92d136
commit 5df2a58003
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptors/src/org/jetbrains/kotlin/resolve/overridingUtils.kt
+6 -6
View File
@@ -21,25 +21,25 @@ import org.jetbrains.kotlin.utils.DFS
import org.jetbrains.kotlin.utils.SmartSet import org.jetbrains.kotlin.utils.SmartSet
import java.util.* import java.util.*
fun <TDescriptor : CallableDescriptor> TDescriptor.findTopMostOverriddenDescriptors(): List<TDescriptor> { fun <D : CallableDescriptor> D.findTopMostOverriddenDescriptors(): List<D> {
return DFS.dfs( return DFS.dfs(
listOf(this), listOf(this),
{ current -> current.overriddenDescriptors }, { current -> current.overriddenDescriptors },
object : DFS.CollectingNodeHandler<CallableDescriptor, CallableDescriptor, ArrayList<TDescriptor>>(ArrayList<TDescriptor>()) { object : DFS.CollectingNodeHandler<CallableDescriptor, CallableDescriptor, ArrayList<D>>(ArrayList<D>()) {
override fun afterChildren(current: CallableDescriptor) { override fun afterChildren(current: CallableDescriptor) {
if (current.overriddenDescriptors.isEmpty()) { if (current.overriddenDescriptors.isEmpty()) {
@Suppress("UNCHECKED_CAST") @Suppress("UNCHECKED_CAST")
result.add(current as TDescriptor) result.add(current as D)
} }
} }
}) })
} }
fun <TDescriptor : CallableDescriptor> TDescriptor.findOriginalTopMostOverriddenDescriptors(): Set<TDescriptor> { fun <D : CallableDescriptor> D.findOriginalTopMostOverriddenDescriptors(): Set<D> {
return findTopMostOverriddenDescriptors().mapTo(LinkedHashSet<TDescriptor>()) { return findTopMostOverriddenDescriptors().mapTo(LinkedHashSet<D>()) {
@Suppress("UNCHECKED_CAST") @Suppress("UNCHECKED_CAST")
(it.original as TDescriptor) (it.original as D)
} }
} }