From ef80a8ebf673eb4bc7ac0e94317387032eb8970b Mon Sep 17 00:00:00 2001 From: Tianyu Geng Date: Wed, 8 Sep 2021 16:54:52 -0700 Subject: [PATCH] FIR checker: createPrimitiveArrayType -> createPrimitiveArrayTypeIfPossible --- .../transformers/FirCallCompletionResultsWriterTransformer.kt | 2 +- .../resolve/src/org/jetbrains/kotlin/fir/types/ArrayUtils.kt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirCallCompletionResultsWriterTransformer.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirCallCompletionResultsWriterTransformer.kt index e11a2dcfe71..1f550ca2a85 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirCallCompletionResultsWriterTransformer.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirCallCompletionResultsWriterTransformer.kt @@ -779,7 +779,7 @@ class FirCallCompletionResultsWriterTransformer( ?: it } ?: expectedArrayElementType ?: session.builtinTypes.nullableAnyType.type arrayOfCall.resultType = arrayOfCall.typeRef.resolvedTypeFromPrototype( - arrayElementType.createArrayType(createPrimitiveArrayType = expectedArrayType?.isPrimitiveArray == true) + arrayElementType.createArrayType(createPrimitiveArrayTypeIfPossible = expectedArrayType?.isPrimitiveArray == true) ) return arrayOfCall } diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/types/ArrayUtils.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/types/ArrayUtils.kt index 63cc5e2f792..3772bd706ea 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/types/ArrayUtils.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/types/ArrayUtils.kt @@ -14,8 +14,8 @@ fun ConeKotlinType.createOutArrayType(nullable: Boolean = false, createPrimitive return ConeKotlinTypeProjectionOut(this).createArrayType(nullable, createPrimitiveArrayType) } -fun ConeTypeProjection.createArrayType(nullable: Boolean = false, createPrimitiveArrayType: Boolean = true): ConeClassLikeType { - if (this is ConeKotlinTypeProjection && createPrimitiveArrayType) { +fun ConeTypeProjection.createArrayType(nullable: Boolean = false, createPrimitiveArrayTypeIfPossible: Boolean = true): ConeClassLikeType { + if (this is ConeKotlinTypeProjection && createPrimitiveArrayTypeIfPossible) { val type = type.lowerBoundIfFlexible() if (type is ConeClassLikeType && type.nullability != ConeNullability.NULLABLE) { val classId = type.lookupTag.classId