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

[Misc] Reformat DescriptorEquivalenceForOverrides.kt

Browse Source
This commit is contained in:
Denis Zharkov
2019-03-29 14:54:15 +03:00
committed by Dmitry Savvinov
parent 4e486e7738
commit edb9623556
1 changed files with 17 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorEquivalenceForOverrides.kt
+2 -4
View File
@@ -71,8 +71,7 @@ object DescriptorEquivalenceForOverrides {
if (!ownersEquivalent(a, b, { _, _ -> false })) return false if (!ownersEquivalent(a, b, { _, _ -> false })) return false
val overridingUtil = OverridingUtil.createWithEqualityAxioms eq@ { val overridingUtil = OverridingUtil.createWithEqualityAxioms eq@{ c1, c2 ->
c1, c2 ->
if (c1 == c2) return@eq true if (c1 == c2) return@eq true
val d1 = c1.declarationDescriptor val d1 = c1.declarationDescriptor
@@ -100,8 +99,7 @@ object DescriptorEquivalenceForOverrides {
// if the type parameter owners are, e.g., functions, we'll go into infinite recursion here // if the type parameter owners are, e.g., functions, we'll go into infinite recursion here
return if (aOwner is CallableMemberDescriptor || bOwner is CallableMemberDescriptor) { return if (aOwner is CallableMemberDescriptor || bOwner is CallableMemberDescriptor) {
equivalentCallables(aOwner, bOwner) equivalentCallables(aOwner, bOwner)
} } else {
else {
areEquivalent(aOwner, bOwner) areEquivalent(aOwner, bOwner)
} }
} }