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

Minor: reformat AbstractTypeConstructor.kt

Browse Source
This commit is contained in:
Dmitry Savvinov
2018-04-03 11:49:54 +03:00
parent 7c02d55b23
commit 9455f50e58
1 changed files with 32 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptors/src/org/jetbrains/kotlin/types/AbstractTypeConstructor.kt
+2 -4
View File
@@ -25,8 +25,7 @@ abstract class AbstractTypeConstructor(storageManager: StorageManager) : TypeCon
// In current version diagnostic about loops in supertypes is reported on each vertex (supertype reference) that lies on the cycle. // In current version diagnostic about loops in supertypes is reported on each vertex (supertype reference) that lies on the cycle.
// To achieve that we store both versions of supertypes --- before and after loops disconnection. // To achieve that we store both versions of supertypes --- before and after loops disconnection.
// The first one is used for computation of neighbours in supertypes graph (see Companion.computeNeighbours) // The first one is used for computation of neighbours in supertypes graph (see Companion.computeNeighbours)
private class Supertypes( private class Supertypes(val allSupertypes: Collection<KotlinType>) {
val allSupertypes: Collection<KotlinType>) {
// initializer is only needed as a stub for case when 'getSupertypes' is called while 'supertypes' are being calculated // initializer is only needed as a stub for case when 'getSupertypes' is called while 'supertypes' are being calculated
var supertypesWithoutCycles: List<KotlinType> = listOf(ErrorUtils.ERROR_TYPE_FOR_LOOP_IN_SUPERTYPES) var supertypesWithoutCycles: List<KotlinType> = listOf(ErrorUtils.ERROR_TYPE_FOR_LOOP_IN_SUPERTYPES)
} }
@@ -62,8 +61,7 @@ abstract class AbstractTypeConstructor(storageManager: StorageManager) : TypeCon
}) })
private fun TypeConstructor.computeNeighbours(useCompanions: Boolean): Collection<KotlinType> = private fun TypeConstructor.computeNeighbours(useCompanions: Boolean): Collection<KotlinType> =
(this as? AbstractTypeConstructor)?.let { (this as? AbstractTypeConstructor)?.let { abstractClassifierDescriptor ->
abstractClassifierDescriptor ->
abstractClassifierDescriptor.supertypes().allSupertypes + abstractClassifierDescriptor.supertypes().allSupertypes +
abstractClassifierDescriptor.getAdditionalNeighboursInSupertypeGraph(useCompanions) abstractClassifierDescriptor.getAdditionalNeighboursInSupertypeGraph(useCompanions)
} ?: supertypes } ?: supertypes