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

Avoid a cycle of analysing of type parameters via checking that it's a type parameter first

Browse Source
This commit is contained in:
Victor Petukhov
2020-12-08 12:53:21 +03:00
parent a89329e077
commit 6f64e2c036
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/typeEnhancement/typeEnhancement.kt
+1 -1
View File
@@ -238,7 +238,7 @@ internal class NotNullTypeParameter(override val delegate: SimpleType) : NotNull
override fun substitutionResult(replacement: KotlinType): KotlinType { override fun substitutionResult(replacement: KotlinType): KotlinType {
val unwrappedType = replacement.unwrap() val unwrappedType = replacement.unwrap()
if (!TypeUtils.isNullableType(unwrappedType) && !unwrappedType.isTypeParameter()) return unwrappedType if (!unwrappedType.isTypeParameter() && !TypeUtils.isNullableType(unwrappedType)) return unwrappedType
return when (unwrappedType) { return when (unwrappedType) {
is SimpleType -> unwrappedType.prepareReplacement() is SimpleType -> unwrappedType.prepareReplacement()