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

FIR: Extract StandardClassIds.KClass

Browse Source
This commit is contained in:
Denis Zharkov
2020-05-14 18:58:13 +03:00
parent b691b13d8e
commit e7a67c7a16
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/cones/src/org/jetbrains/kotlin/fir/symbols/StandardClassIds.kt
+2 -1
View File
@@ -49,6 +49,7 @@ object StandardClassIds {
val KProperty2 = "KProperty2".reflectId() val KProperty2 = "KProperty2".reflectId()
val KMutableProperty2 = "KMutableProperty2".reflectId() val KMutableProperty2 = "KMutableProperty2".reflectId()
val KFunction = "KFunction".reflectId() val KFunction = "KFunction".reflectId()
val KClass = "KClass".reflectId()
val Comparable = "Comparable".baseId() val Comparable = "Comparable".baseId()
val Number = "Number".baseId() val Number = "Number".baseId()
@@ -73,4 +74,4 @@ object StandardClassIds {
val elementTypeByUnsignedArrayType = unsignedArrayTypeByElementType.inverseMap() val elementTypeByUnsignedArrayType = unsignedArrayTypeByElementType.inverseMap()
} }
private fun <K, V> Map<K, V>.inverseMap() = entries.associate { (k, v) -> v to k } private fun <K, V> Map<K, V>.inverseMap() = entries.associate { (k, v) -> v to k }
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirExpressionsResolveTransformer.kt
+1 -1
View File
@@ -520,7 +520,7 @@ class FirExpressionsResolveTransformer(transformer: FirBodyResolveTransformer) :
transformedGetClassCall.resultType = transformedGetClassCall.resultType =
buildResolvedTypeRef { buildResolvedTypeRef {
type = ClassId.fromString("kotlin/reflect/KClass").constructClassLikeType(arrayOf(typeOfExpression), false) type = StandardClassIds.KClass.constructClassLikeType(arrayOf(typeOfExpression), false)
} }
return transformedGetClassCall.compose() return transformedGetClassCall.compose()
} }