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

[Misc] Minor: generalize TypeUtils.closure

Browse Source
This commit is contained in:
Dmitry Savvinov
2019-04-23 20:31:13 +03:00
parent 935c9fce17
commit fbbd1a268b
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptors/src/org/jetbrains/kotlin/types/TypeUtils.kt
+2 -2
View File
@@ -130,7 +130,7 @@ fun KotlinType.isDefaultBound(): Boolean = KotlinBuiltIns.isDefaultBound(getSupe
fun createProjection(type: KotlinType, projectionKind: Variance, typeParameterDescriptor: TypeParameterDescriptor?): TypeProjection = fun createProjection(type: KotlinType, projectionKind: Variance, typeParameterDescriptor: TypeParameterDescriptor?): TypeProjection =
TypeProjectionImpl(if (typeParameterDescriptor?.variance == projectionKind) Variance.INVARIANT else projectionKind, type) TypeProjectionImpl(if (typeParameterDescriptor?.variance == projectionKind) Variance.INVARIANT else projectionKind, type)
fun Collection<KotlinType>.closure(f: (KotlinType) -> Collection<KotlinType>): Collection<KotlinType> { fun <T> Collection<T>.closure(f: (T) -> Collection<T>): Collection<T> {
if (size == 0) return this if (size == 0) return this
val result = HashSet(this) val result = HashSet(this)
@@ -138,7 +138,7 @@ fun Collection<KotlinType>.closure(f: (KotlinType) -> Collection<KotlinType>): C
var oldSize = 0 var oldSize = 0
while (result.size > oldSize) { while (result.size > oldSize) {
oldSize = result.size oldSize = result.size
val toAdd = hashSetOf<KotlinType>() val toAdd = hashSetOf<T>()
elementsToCheck.forEach { toAdd.addAll(f(it)) } elementsToCheck.forEach { toAdd.addAll(f(it)) }
result.addAll(toAdd) result.addAll(toAdd)
elementsToCheck = toAdd elementsToCheck = toAdd