Reflection: add KClassifier.createType
#KT-8998 In Progress
This commit is contained in:
+16
@@ -0,0 +1,16 @@
|
||||
// WITH_REFLECT
|
||||
|
||||
import kotlin.test.assertEquals
|
||||
|
||||
class A<T1> {
|
||||
inner class B<T2, T3> {
|
||||
inner class C<T4>
|
||||
}
|
||||
}
|
||||
|
||||
fun foo(): A<Int>.B<Double, Float>.C<Long> = null!!
|
||||
|
||||
fun box(): String {
|
||||
assertEquals("A<kotlin.Int>.B<kotlin.Double, kotlin.Float>.C<kotlin.Long>", ::foo.returnType.toString())
|
||||
return "OK"
|
||||
}
|
||||
@@ -0,0 +1,40 @@
|
||||
// WITH_REFLECT
|
||||
|
||||
import kotlin.reflect.createType
|
||||
import kotlin.reflect.KTypeProjection
|
||||
import kotlin.test.assertEquals
|
||||
import kotlin.test.assertNotEquals
|
||||
|
||||
class Foo<T>
|
||||
|
||||
fun box(): String {
|
||||
assertEquals(String::class.createType(), String::class.createType())
|
||||
|
||||
assertEquals(
|
||||
Foo::class.createType(listOf(KTypeProjection.Star)),
|
||||
Foo::class.createType(listOf(KTypeProjection.Star))
|
||||
)
|
||||
|
||||
val i = Int::class.createType()
|
||||
assertEquals(
|
||||
Foo::class.createType(listOf(KTypeProjection.Invariant(i))),
|
||||
Foo::class.createType(listOf(KTypeProjection.Invariant(i)))
|
||||
)
|
||||
|
||||
assertNotEquals(
|
||||
Foo::class.createType(listOf(KTypeProjection.In(i))),
|
||||
Foo::class.createType(listOf(KTypeProjection.Out(i)))
|
||||
)
|
||||
|
||||
assertNotEquals(
|
||||
Foo::class.createType(listOf(KTypeProjection.Out(Any::class.createType(nullable = true)))),
|
||||
Foo::class.createType(listOf(KTypeProjection.Star))
|
||||
)
|
||||
|
||||
assertNotEquals(
|
||||
Foo::class.createType(listOf(KTypeProjection.Star), nullable = false),
|
||||
Foo::class.createType(listOf(KTypeProjection.Star), nullable = true)
|
||||
)
|
||||
|
||||
return "OK"
|
||||
}
|
||||
@@ -0,0 +1,26 @@
|
||||
// WITH_REFLECT
|
||||
|
||||
import kotlin.reflect.createType
|
||||
import kotlin.reflect.KClass
|
||||
import kotlin.reflect.KTypeProjection
|
||||
import kotlin.test.assertEquals
|
||||
|
||||
class A<T1> {
|
||||
inner class B<T2, T3> {
|
||||
inner class C<T4>
|
||||
}
|
||||
class D
|
||||
}
|
||||
|
||||
fun foo(): A<Int>.B<Double, Float>.C<Long> = null!!
|
||||
|
||||
fun box(): String {
|
||||
fun KClass<*>.inv() = KTypeProjection.Invariant(this.createType())
|
||||
|
||||
val type = A.B.C::class.createType(listOf(Long::class.inv(), Double::class.inv(), Float::class.inv(), Int::class.inv()))
|
||||
assertEquals("A<kotlin.Int>.B<kotlin.Double, kotlin.Float>.C<kotlin.Long>", type.toString())
|
||||
|
||||
assertEquals("A.D", A.D::class.createType().toString())
|
||||
|
||||
return "OK"
|
||||
}
|
||||
+18
@@ -0,0 +1,18 @@
|
||||
// WITH_REFLECT
|
||||
|
||||
import kotlin.reflect.createType
|
||||
import kotlin.reflect.KTypeProjection
|
||||
import kotlin.test.assertEquals
|
||||
|
||||
class Foo
|
||||
class Bar<T>
|
||||
|
||||
fun box(): String {
|
||||
assertEquals("Foo", Foo::class.createType().toString())
|
||||
assertEquals("Foo?", Foo::class.createType(nullable = true).toString())
|
||||
|
||||
assertEquals("Bar<kotlin.String>", Bar::class.createType(listOf(KTypeProjection.Invariant(String::class.createType()))).toString())
|
||||
assertEquals("Bar<kotlin.Int>?", Bar::class.createType(listOf(KTypeProjection.Invariant(Int::class.createType())), nullable = true).toString())
|
||||
|
||||
return "OK"
|
||||
}
|
||||
@@ -0,0 +1,29 @@
|
||||
// WITH_REFLECT
|
||||
|
||||
import kotlin.reflect.createType
|
||||
import kotlin.test.assertEquals
|
||||
|
||||
class Foo<T> {
|
||||
fun nonNull(): T = null!!
|
||||
fun nullable(): T? = null
|
||||
}
|
||||
|
||||
fun box(): String {
|
||||
val tp = Foo::class.typeParameters.single()
|
||||
assertEquals(
|
||||
Foo::class.members.single { it.name == "nonNull" }.returnType,
|
||||
tp.createType()
|
||||
)
|
||||
assertEquals(
|
||||
Foo::class.members.single { it.name == "nullable" }.returnType,
|
||||
tp.createType(nullable = true)
|
||||
)
|
||||
|
||||
assertEquals(tp.createType(), tp.createType())
|
||||
assertEquals(tp.createType(nullable = true), tp.createType(nullable = true))
|
||||
|
||||
assertEquals("T", tp.createType().toString())
|
||||
assertEquals("T?", tp.createType(nullable = true).toString())
|
||||
|
||||
return "OK"
|
||||
}
|
||||
+49
@@ -0,0 +1,49 @@
|
||||
// WITH_REFLECT
|
||||
|
||||
import kotlin.reflect.createType
|
||||
import kotlin.reflect.KClassifier
|
||||
import kotlin.reflect.KTypeProjection
|
||||
|
||||
fun test(classifier: KClassifier, arguments: List<KTypeProjection>) {
|
||||
try {
|
||||
classifier.createType(arguments)
|
||||
throw AssertionError("createType should have thrown IllegalArgumentException")
|
||||
}
|
||||
catch (e: IllegalArgumentException) {
|
||||
// OK
|
||||
}
|
||||
}
|
||||
|
||||
class Outer<O> {
|
||||
inner class Inner<I>
|
||||
class Nested<N>
|
||||
}
|
||||
|
||||
fun box(): String {
|
||||
val p = KTypeProjection.Star
|
||||
|
||||
test(String::class, listOf(p))
|
||||
test(String::class, listOf(p, p))
|
||||
test(List::class, listOf())
|
||||
test(List::class, listOf(p, p))
|
||||
test(Map::class, listOf())
|
||||
test(Map::class, listOf(p))
|
||||
test(Map::class, listOf(p, p, p))
|
||||
test(Array<Any>::class, listOf())
|
||||
|
||||
test(Outer::class, listOf())
|
||||
test(Outer::class, listOf(p, p))
|
||||
|
||||
// Outer.Inner takes two arguments: first for O, second for I
|
||||
test(Outer.Inner::class, listOf())
|
||||
test(Outer.Inner::class, listOf(p))
|
||||
test(Outer.Inner::class, listOf(p, p, p))
|
||||
|
||||
// Outer.Nested takes one argument for N
|
||||
test(Outer.Nested::class, listOf())
|
||||
test(Outer.Nested::class, listOf(p, p))
|
||||
|
||||
test(Outer::class.typeParameters.single(), listOf(p))
|
||||
|
||||
return "OK"
|
||||
}
|
||||
@@ -12584,6 +12584,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
|
||||
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/reflection/methodsFromAny/typeToString.kt");
|
||||
doTest(fileName);
|
||||
}
|
||||
|
||||
@TestMetadata("typeToStringInnerGeneric.kt")
|
||||
public void testTypeToStringInnerGeneric() throws Exception {
|
||||
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/reflection/methodsFromAny/typeToStringInnerGeneric.kt");
|
||||
doTest(fileName);
|
||||
}
|
||||
}
|
||||
|
||||
@TestMetadata("compiler/testData/codegen/box/reflection/multifileClasses")
|
||||
@@ -13049,6 +13055,45 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
|
||||
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/reflection/types/useSiteVariance.kt");
|
||||
doTest(fileName);
|
||||
}
|
||||
|
||||
@TestMetadata("compiler/testData/codegen/box/reflection/types/createType")
|
||||
@TestDataPath("$PROJECT_ROOT")
|
||||
@RunWith(JUnit3RunnerWithInners.class)
|
||||
public static class CreateType extends AbstractBlackBoxCodegenTest {
|
||||
public void testAllFilesPresentInCreateType() throws Exception {
|
||||
KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/reflection/types/createType"), Pattern.compile("^(.+)\\.kt$"), true);
|
||||
}
|
||||
|
||||
@TestMetadata("equality.kt")
|
||||
public void testEquality() throws Exception {
|
||||
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/reflection/types/createType/equality.kt");
|
||||
doTest(fileName);
|
||||
}
|
||||
|
||||
@TestMetadata("innerGeneric.kt")
|
||||
public void testInnerGeneric() throws Exception {
|
||||
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/reflection/types/createType/innerGeneric.kt");
|
||||
doTest(fileName);
|
||||
}
|
||||
|
||||
@TestMetadata("simpleCreateType.kt")
|
||||
public void testSimpleCreateType() throws Exception {
|
||||
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/reflection/types/createType/simpleCreateType.kt");
|
||||
doTest(fileName);
|
||||
}
|
||||
|
||||
@TestMetadata("typeParameter.kt")
|
||||
public void testTypeParameter() throws Exception {
|
||||
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/reflection/types/createType/typeParameter.kt");
|
||||
doTest(fileName);
|
||||
}
|
||||
|
||||
@TestMetadata("wrongNumberOfArguments.kt")
|
||||
public void testWrongNumberOfArguments() throws Exception {
|
||||
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/reflection/types/createType/wrongNumberOfArguments.kt");
|
||||
doTest(fileName);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,78 @@
|
||||
/*
|
||||
* Copyright 2010-2016 JetBrains s.r.o.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
@file:JvmName("KClassifiers")
|
||||
package kotlin.reflect
|
||||
|
||||
import org.jetbrains.kotlin.descriptors.annotations.Annotations
|
||||
import org.jetbrains.kotlin.types.*
|
||||
import kotlin.reflect.jvm.internal.KClassImpl
|
||||
import kotlin.reflect.jvm.internal.KClassifierImpl
|
||||
import kotlin.reflect.jvm.internal.KTypeImpl
|
||||
import kotlin.reflect.jvm.internal.KTypeParameterImpl
|
||||
|
||||
/**
|
||||
* Creates a [KType] instance with the given classifier, type arguments, nullability and annotations.
|
||||
* If the number of passed type arguments is not equal to the total number of type parameters of a classifier,
|
||||
* an exception is thrown. If any of the arguments does not satisfy the bounds of the corresponding type parameter,
|
||||
* an exception is thrown.
|
||||
*
|
||||
* For classifiers representing type parameters, the type argument list must always be empty.
|
||||
* For classes, the type argument list should contain arguments for the type parameters of the class. If the class is `inner`,
|
||||
* the list should follow with arguments for the type parameters of its outer class, and so forth until a class is
|
||||
* not `inner`, or is declared on the top level.
|
||||
*/
|
||||
fun KClassifier.createType(
|
||||
arguments: List<KTypeProjection> = emptyList(),
|
||||
nullable: Boolean = false,
|
||||
annotations: List<Annotation> = emptyList()
|
||||
): KType {
|
||||
val descriptor = (this as? KClassifierImpl)?.descriptor
|
||||
?: throw KotlinReflectionInternalError("Cannot create type for an unsupported classifier: $this (${this.javaClass})")
|
||||
|
||||
val typeConstructor = descriptor.typeConstructor
|
||||
val parameters = typeConstructor.parameters
|
||||
if (parameters.size != arguments.size) {
|
||||
throw IllegalArgumentException("Class declares ${parameters.size} type parameters, but ${arguments.size} were provided.")
|
||||
}
|
||||
|
||||
// TODO: throw exception if argument does not satisfy bounds
|
||||
|
||||
val typeAnnotations =
|
||||
if (annotations.isEmpty()) Annotations.EMPTY
|
||||
else Annotations.EMPTY // TODO: support type annotations
|
||||
|
||||
val kotlinType = createKotlinType(typeAnnotations, typeConstructor, arguments, nullable)
|
||||
|
||||
return KTypeImpl(kotlinType) {
|
||||
TODO("Java type is not yet supported for types created with createType (classifier = $this)")
|
||||
}
|
||||
}
|
||||
|
||||
private fun createKotlinType(
|
||||
typeAnnotations: Annotations, typeConstructor: TypeConstructor, arguments: List<KTypeProjection>, nullable: Boolean
|
||||
): SimpleType {
|
||||
val parameters = typeConstructor.parameters
|
||||
return KotlinTypeFactory.simpleType(typeAnnotations, typeConstructor, arguments.mapIndexed { index, typeProjection ->
|
||||
val type = (typeProjection.type as KTypeImpl?)?.type
|
||||
when (typeProjection) {
|
||||
is KTypeProjection.Invariant -> TypeProjectionImpl(Variance.INVARIANT, type!!)
|
||||
is KTypeProjection.In -> TypeProjectionImpl(Variance.IN_VARIANCE, type!!)
|
||||
is KTypeProjection.Out -> TypeProjectionImpl(Variance.OUT_VARIANCE, type!!)
|
||||
is KTypeProjection.Star -> StarProjectionImpl(parameters[index])
|
||||
}
|
||||
}, nullable)
|
||||
}
|
||||
Reference in New Issue
Block a user