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

Minor. Reformat overridingUtils.kt

Browse Source
This commit is contained in:
Denis Zharkov
2020-02-14 14:03:22 +03:00
parent a50911156d
commit d06e35b061
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptors/src/org/jetbrains/kotlin/resolve/overridingUtils.kt
+11 -11
View File
@@ -23,16 +23,16 @@ import java.util.*
fun <D : CallableDescriptor> D.findTopMostOverriddenDescriptors(): List<D> { 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<D>>(ArrayList<D>()) { 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 D) result.add(current as D)
}
} }
}) }
})
} }
@@ -47,7 +47,7 @@ fun <D : CallableDescriptor> D.findOriginalTopMostOverriddenDescriptors(): Set<D
* @param <H> is something that handles CallableDescriptor inside * @param <H> is something that handles CallableDescriptor inside
*/ */
fun <H : Any> Collection<H>.selectMostSpecificInEachOverridableGroup( fun <H : Any> Collection<H>.selectMostSpecificInEachOverridableGroup(
descriptorByHandle: H.() -> CallableDescriptor descriptorByHandle: H.() -> CallableDescriptor
): Collection<H> { ): Collection<H> {
if (size <= 1) return this if (size <= 1) return this
val queue = LinkedList<H>(this) val queue = LinkedList<H>(this)
@@ -59,7 +59,7 @@ fun <H : Any> Collection<H>.selectMostSpecificInEachOverridableGroup(
val conflictedHandles = SmartSet.create<H>() val conflictedHandles = SmartSet.create<H>()
val overridableGroup = val overridableGroup =
OverridingUtil.extractMembersOverridableInBothWays(nextHandle, queue, descriptorByHandle) { conflictedHandles.add(it) } OverridingUtil.extractMembersOverridableInBothWays(nextHandle, queue, descriptorByHandle) { conflictedHandles.add(it) }
if (overridableGroup.size == 1 && conflictedHandles.isEmpty()) { if (overridableGroup.size == 1 && conflictedHandles.isEmpty()) {
result.add(overridableGroup.single()) result.add(overridableGroup.single())