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

New J2K: Add types to JKExpression.type

Browse Source
This commit is contained in:
Ilya Kirillov
2018-12-24 12:51:31 +03:00
committed by Ilya Kirillov
parent 2e353ccf86
commit 3d62734cc6
1 changed files with 46 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
j2k/newSrc/org/jetbrains/kotlin/j2k/tree/types.kt
+46 -10
View File
@@ -49,6 +49,21 @@ fun JKExpression.type(context: ConversionContext): JKType? =
is JKTypeCastExpression -> type.type
is JKThisExpression -> null// TODO return actual type
is JKSuperExpression -> null// TODO return actual type
is JKStubExpression -> null
is JKIfElseExpression -> thenBranch.type(context)// TODO return actual type
is JKArrayAccessExpression ->
(expression.type(context) as? JKParametrizedType)?.parameters?.lastOrNull()
is JKClassLiteralExpression -> {
val symbol = when (literalType) {
JKClassLiteralExpression.LiteralType.KOTLIN_CLASS ->
context.symbolProvider.provideByFqName<JKClassSymbol>("kotlin.reflect.KClass")
JKClassLiteralExpression.LiteralType.JAVA_CLASS,
JKClassLiteralExpression.LiteralType.JAVA_PRIMITIVE_CLASS, JKClassLiteralExpression.LiteralType.JAVA_VOID_TYPE ->
context.symbolProvider.provideByFqName("java.lang.Class")
}
JKClassTypeImpl(symbol, listOf(classType.type), Nullability.NotNull)
}
else -> TODO(this::class.java.toString())
}
@@ -108,21 +123,21 @@ fun JKType.isSubtypeOf(other: JKType, symbolProvider: JKSymbolProvider): Boolean
?.let { otherType -> this.toKtType(symbolProvider)?.isSubtypeOf(otherType) } == true
fun KtTypeElement.toJK(symbolProvider: JKSymbolProvider): JKType =
when (this) {
fun KtTypeElement.toJK(symbolProvider: JKSymbolProvider): JKType? {
return when (this) {
is KtUserType -> {
val qualifiedName = qualifier?.text?.let { it + "." }.orEmpty() + referencedName
val typeParameters = typeArguments.map { it.typeReference!!.typeElement!!.toJK(symbolProvider) }
val symbol = symbolProvider.provideDirectSymbol(
resolveFqName(ClassId.fromString(qualifiedName), this)!!
) as JKClassSymbol
JKClassTypeImpl(symbol, typeParameters)
val typeParameters = typeArguments.map { it.typeReference?.typeElement?.toJK(symbolProvider) }
if (typeParameters.any { it == null }) return null
val fqName = resolveFqName(ClassId.fromString(qualifiedName), this) ?: return null
val symbol = symbolProvider.provideDirectSymbol(fqName) as? JKClassSymbol ?: return null
JKClassTypeImpl(symbol, typeParameters as List<JKType>)
}
is KtNullableType ->
innerType!!.toJK(symbolProvider).updateNullability(Nullability.Nullable)
else -> TODO(this::class.java.toString())
innerType?.toJK(symbolProvider)?.updateNullability(Nullability.Nullable)
else -> null
}
}
fun JKType.toKtType(symbolProvider: JKSymbolProvider): KotlinType? =
when (this) {
@@ -161,6 +176,27 @@ inline fun <reified T : JKType> T.updateNullability(newNullability: Nullability)
is JKJavaVoidType -> this
is JKJavaPrimitiveType -> this
is JKJavaArrayType -> JKJavaArrayTypeImpl(type, newNullability)
is JKContextType -> JKContextType
is JKJavaDisjunctionType -> this
else -> TODO(this::class.toString())
} as T
fun <T : JKType> T.updateNullabilityRecursively(newNullability: Nullability): T =
if (nullability == newNullability) this
else when (this) {
is JKTypeParameterTypeImpl -> JKTypeParameterTypeImpl(name, newNullability)
is JKClassTypeImpl ->
JKClassTypeImpl(
classReference,
parameters.map { it.updateNullabilityRecursively(newNullability) },
newNullability
)
is JKNoType -> this
is JKJavaVoidType -> this
is JKJavaPrimitiveType -> this
is JKJavaArrayType -> JKJavaArrayTypeImpl(type.updateNullabilityRecursively(newNullability), newNullability)
is JKContextType -> JKContextType
is JKJavaDisjunctionType -> this
else -> TODO(this::class.toString())
} as T