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

FIR checker: createPrimitiveArrayType -> createPrimitiveArrayTypeIfPossible

Browse Source
This commit is contained in:
Tianyu Geng
2021-09-08 16:54:52 -07:00
committed by teamcityserver
parent b8b9502db4
commit ef80a8ebf6
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirCallCompletionResultsWriterTransformer.kt
+1 -1
View File
@@ -779,7 +779,7 @@ class FirCallCompletionResultsWriterTransformer(
?: it ?: it
} ?: expectedArrayElementType ?: session.builtinTypes.nullableAnyType.type } ?: expectedArrayElementType ?: session.builtinTypes.nullableAnyType.type
arrayOfCall.resultType = arrayOfCall.typeRef.resolvedTypeFromPrototype( arrayOfCall.resultType = arrayOfCall.typeRef.resolvedTypeFromPrototype(
arrayElementType.createArrayType(createPrimitiveArrayType = expectedArrayType?.isPrimitiveArray == true) arrayElementType.createArrayType(createPrimitiveArrayTypeIfPossible = expectedArrayType?.isPrimitiveArray == true)
) )
return arrayOfCall return arrayOfCall
} }
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/types/ArrayUtils.kt
+2 -2
View File
@@ -14,8 +14,8 @@ fun ConeKotlinType.createOutArrayType(nullable: Boolean = false, createPrimitive
return ConeKotlinTypeProjectionOut(this).createArrayType(nullable, createPrimitiveArrayType) return ConeKotlinTypeProjectionOut(this).createArrayType(nullable, createPrimitiveArrayType)
} }
fun ConeTypeProjection.createArrayType(nullable: Boolean = false, createPrimitiveArrayType: Boolean = true): ConeClassLikeType { fun ConeTypeProjection.createArrayType(nullable: Boolean = false, createPrimitiveArrayTypeIfPossible: Boolean = true): ConeClassLikeType {
if (this is ConeKotlinTypeProjection && createPrimitiveArrayType) { if (this is ConeKotlinTypeProjection && createPrimitiveArrayTypeIfPossible) {
val type = type.lowerBoundIfFlexible() val type = type.lowerBoundIfFlexible()
if (type is ConeClassLikeType && type.nullability != ConeNullability.NULLABLE) { if (type is ConeClassLikeType && type.nullability != ConeNullability.NULLABLE) {
val classId = type.lookupTag.classId val classId = type.lookupTag.classId