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

FIR: Support special scope for raw types

Browse Source 
^KT-46369 Fixed
^KT-41794 Fixed
^KT-49351 Fixed
This commit is contained in:
Denis.Zharkov
2022-10-13 10:50:45 +02:00
committed by Space Team
parent 1215ae0fe7
commit 5cc31114cd
39 changed files with 225 additions and 255 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/java/src/org/jetbrains/kotlin/fir/java/JavaTypeConversion.kt
+1 -1
View File
@@ -123,7 +123,7 @@ private fun JavaType?.toConeTypeProjection(
else -> lowerBound
}
if (isRaw) ConeRawType(finalLowerBound, upperBound) else ConeFlexibleType(finalLowerBound, upperBound)
if (isRaw) ConeRawType.create(finalLowerBound, upperBound) else ConeFlexibleType(finalLowerBound, upperBound)
}
is JavaArrayType -> {
compiler/fir/java/src/org/jetbrains/kotlin/fir/java/enhancement/javaTypeUtils.kt
+1 -1
View File
@@ -50,7 +50,7 @@ private fun ConeKotlinType.enhanceConeKotlinType(
when {
lowerResult == null && upperResult == null -> null
this is ConeRawType -> ConeRawType(lowerResult ?: lowerBound, upperResult ?: upperBound)
this is ConeRawType -> ConeRawType.create(lowerResult ?: lowerBound, upperResult ?: upperBound)
else -> coneFlexibleOrSimpleType(session.typeContext, lowerResult ?: lowerBound, upperResult ?: upperBound)
}
}