From c8ef427421c8f82bbfbb5ac2a56017b2a414ef99 Mon Sep 17 00:00:00 2001 From: Nikolay Lunyak Date: Mon, 4 Apr 2022 13:33:23 +0300 Subject: [PATCH] [FIR JS] Fix ConeDynamicType in asPsiType --- .../kotlin/analysis/api/fir/components/KtFirPsiTypeProvider.kt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirPsiTypeProvider.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirPsiTypeProvider.kt index 70c7ccc410f..48cb17fbfd3 100644 --- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirPsiTypeProvider.kt +++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirPsiTypeProvider.kt @@ -89,6 +89,9 @@ private fun ConeKotlinType.simplifyType( do { val oldType = currentType currentType = currentType.fullyExpandedType(session) + if (currentType is ConeDynamicType) { + return currentType + } currentType = currentType.upperBoundIfFlexible() currentType = substitutor.substituteOrSelf(currentType) val needLocalTypeApproximation = needLocalTypeApproximation(visibilityForApproximation, isInlineFunction, session, useSitePosition)