diff --git a/compiler/testData/recursiveProcessor/declarations.kt b/compiler/testData/recursiveProcessor/declarations.kt index 780d73fbb4c..6f8393c43c8 100644 --- a/compiler/testData/recursiveProcessor/declarations.kt +++ b/compiler/testData/recursiveProcessor/declarations.kt @@ -3,39 +3,47 @@ package test.innerTest fun T1.func(a: T1): T1 = a val T2.prop: T2? = null var propVar: Any? = null +typealias TypeAlias = Any interface Trait { fun traitFunc(): Unit {} val traitProp: Any? + typealias TraitTypeAlias = Any } abstract class Class : Trait { fun classFunc(): Unit {} val classProp: Any? = null + typealias ClassTypeAlias = Any companion object { fun classObjFunc(): Unit {} val classObjProp: Any? = null + typealias ClassObjTypeAlias = Any } } object Object { fun objFunc(): Unit {} val objProp: Any? = null + typealias ObjTypeAlias = Any } interface Outer { interface NestedTrait { fun nestedTraitFun() {} + typealias NestedTraitTypeAlias = Any } abstract class NestedClass { companion object { fun nestedClassObjFunc(): Unit {} + typealias NestedClassObjTypeAlias = Any } } object NestedObject { fun nestedFunc(): Unit {} + typealias NestedObjectTypeAlias = Any } } \ No newline at end of file diff --git a/compiler/testData/recursiveProcessor/declarations.txt b/compiler/testData/recursiveProcessor/declarations.txt index 63e115d2556..927e3d8f5c9 100644 --- a/compiler/testData/recursiveProcessor/declarations.txt +++ b/compiler/testData/recursiveProcessor/declarations.txt @@ -5,6 +5,8 @@ Class.classFunc:SimpleFunctionDescriptor Class.classProp:PropertyDescriptor Class.this:ReceiverParameterDescriptor Class:ClassDescriptorWithResolutionScopes +ClassObjTypeAlias:TypeAliasDescriptor +ClassTypeAlias:TypeAliasDescriptor Companion.:PropertyGetterDescriptor Companion.():ClassConstructorDescriptor Companion.():ClassConstructorDescriptor @@ -18,13 +20,17 @@ Companion:ClassDescriptorWithResolutionScopes NestedClass.():ClassConstructorDescriptor NestedClass.this:ReceiverParameterDescriptor NestedClass:ClassDescriptorWithResolutionScopes +NestedClassObjTypeAlias:TypeAliasDescriptor NestedObject.():ClassConstructorDescriptor NestedObject.nestedFunc:SimpleFunctionDescriptor NestedObject.this:ReceiverParameterDescriptor NestedObject:ClassDescriptorWithResolutionScopes +NestedObjectTypeAlias:TypeAliasDescriptor NestedTrait.nestedTraitFun:SimpleFunctionDescriptor NestedTrait.this:ReceiverParameterDescriptor NestedTrait:ClassDescriptorWithResolutionScopes +NestedTraitTypeAlias:TypeAliasDescriptor +ObjTypeAlias:TypeAliasDescriptor Object.:PropertyGetterDescriptor Object.():ClassConstructorDescriptor Object.objFunc:SimpleFunctionDescriptor @@ -43,6 +49,8 @@ Trait.this:ReceiverParameterDescriptor Trait.traitFunc:SimpleFunctionDescriptor Trait.traitProp:PropertyDescriptor Trait:ClassDescriptorWithResolutionScopes +TraitTypeAlias:TypeAliasDescriptor +TypeAlias:TypeAliasDescriptor a:ValueParameterDescriptor fake Class.:PropertyGetterDescriptor fake Class.equals:DeserializedCallableMemberDescriptor diff --git a/compiler/tests/org/jetbrains/kotlin/test/util/RecursiveDescriptorProcessorTest.java b/compiler/tests/org/jetbrains/kotlin/test/util/RecursiveDescriptorProcessorTest.java index 4b6415406a8..e244e827229 100644 --- a/compiler/tests/org/jetbrains/kotlin/test/util/RecursiveDescriptorProcessorTest.java +++ b/compiler/tests/org/jetbrains/kotlin/test/util/RecursiveDescriptorProcessorTest.java @@ -131,8 +131,8 @@ public class RecursiveDescriptorProcessorTest extends KotlinTestWithEnvironment @Override public Boolean visitTypeAliasDescriptor(TypeAliasDescriptor descriptor, Void data) { - add(descriptor); // TODO typealias - return null; + add(descriptor); + return true; } @Override