From d06e35b0614fd2852f9899c09e6cf08eee282cfc Mon Sep 17 00:00:00 2001 From: Denis Zharkov Date: Fri, 14 Feb 2020 14:03:22 +0300 Subject: [PATCH] Minor. Reformat overridingUtils.kt --- .../kotlin/resolve/overridingUtils.kt | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/core/descriptors/src/org/jetbrains/kotlin/resolve/overridingUtils.kt b/core/descriptors/src/org/jetbrains/kotlin/resolve/overridingUtils.kt index e208a83653a..1dfd6b638cc 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/resolve/overridingUtils.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/overridingUtils.kt @@ -23,16 +23,16 @@ import java.util.* fun D.findTopMostOverriddenDescriptors(): List { return DFS.dfs( - listOf(this), - { current -> current.overriddenDescriptors }, - object : DFS.CollectingNodeHandler>(ArrayList()) { - override fun afterChildren(current: CallableDescriptor) { - if (current.overriddenDescriptors.isEmpty()) { - @Suppress("UNCHECKED_CAST") - result.add(current as D) - } + listOf(this), + { current -> current.overriddenDescriptors }, + object : DFS.CollectingNodeHandler>(ArrayList()) { + override fun afterChildren(current: CallableDescriptor) { + if (current.overriddenDescriptors.isEmpty()) { + @Suppress("UNCHECKED_CAST") + result.add(current as D) } - }) + } + }) } @@ -47,7 +47,7 @@ fun D.findOriginalTopMostOverriddenDescriptors(): Set is something that handles CallableDescriptor inside */ fun Collection.selectMostSpecificInEachOverridableGroup( - descriptorByHandle: H.() -> CallableDescriptor + descriptorByHandle: H.() -> CallableDescriptor ): Collection { if (size <= 1) return this val queue = LinkedList(this) @@ -59,7 +59,7 @@ fun Collection.selectMostSpecificInEachOverridableGroup( val conflictedHandles = SmartSet.create() val overridableGroup = - OverridingUtil.extractMembersOverridableInBothWays(nextHandle, queue, descriptorByHandle) { conflictedHandles.add(it) } + OverridingUtil.extractMembersOverridableInBothWays(nextHandle, queue, descriptorByHandle) { conflictedHandles.add(it) } if (overridableGroup.size == 1 && conflictedHandles.isEmpty()) { result.add(overridableGroup.single())