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

K2: make type variable based types not class like

Browse Source 
#KT-57921 Fixed
#KT-62420 Fixed
This commit is contained in:
Mikhail Glukhikh
2023-11-07 11:03:19 +01:00
committed by Space Team
parent 6053c94c8a
commit 1ceec4d6d7
7 changed files with 23 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/evaluate/FirCompileTimeConstantEvaluator.kt
+1 -3
View File
@@ -28,7 +28,6 @@ import org.jetbrains.kotlin.fir.symbols.impl.FirFieldSymbol
import org.jetbrains.kotlin.fir.symbols.impl.FirPropertySymbol
import org.jetbrains.kotlin.fir.symbols.lazyResolveToPhase
import org.jetbrains.kotlin.fir.types.*
import org.jetbrains.kotlin.fir.types.impl.*
import org.jetbrains.kotlin.name.CallableId
import org.jetbrains.kotlin.name.StandardClassIds
import org.jetbrains.kotlin.psi.KtElement
@@ -312,8 +311,7 @@ internal object FirCompileTimeConstantEvaluator {
is ConeCapturedType -> lowerType?.toConstantValueKind() ?: constructor.supertypes!!.first().toConstantValueKind()
is ConeDefinitelyNotNullType -> original.toConstantValueKind()
is ConeIntersectionType -> intersectedTypes.first().toConstantValueKind()
is ConeStubType -> null
is ConeIntegerLiteralType -> null
is ConeStubType, is ConeIntegerLiteralType, is ConeTypeVariableType -> null
}
private fun String.toConstantValueKind(): ConstantValueKind<*>? =