Reflection: add KClass.typeParameters, KCallable.typeParameters

Inheritance from KCallable is removed in kt9078.kt because it was irrelevant to
the test and because it gets in the way of modification of KCallable

core/builtins/src/kotlin/reflect/KCallable.kt

@@ -44,6 +44,11 @@ public interface KCallable<out R> : KAnnotatedElement {
      */
     public val returnType: KType
 
+    /**
+     * The list of type parameters of this callable.
+     */
+    public val typeParameters: List<KTypeParameter>
+
     /**
      * Calls this callable with the specified list of arguments and returns the result.
      * Throws an exception if the number of specified arguments is not equal to the size of [parameters],

core/builtins/src/kotlin/reflect/KClass.kt

@@ -58,6 +58,11 @@ public interface KClass<T : Any> : KDeclarationContainer, KAnnotatedElement, KCl
      */
     public val objectInstance: T?
 
+    /**
+     * The list of type parameters of this class. This list does *not* include type parameters of outer classes.
+     */
+    public val typeParameters: List<KTypeParameter>
+
     /**
      * Returns `true` if [other] is a [KClass] instance representing the same class on a given platform.
      *

core/reflection.jvm/src/kotlin/reflect/jvm/internal/KCallableImpl.kt

@@ -20,10 +20,7 @@ import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor
 import org.jetbrains.kotlin.descriptors.annotations.Annotated
 import java.lang.reflect.Type
 import java.util.*
-import kotlin.reflect.KCallable
-import kotlin.reflect.KParameter
-import kotlin.reflect.KType
-import kotlin.reflect.KotlinReflectionInternalError
+import kotlin.reflect.*
 import kotlin.reflect.jvm.javaType
 
 internal interface KCallableImpl<out R> : KCallable<R>, KAnnotatedElementImpl {
@@ -62,6 +59,9 @@ internal interface KCallableImpl<out R> : KCallable<R>, KAnnotatedElementImpl {
     override val returnType: KType
         get() = KTypeImpl(descriptor.returnType!!) { caller.returnType }
 
+    override val typeParameters: List<KTypeParameter>
+        get() = descriptor.typeParameters.map(::KTypeParameterImpl)
+
     @Suppress("UNCHECKED_CAST")
     override fun call(vararg args: Any?): R = reflectionCall {
         return caller.call(args) as R

core/reflection.jvm/src/kotlin/reflect/jvm/internal/KClassImpl.kt

@@ -27,10 +27,7 @@ import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.resolve.DescriptorUtils
 import org.jetbrains.kotlin.resolve.scopes.MemberScope
 import org.jetbrains.kotlin.serialization.deserialization.findClassAcrossModuleDependencies
-import kotlin.reflect.KCallable
-import kotlin.reflect.KClass
-import kotlin.reflect.KFunction
-import kotlin.reflect.KotlinReflectionInternalError
+import kotlin.reflect.*
 
 internal class KClassImpl<T : Any>(override val jClass: Class<T>) :
         KDeclarationContainerImpl(), KClass<T>, KClassifierImpl, KAnnotatedElementImpl {
@@ -139,6 +136,9 @@ internal class KClassImpl<T : Any>(override val jClass: Class<T>) :
     override val objectInstance: T?
         get() = objectInstance_()
 
+    override val typeParameters: List<KTypeParameter>
+        get() = descriptor.declaredTypeParameters.map(::KTypeParameterImpl)
+
     override fun equals(other: Any?): Boolean =
             other is KClassImpl<*> && jClass == other.jClass
 

core/runtime.jvm/src/kotlin/jvm/internal/CallableReference.java

@@ -83,6 +83,12 @@ public abstract class CallableReference implements KCallable {
         return getReflected().getAnnotations();
     }
 
+    @NotNull
+    @Override
+    public List<KTypeParameter> getTypeParameters() {
+        return getReflected().getTypeParameters();
+    }
+
     @Override
     public Object call(@NotNull Object... args) {
         return getReflected().call(args);

core/runtime.jvm/src/kotlin/jvm/internal/ClassReference.kt

@@ -19,6 +19,7 @@ package kotlin.jvm.internal
 import kotlin.reflect.KCallable
 import kotlin.reflect.KClass
 import kotlin.reflect.KFunction
+import kotlin.reflect.KTypeParameter
 
 class ClassReference(override val jClass: Class<*>) : KClass<Any>, ClassBasedDeclarationContainer {
     override val simpleName: String?
@@ -42,6 +43,9 @@ class ClassReference(override val jClass: Class<*>) : KClass<Any>, ClassBasedDec
     override val objectInstance: Any?
         get() = error()
 
+    override val typeParameters: List<KTypeParameter>
+        get() = error()
+
     private fun error(): Nothing = throw KotlinReflectionNotSupportedError()
 
     override fun equals(other: Any?) =

core/runtime.jvm/src/kotlin/jvm/internal/FunctionReference.java

@@ -17,10 +17,7 @@
 package kotlin.jvm.internal;
 
 import kotlin.jvm.KotlinReflectionNotSupportedError;
-import kotlin.reflect.KDeclarationContainer;
-import kotlin.reflect.KFunction;
-import kotlin.reflect.KParameter;
-import kotlin.reflect.KType;
+import kotlin.reflect.*;
 import org.jetbrains.annotations.NotNull;
 
 import java.lang.annotation.Annotation;
@@ -71,6 +68,12 @@ public class FunctionReference extends FunctionImpl implements KFunction {
         return getReflected().getAnnotations();
     }
 
+    @NotNull
+    @Override
+    public List<KTypeParameter> getTypeParameters() {
+        return getReflected().getTypeParameters();
+    }
+
     @Override
     public Object call(@NotNull Object... args) {
         return getReflected().call(args);