Support type aliases in RecursiveDescriptorProcessorTest.

This commit is contained in:
Dmitry Petrov
2016-09-16 10:06:23 +03:00
committed by Dmitry Petrov
parent dac9d8b845
commit 7b25331de1
3 changed files with 18 additions and 2 deletions
+8
View File
@@ -3,39 +3,47 @@ package test.innerTest
fun <T1> T1.func(a: T1): T1 = a fun <T1> T1.func(a: T1): T1 = a
val <T2> T2.prop: T2? = null val <T2> T2.prop: T2? = null
var propVar: Any? = null var propVar: Any? = null
typealias TypeAlias = Any
interface Trait<T3> { interface Trait<T3> {
fun traitFunc(): Unit {} fun traitFunc(): Unit {}
val traitProp: Any? val traitProp: Any?
typealias TraitTypeAlias = Any
} }
abstract class Class<T4> : Trait<Any> { abstract class Class<T4> : Trait<Any> {
fun classFunc(): Unit {} fun classFunc(): Unit {}
val classProp: Any? = null val classProp: Any? = null
typealias ClassTypeAlias = Any
companion object { companion object {
fun classObjFunc(): Unit {} fun classObjFunc(): Unit {}
val classObjProp: Any? = null val classObjProp: Any? = null
typealias ClassObjTypeAlias = Any
} }
} }
object Object { object Object {
fun objFunc(): Unit {} fun objFunc(): Unit {}
val objProp: Any? = null val objProp: Any? = null
typealias ObjTypeAlias = Any
} }
interface Outer { interface Outer {
interface NestedTrait { interface NestedTrait {
fun nestedTraitFun() {} fun nestedTraitFun() {}
typealias NestedTraitTypeAlias = Any
} }
abstract class NestedClass { abstract class NestedClass {
companion object { companion object {
fun nestedClassObjFunc(): Unit {} fun nestedClassObjFunc(): Unit {}
typealias NestedClassObjTypeAlias = Any
} }
} }
object NestedObject { object NestedObject {
fun nestedFunc(): Unit {} fun nestedFunc(): Unit {}
typealias NestedObjectTypeAlias = Any
} }
} }
+8
View File
@@ -5,6 +5,8 @@ Class.classFunc:SimpleFunctionDescriptor
Class.classProp:PropertyDescriptor Class.classProp:PropertyDescriptor
Class.this:ReceiverParameterDescriptor Class.this:ReceiverParameterDescriptor
Class:ClassDescriptorWithResolutionScopes Class:ClassDescriptorWithResolutionScopes
ClassObjTypeAlias:TypeAliasDescriptor
ClassTypeAlias:TypeAliasDescriptor
Companion.<get-classObjProp>:PropertyGetterDescriptor Companion.<get-classObjProp>:PropertyGetterDescriptor
Companion.<init>():ClassConstructorDescriptor Companion.<init>():ClassConstructorDescriptor
Companion.<init>():ClassConstructorDescriptor Companion.<init>():ClassConstructorDescriptor
@@ -18,13 +20,17 @@ Companion:ClassDescriptorWithResolutionScopes
NestedClass.<init>():ClassConstructorDescriptor NestedClass.<init>():ClassConstructorDescriptor
NestedClass.this:ReceiverParameterDescriptor NestedClass.this:ReceiverParameterDescriptor
NestedClass:ClassDescriptorWithResolutionScopes NestedClass:ClassDescriptorWithResolutionScopes
NestedClassObjTypeAlias:TypeAliasDescriptor
NestedObject.<init>():ClassConstructorDescriptor NestedObject.<init>():ClassConstructorDescriptor
NestedObject.nestedFunc:SimpleFunctionDescriptor NestedObject.nestedFunc:SimpleFunctionDescriptor
NestedObject.this:ReceiverParameterDescriptor NestedObject.this:ReceiverParameterDescriptor
NestedObject:ClassDescriptorWithResolutionScopes NestedObject:ClassDescriptorWithResolutionScopes
NestedObjectTypeAlias:TypeAliasDescriptor
NestedTrait.nestedTraitFun:SimpleFunctionDescriptor NestedTrait.nestedTraitFun:SimpleFunctionDescriptor
NestedTrait.this:ReceiverParameterDescriptor NestedTrait.this:ReceiverParameterDescriptor
NestedTrait:ClassDescriptorWithResolutionScopes NestedTrait:ClassDescriptorWithResolutionScopes
NestedTraitTypeAlias:TypeAliasDescriptor
ObjTypeAlias:TypeAliasDescriptor
Object.<get-objProp>:PropertyGetterDescriptor Object.<get-objProp>:PropertyGetterDescriptor
Object.<init>():ClassConstructorDescriptor Object.<init>():ClassConstructorDescriptor
Object.objFunc:SimpleFunctionDescriptor Object.objFunc:SimpleFunctionDescriptor
@@ -43,6 +49,8 @@ Trait.this:ReceiverParameterDescriptor
Trait.traitFunc:SimpleFunctionDescriptor Trait.traitFunc:SimpleFunctionDescriptor
Trait.traitProp:PropertyDescriptor Trait.traitProp:PropertyDescriptor
Trait:ClassDescriptorWithResolutionScopes Trait:ClassDescriptorWithResolutionScopes
TraitTypeAlias:TypeAliasDescriptor
TypeAlias:TypeAliasDescriptor
a:ValueParameterDescriptor a:ValueParameterDescriptor
fake Class.<get-traitProp>:PropertyGetterDescriptor fake Class.<get-traitProp>:PropertyGetterDescriptor
fake Class.equals:DeserializedCallableMemberDescriptor fake Class.equals:DeserializedCallableMemberDescriptor
@@ -131,8 +131,8 @@ public class RecursiveDescriptorProcessorTest extends KotlinTestWithEnvironment
@Override @Override
public Boolean visitTypeAliasDescriptor(TypeAliasDescriptor descriptor, Void data) { public Boolean visitTypeAliasDescriptor(TypeAliasDescriptor descriptor, Void data) {
add(descriptor); // TODO typealias add(descriptor);
return null; return true;
} }
@Override @Override