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

[NI] Filter out duplicates types in commonSuperTypeForNotNullTypes

Browse Source
This commit is contained in:
Dmitry Petrov
2017-06-08 18:42:00 +03:00
committed by Mikhail Zarechenskiy
parent b336919db3
commit e5c87fdad7
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/NewCommonSuperTypeCalculator.kt
+14 -3
View File
@@ -64,12 +64,23 @@ object NewCommonSuperTypeCalculator {
return if (anyMarkedNullable) commonSuperTypes.makeNullableAsSpecified(true) else commonSuperTypes
}
private fun List<SimpleType>.uniquify(): List<SimpleType> {
val result = ArrayList<SimpleType>()
for (type in this) {
if (!result.any { NewKotlinTypeChecker.equalTypes(it, type) }) {
result.add(type)
}
}
return result
}
private fun commonSuperTypeForNotNullTypes(types: List<SimpleType>): SimpleType {
val filteredType = types.filterNot { targetType ->
types.any { other -> targetType != other && NewKotlinTypeChecker.isSubtypeOf(targetType, other)}
val uniqueTypes = types.uniquify()
val filteredType = uniqueTypes.filterNot { type ->
uniqueTypes.any { other -> type != other && NewKotlinTypeChecker.isSubtypeOf(type, other)}
}
// seems like all types are equal
if (filteredType.isEmpty()) return types.first()
if (filteredType.isEmpty()) return uniqueTypes.first()
filteredType.singleOrNull()?.let { return it }