diff --git a/idea/testData/decompiler/stubBuilder/AnnotationClass/AnnotationClass.txt b/idea/testData/decompiler/stubBuilder/AnnotationClass/AnnotationClass.txt index 5c21b172877..caca5105718 100644 --- a/idea/testData/decompiler/stubBuilder/AnnotationClass/AnnotationClass.txt +++ b/idea/testData/decompiler/stubBuilder/AnnotationClass/AnnotationClass.txt @@ -3,7 +3,7 @@ PsiJetFileStubImpl[package=test.a] DOT_QUALIFIED_EXPRESSION: REFERENCE_EXPRESSION:[referencedName=test] REFERENCE_EXPRESSION:[referencedName=a] - CLASS:[fqName=test.a.AnnotationClass, isEnumEntry=false, isLocal=false, isTopLevel=true, isTrait=false, name=AnnotationClass, superNames=[Annotation]] + CLASS:[fqName=test.a.AnnotationClass, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=AnnotationClass, superNames=[Annotation]] MODIFIER_LIST:[annotation public final] PRIMARY_CONSTRUCTOR: MODIFIER_LIST:[public] diff --git a/idea/testData/decompiler/stubBuilder/Annotations/Annotations.txt b/idea/testData/decompiler/stubBuilder/Annotations/Annotations.txt index de543111a94..eda1d1ea94c 100644 --- a/idea/testData/decompiler/stubBuilder/Annotations/Annotations.txt +++ b/idea/testData/decompiler/stubBuilder/Annotations/Annotations.txt @@ -1,6 +1,6 @@ PsiJetFileStubImpl[package=] PACKAGE_DIRECTIVE: - CLASS:[fqName=Annotations, isEnumEntry=false, isLocal=false, isTopLevel=true, isTrait=false, name=Annotations, superNames=[]] + CLASS:[fqName=Annotations, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=Annotations, superNames=[]] MODIFIER_LIST:[public final] ANNOTATION_ENTRY:[hasValueArguments=false, shortName=a] CONSTRUCTOR_CALLEE: @@ -189,7 +189,7 @@ PsiJetFileStubImpl[package=] USER_TYPE:[isAbsoluteInRootPackage=false] REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Unit] - CLASS:[fqName=Annotations.Nested, isEnumEntry=false, isLocal=false, isTopLevel=false, isTrait=false, name=Nested, superNames=[]] + CLASS:[fqName=Annotations.Nested, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=Nested, superNames=[]] MODIFIER_LIST:[internal final] PRIMARY_CONSTRUCTOR: MODIFIER_LIST:[private] diff --git a/idea/testData/decompiler/stubBuilder/ClassMembers/ClassMembers.txt b/idea/testData/decompiler/stubBuilder/ClassMembers/ClassMembers.txt index 60c2c21a9cb..60c254ef540 100644 --- a/idea/testData/decompiler/stubBuilder/ClassMembers/ClassMembers.txt +++ b/idea/testData/decompiler/stubBuilder/ClassMembers/ClassMembers.txt @@ -1,7 +1,7 @@ PsiJetFileStubImpl[package=test] PACKAGE_DIRECTIVE: REFERENCE_EXPRESSION:[referencedName=test] - CLASS:[fqName=test.ClassMembers, isEnumEntry=false, isLocal=false, isTopLevel=true, isTrait=false, name=ClassMembers, superNames=[]] + CLASS:[fqName=test.ClassMembers, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=ClassMembers, superNames=[]] MODIFIER_LIST:[abstract internal] PRIMARY_CONSTRUCTOR: MODIFIER_LIST:[public] diff --git a/idea/testData/decompiler/stubBuilder/ClassObject/ClassObject.txt b/idea/testData/decompiler/stubBuilder/ClassObject/ClassObject.txt index 033aa9e04b6..40a4b2370b1 100644 --- a/idea/testData/decompiler/stubBuilder/ClassObject/ClassObject.txt +++ b/idea/testData/decompiler/stubBuilder/ClassObject/ClassObject.txt @@ -3,7 +3,7 @@ PsiJetFileStubImpl[package=test.class_object] DOT_QUALIFIED_EXPRESSION: REFERENCE_EXPRESSION:[referencedName=test] REFERENCE_EXPRESSION:[referencedName=class_object] - CLASS:[fqName=test.class_object.ClassObject, isEnumEntry=false, isLocal=false, isTopLevel=true, isTrait=false, name=ClassObject, superNames=[]] + CLASS:[fqName=test.class_object.ClassObject, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=ClassObject, superNames=[]] MODIFIER_LIST:[internal final] PRIMARY_CONSTRUCTOR: MODIFIER_LIST:[public] @@ -27,13 +27,13 @@ PsiJetFileStubImpl[package=test.class_object] USER_TYPE:[isAbsoluteInRootPackage=false] REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] - CLASS:[fqName=test.class_object.ClassObject.Companion.A, isEnumEntry=false, isLocal=false, isTopLevel=false, isTrait=false, name=A, superNames=[]] + CLASS:[fqName=test.class_object.ClassObject.Companion.A, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=A, superNames=[]] MODIFIER_LIST:[internal final] PRIMARY_CONSTRUCTOR: MODIFIER_LIST:[public] VALUE_PARAMETER_LIST: CLASS_BODY: - CLASS:[fqName=test.class_object.ClassObject.Companion.A.B, isEnumEntry=false, isLocal=false, isTopLevel=false, isTrait=false, name=B, superNames=[]] + CLASS:[fqName=test.class_object.ClassObject.Companion.A.B, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=B, superNames=[]] MODIFIER_LIST:[internal final] PRIMARY_CONSTRUCTOR: MODIFIER_LIST:[public] @@ -69,7 +69,7 @@ PsiJetFileStubImpl[package=test.class_object] USER_TYPE:[isAbsoluteInRootPackage=false] REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Unit] - CLASS:[fqName=test.class_object.ClassObject.B, isEnumEntry=false, isLocal=false, isTopLevel=false, isTrait=false, name=B, superNames=[]] + CLASS:[fqName=test.class_object.ClassObject.B, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=B, superNames=[]] MODIFIER_LIST:[internal final] PRIMARY_CONSTRUCTOR: MODIFIER_LIST:[public] @@ -78,7 +78,7 @@ PsiJetFileStubImpl[package=test.class_object] OBJECT_DECLARATION:[fqName=test.class_object.ClassObject.B.Companion, isCompanion=true, isLocal=false, isObjectLiteral=false, isTopLevel=false, name=Companion, superNames=[]] MODIFIER_LIST:[internal companion] CLASS_BODY: - CLASS:[fqName=test.class_object.ClassObject.B.Companion.C, isEnumEntry=false, isLocal=false, isTopLevel=false, isTrait=false, name=C, superNames=[]] + CLASS:[fqName=test.class_object.ClassObject.B.Companion.C, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=C, superNames=[]] MODIFIER_LIST:[internal final] PRIMARY_CONSTRUCTOR: MODIFIER_LIST:[public] @@ -87,7 +87,7 @@ PsiJetFileStubImpl[package=test.class_object] OBJECT_DECLARATION:[fqName=test.class_object.ClassObject.B.Companion.C.Companion, isCompanion=true, isLocal=false, isObjectLiteral=false, isTopLevel=false, name=Companion, superNames=[]] MODIFIER_LIST:[internal companion] CLASS_BODY: - CLASS:[fqName=test.class_object.ClassObject.B.Companion.C.Companion.D, isEnumEntry=false, isLocal=false, isTopLevel=false, isTrait=false, name=D, superNames=[]] + CLASS:[fqName=test.class_object.ClassObject.B.Companion.C.Companion.D, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=D, superNames=[]] MODIFIER_LIST:[internal final] PRIMARY_CONSTRUCTOR: MODIFIER_LIST:[public] @@ -111,7 +111,7 @@ PsiJetFileStubImpl[package=test.class_object] USER_TYPE:[isAbsoluteInRootPackage=false] REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Unit] - CLASS:[fqName=test.class_object.ClassObject.B.Companion.C.Companion.D.Companion.Anno, isEnumEntry=false, isLocal=false, isTopLevel=false, isTrait=false, name=Anno, superNames=[Annotation]] + CLASS:[fqName=test.class_object.ClassObject.B.Companion.C.Companion.D.Companion.Anno, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=Anno, superNames=[Annotation]] MODIFIER_LIST:[annotation internal final] PRIMARY_CONSTRUCTOR: MODIFIER_LIST:[public] @@ -124,7 +124,7 @@ PsiJetFileStubImpl[package=test.class_object] REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Annotation] CLASS_BODY: - CLASS:[fqName=test.class_object.ClassObject.B.Companion.C.Companion.D.Companion.En, isEnumEntry=false, isLocal=false, isTopLevel=false, isTrait=false, name=En, superNames=[Enum]] + CLASS:[fqName=test.class_object.ClassObject.B.Companion.C.Companion.D.Companion.En, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=En, superNames=[Enum]] MODIFIER_LIST:[enum internal final] PRIMARY_CONSTRUCTOR: MODIFIER_LIST:[private] diff --git a/idea/testData/decompiler/stubBuilder/DataClass/DataClass.txt b/idea/testData/decompiler/stubBuilder/DataClass/DataClass.txt index 8347e41a3b8..0d63bdd909d 100644 --- a/idea/testData/decompiler/stubBuilder/DataClass/DataClass.txt +++ b/idea/testData/decompiler/stubBuilder/DataClass/DataClass.txt @@ -5,7 +5,7 @@ PsiJetFileStubImpl[package=a.b.c] REFERENCE_EXPRESSION:[referencedName=a] REFERENCE_EXPRESSION:[referencedName=b] REFERENCE_EXPRESSION:[referencedName=c] - CLASS:[fqName=a.b.c.DataClass, isEnumEntry=false, isLocal=false, isTopLevel=true, isTrait=false, name=DataClass, superNames=[]] + CLASS:[fqName=a.b.c.DataClass, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=DataClass, superNames=[]] MODIFIER_LIST:[public final] ANNOTATION_ENTRY:[hasValueArguments=false, shortName=data] CONSTRUCTOR_CALLEE: diff --git a/idea/testData/decompiler/stubBuilder/Delegation/Delegation.txt b/idea/testData/decompiler/stubBuilder/Delegation/Delegation.txt index 9507cff357c..e8bd287ef65 100644 --- a/idea/testData/decompiler/stubBuilder/Delegation/Delegation.txt +++ b/idea/testData/decompiler/stubBuilder/Delegation/Delegation.txt @@ -1,6 +1,6 @@ PsiJetFileStubImpl[package=] PACKAGE_DIRECTIVE: - CLASS:[fqName=Delegation, isEnumEntry=false, isLocal=false, isTopLevel=true, isTrait=false, name=Delegation, superNames=[T]] + CLASS:[fqName=Delegation, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=Delegation, superNames=[T]] MODIFIER_LIST:[internal final] PRIMARY_CONSTRUCTOR: MODIFIER_LIST:[public] diff --git a/idea/testData/decompiler/stubBuilder/DependencyOnNestedClasses/DependencyOnNestedClasses.txt b/idea/testData/decompiler/stubBuilder/DependencyOnNestedClasses/DependencyOnNestedClasses.txt index d81a7b06b6e..61418f7633f 100644 --- a/idea/testData/decompiler/stubBuilder/DependencyOnNestedClasses/DependencyOnNestedClasses.txt +++ b/idea/testData/decompiler/stubBuilder/DependencyOnNestedClasses/DependencyOnNestedClasses.txt @@ -1,7 +1,7 @@ PsiJetFileStubImpl[package=test] PACKAGE_DIRECTIVE: REFERENCE_EXPRESSION:[referencedName=test] - CLASS:[fqName=test.DependencyOnNestedClasses, isEnumEntry=false, isLocal=false, isTopLevel=true, isTrait=false, name=DependencyOnNestedClasses, superNames=[Nested]] + CLASS:[fqName=test.DependencyOnNestedClasses, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=DependencyOnNestedClasses, superNames=[Nested]] MODIFIER_LIST:[public final] PRIMARY_CONSTRUCTOR: MODIFIER_LIST:[public] diff --git a/idea/testData/decompiler/stubBuilder/Enum/Enum.txt b/idea/testData/decompiler/stubBuilder/Enum/Enum.txt index c78a3cdfcd9..28f9054ced5 100644 --- a/idea/testData/decompiler/stubBuilder/Enum/Enum.txt +++ b/idea/testData/decompiler/stubBuilder/Enum/Enum.txt @@ -9,7 +9,7 @@ PsiJetFileStubImpl[package=a.b.c.test.enum] REFERENCE_EXPRESSION:[referencedName=c] REFERENCE_EXPRESSION:[referencedName=test] REFERENCE_EXPRESSION:[referencedName=enum] - CLASS:[fqName=a.b.c.test.enum.Enum, isEnumEntry=false, isLocal=false, isTopLevel=true, isTrait=false, name=Enum, superNames=[Enum]] + CLASS:[fqName=a.b.c.test.enum.Enum, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=Enum, superNames=[Enum]] MODIFIER_LIST:[enum internal final] PRIMARY_CONSTRUCTOR: MODIFIER_LIST:[private] @@ -47,12 +47,12 @@ PsiJetFileStubImpl[package=a.b.c.test.enum] USER_TYPE:[isAbsoluteInRootPackage=false] REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] - ENUM_ENTRY:[fqName=a.b.c.test.enum.Enum.A, isEnumEntry=true, isLocal=false, isTopLevel=false, isTrait=false, name=A, superNames=[]] - ENUM_ENTRY:[fqName=a.b.c.test.enum.Enum.B, isEnumEntry=true, isLocal=false, isTopLevel=false, isTrait=false, name=B, superNames=[]] - ENUM_ENTRY:[fqName=a.b.c.test.enum.Enum.C, isEnumEntry=true, isLocal=false, isTopLevel=false, isTrait=false, name=C, superNames=[]] - ENUM_ENTRY:[fqName=a.b.c.test.enum.Enum.D, isEnumEntry=true, isLocal=false, isTopLevel=false, isTrait=false, name=D, superNames=[]] - ENUM_ENTRY:[fqName=a.b.c.test.enum.Enum.E, isEnumEntry=true, isLocal=false, isTopLevel=false, isTrait=false, name=E, superNames=[]] - ENUM_ENTRY:[fqName=a.b.c.test.enum.Enum.F, isEnumEntry=true, isLocal=false, isTopLevel=false, isTrait=false, name=F, superNames=[]] + ENUM_ENTRY:[fqName=a.b.c.test.enum.Enum.A, isEnumEntry=true, isInterface=false, isLocal=false, isTopLevel=false, name=A, superNames=[]] + ENUM_ENTRY:[fqName=a.b.c.test.enum.Enum.B, isEnumEntry=true, isInterface=false, isLocal=false, isTopLevel=false, name=B, superNames=[]] + ENUM_ENTRY:[fqName=a.b.c.test.enum.Enum.C, isEnumEntry=true, isInterface=false, isLocal=false, isTopLevel=false, name=C, superNames=[]] + ENUM_ENTRY:[fqName=a.b.c.test.enum.Enum.D, isEnumEntry=true, isInterface=false, isLocal=false, isTopLevel=false, name=D, superNames=[]] + ENUM_ENTRY:[fqName=a.b.c.test.enum.Enum.E, isEnumEntry=true, isInterface=false, isLocal=false, isTopLevel=false, name=E, superNames=[]] + ENUM_ENTRY:[fqName=a.b.c.test.enum.Enum.F, isEnumEntry=true, isInterface=false, isLocal=false, isTopLevel=false, name=F, superNames=[]] FUN:[fqName=a.b.c.test.enum.Enum.f, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isTopLevel=false, name=f] MODIFIER_LIST:[open internal] VALUE_PARAMETER_LIST: diff --git a/idea/testData/decompiler/stubBuilder/FlexibleTypes/FlexibleTypes.txt b/idea/testData/decompiler/stubBuilder/FlexibleTypes/FlexibleTypes.txt index dac12a0106e..3955d12ef18 100644 --- a/idea/testData/decompiler/stubBuilder/FlexibleTypes/FlexibleTypes.txt +++ b/idea/testData/decompiler/stubBuilder/FlexibleTypes/FlexibleTypes.txt @@ -1,7 +1,7 @@ PsiJetFileStubImpl[package=test] PACKAGE_DIRECTIVE: REFERENCE_EXPRESSION:[referencedName=test] - CLASS:[fqName=test.FlexibleTypes, isEnumEntry=false, isLocal=false, isTopLevel=true, isTrait=false, name=FlexibleTypes, superNames=[]] + CLASS:[fqName=test.FlexibleTypes, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=FlexibleTypes, superNames=[]] MODIFIER_LIST:[abstract internal] PRIMARY_CONSTRUCTOR: MODIFIER_LIST:[public] diff --git a/idea/testData/decompiler/stubBuilder/InheritingClasses/InheritingClasses.txt b/idea/testData/decompiler/stubBuilder/InheritingClasses/InheritingClasses.txt index a06f0384c4b..8658af5c5a9 100644 --- a/idea/testData/decompiler/stubBuilder/InheritingClasses/InheritingClasses.txt +++ b/idea/testData/decompiler/stubBuilder/InheritingClasses/InheritingClasses.txt @@ -1,13 +1,13 @@ PsiJetFileStubImpl[package=a] PACKAGE_DIRECTIVE: REFERENCE_EXPRESSION:[referencedName=a] - CLASS:[fqName=a.InheritingClasses, isEnumEntry=false, isLocal=false, isTopLevel=true, isTrait=false, name=InheritingClasses, superNames=[]] + CLASS:[fqName=a.InheritingClasses, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=InheritingClasses, superNames=[]] MODIFIER_LIST:[internal final] PRIMARY_CONSTRUCTOR: MODIFIER_LIST:[public] VALUE_PARAMETER_LIST: CLASS_BODY: - CLASS:[fqName=a.InheritingClasses.A, isEnumEntry=false, isLocal=false, isTopLevel=false, isTrait=false, name=A, superNames=[C]] + CLASS:[fqName=a.InheritingClasses.A, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=A, superNames=[C]] MODIFIER_LIST:[abstract internal] PRIMARY_CONSTRUCTOR: MODIFIER_LIST:[public] @@ -65,7 +65,7 @@ PsiJetFileStubImpl[package=a] USER_TYPE:[isAbsoluteInRootPackage=false] REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] - CLASS:[fqName=a.InheritingClasses.B, isEnumEntry=false, isLocal=false, isTopLevel=false, isTrait=false, name=B, superNames=[A]] + CLASS:[fqName=a.InheritingClasses.B, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=B, superNames=[A]] MODIFIER_LIST:[open internal] PRIMARY_CONSTRUCTOR: MODIFIER_LIST:[public] @@ -110,7 +110,7 @@ PsiJetFileStubImpl[package=a] USER_TYPE:[isAbsoluteInRootPackage=false] REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] - CLASS:[fqName=a.InheritingClasses.C, isEnumEntry=false, isLocal=false, isTopLevel=false, isTrait=true, name=C, superNames=[]] + CLASS:[fqName=a.InheritingClasses.C, isEnumEntry=false, isInterface=true, isLocal=false, isTopLevel=false, name=C, superNames=[]] MODIFIER_LIST:[internal] CLASS_BODY: PROPERTY:[fqName=a.InheritingClasses.C.c, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=false, isTopLevel=false, isVar=false, name=c] @@ -120,7 +120,7 @@ PsiJetFileStubImpl[package=a] USER_TYPE:[isAbsoluteInRootPackage=false] REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] - CLASS:[fqName=a.InheritingClasses.D, isEnumEntry=false, isLocal=false, isTopLevel=false, isTrait=true, name=D, superNames=[C]] + CLASS:[fqName=a.InheritingClasses.D, isEnumEntry=false, isInterface=true, isLocal=false, isTopLevel=false, name=D, superNames=[C]] MODIFIER_LIST:[internal] TYPE_PARAMETER_LIST: TYPE_PARAMETER:[fqName=null, isInVariance=false, isOutVariance=false, name=T] @@ -141,10 +141,10 @@ PsiJetFileStubImpl[package=a] USER_TYPE:[isAbsoluteInRootPackage=false] REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] - CLASS:[fqName=a.InheritingClasses.E, isEnumEntry=false, isLocal=false, isTopLevel=false, isTrait=true, name=E, superNames=[]] + CLASS:[fqName=a.InheritingClasses.E, isEnumEntry=false, isInterface=true, isLocal=false, isTopLevel=false, name=E, superNames=[]] MODIFIER_LIST:[internal] CLASS_BODY: - CLASS:[fqName=a.InheritingClasses.G, isEnumEntry=false, isLocal=false, isTopLevel=false, isTrait=false, name=G, superNames=[B, C, D, E]] + CLASS:[fqName=a.InheritingClasses.G, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=G, superNames=[B, C, D, E]] MODIFIER_LIST:[internal final] PRIMARY_CONSTRUCTOR: MODIFIER_LIST:[public] @@ -190,25 +190,25 @@ PsiJetFileStubImpl[package=a] REFERENCE_EXPRESSION:[referencedName=InheritingClasses] REFERENCE_EXPRESSION:[referencedName=E] CLASS_BODY: - CLASS:[fqName=a.InheritingClasses.InheritAny, isEnumEntry=false, isLocal=false, isTopLevel=false, isTrait=false, name=InheritAny, superNames=[]] + CLASS:[fqName=a.InheritingClasses.InheritAny, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=InheritAny, superNames=[]] MODIFIER_LIST:[internal final] PRIMARY_CONSTRUCTOR: MODIFIER_LIST:[public] VALUE_PARAMETER_LIST: CLASS_BODY: - CLASS:[fqName=a.InheritingClasses.InheritAny.ExplicitAny, isEnumEntry=false, isLocal=false, isTopLevel=false, isTrait=false, name=ExplicitAny, superNames=[]] + CLASS:[fqName=a.InheritingClasses.InheritAny.ExplicitAny, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=ExplicitAny, superNames=[]] MODIFIER_LIST:[internal final] PRIMARY_CONSTRUCTOR: MODIFIER_LIST:[public] VALUE_PARAMETER_LIST: CLASS_BODY: - CLASS:[fqName=a.InheritingClasses.InheritAny.ImplicitAny, isEnumEntry=false, isLocal=false, isTopLevel=false, isTrait=false, name=ImplicitAny, superNames=[]] + CLASS:[fqName=a.InheritingClasses.InheritAny.ImplicitAny, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=ImplicitAny, superNames=[]] MODIFIER_LIST:[internal final] PRIMARY_CONSTRUCTOR: MODIFIER_LIST:[public] VALUE_PARAMETER_LIST: CLASS_BODY: - CLASS:[fqName=a.InheritingClasses.InheritAny.OnlyTrait, isEnumEntry=false, isLocal=false, isTopLevel=false, isTrait=false, name=OnlyTrait, superNames=[SomeTrait]] + CLASS:[fqName=a.InheritingClasses.InheritAny.OnlyTrait, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=OnlyTrait, superNames=[SomeTrait]] MODIFIER_LIST:[internal final] PRIMARY_CONSTRUCTOR: MODIFIER_LIST:[public] @@ -225,7 +225,7 @@ PsiJetFileStubImpl[package=a] REFERENCE_EXPRESSION:[referencedName=InheritAny] REFERENCE_EXPRESSION:[referencedName=SomeTrait] CLASS_BODY: - CLASS:[fqName=a.InheritingClasses.InheritAny.OnlyTraits, isEnumEntry=false, isLocal=false, isTopLevel=false, isTrait=false, name=OnlyTraits, superNames=[SomeTrait, SomeTrait2]] + CLASS:[fqName=a.InheritingClasses.InheritAny.OnlyTraits, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=OnlyTraits, superNames=[SomeTrait, SomeTrait2]] MODIFIER_LIST:[internal final] PRIMARY_CONSTRUCTOR: MODIFIER_LIST:[public] @@ -252,13 +252,13 @@ PsiJetFileStubImpl[package=a] REFERENCE_EXPRESSION:[referencedName=InheritAny] REFERENCE_EXPRESSION:[referencedName=SomeTrait2] CLASS_BODY: - CLASS:[fqName=a.InheritingClasses.InheritAny.SomeTrait, isEnumEntry=false, isLocal=false, isTopLevel=false, isTrait=true, name=SomeTrait, superNames=[]] + CLASS:[fqName=a.InheritingClasses.InheritAny.SomeTrait, isEnumEntry=false, isInterface=true, isLocal=false, isTopLevel=false, name=SomeTrait, superNames=[]] MODIFIER_LIST:[internal] CLASS_BODY: - CLASS:[fqName=a.InheritingClasses.InheritAny.SomeTrait2, isEnumEntry=false, isLocal=false, isTopLevel=false, isTrait=true, name=SomeTrait2, superNames=[]] + CLASS:[fqName=a.InheritingClasses.InheritAny.SomeTrait2, isEnumEntry=false, isInterface=true, isLocal=false, isTopLevel=false, name=SomeTrait2, superNames=[]] MODIFIER_LIST:[internal] CLASS_BODY: - CLASS:[fqName=a.InheritingClasses.InheritAny.TraitWithExplicitAny, isEnumEntry=false, isLocal=false, isTopLevel=false, isTrait=false, name=TraitWithExplicitAny, superNames=[Any, SomeTrait]] + CLASS:[fqName=a.InheritingClasses.InheritAny.TraitWithExplicitAny, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=TraitWithExplicitAny, superNames=[Any, SomeTrait]] MODIFIER_LIST:[internal final] PRIMARY_CONSTRUCTOR: MODIFIER_LIST:[public] @@ -281,7 +281,7 @@ PsiJetFileStubImpl[package=a] REFERENCE_EXPRESSION:[referencedName=InheritAny] REFERENCE_EXPRESSION:[referencedName=SomeTrait] CLASS_BODY: - CLASS:[fqName=a.InheritingClasses.InheritAny.TraitsWithExplicitAny, isEnumEntry=false, isLocal=false, isTopLevel=false, isTrait=false, name=TraitsWithExplicitAny, superNames=[SomeTrait2, Any, SomeTrait]] + CLASS:[fqName=a.InheritingClasses.InheritAny.TraitsWithExplicitAny, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=TraitsWithExplicitAny, superNames=[SomeTrait2, Any, SomeTrait]] MODIFIER_LIST:[internal final] PRIMARY_CONSTRUCTOR: MODIFIER_LIST:[public] @@ -314,7 +314,7 @@ PsiJetFileStubImpl[package=a] REFERENCE_EXPRESSION:[referencedName=InheritAny] REFERENCE_EXPRESSION:[referencedName=SomeTrait] CLASS_BODY: - CLASS:[fqName=a.InheritingClasses.InheritExtensionFunctionType, isEnumEntry=false, isLocal=false, isTopLevel=false, isTrait=false, name=InheritExtensionFunctionType, superNames=[]] + CLASS:[fqName=a.InheritingClasses.InheritExtensionFunctionType, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=InheritExtensionFunctionType, superNames=[]] MODIFIER_LIST:[abstract internal] PRIMARY_CONSTRUCTOR: MODIFIER_LIST:[public] @@ -350,7 +350,7 @@ PsiJetFileStubImpl[package=a] REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] CLASS_BODY: - CLASS:[fqName=a.InheritingClasses.InheritFunctionType, isEnumEntry=false, isLocal=false, isTopLevel=false, isTrait=false, name=InheritFunctionType, superNames=[]] + CLASS:[fqName=a.InheritingClasses.InheritFunctionType, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=InheritFunctionType, superNames=[]] MODIFIER_LIST:[abstract internal] PRIMARY_CONSTRUCTOR: MODIFIER_LIST:[public] diff --git a/idea/testData/decompiler/stubBuilder/LocalClass/LocalClass.txt b/idea/testData/decompiler/stubBuilder/LocalClass/LocalClass.txt index 4699a05ce91..5cb31c512eb 100644 --- a/idea/testData/decompiler/stubBuilder/LocalClass/LocalClass.txt +++ b/idea/testData/decompiler/stubBuilder/LocalClass/LocalClass.txt @@ -1,7 +1,7 @@ PsiJetFileStubImpl[package=test] PACKAGE_DIRECTIVE: REFERENCE_EXPRESSION:[referencedName=test] - CLASS:[fqName=test.LocalClass, isEnumEntry=false, isLocal=false, isTopLevel=true, isTrait=false, name=LocalClass, superNames=[]] + CLASS:[fqName=test.LocalClass, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=LocalClass, superNames=[]] MODIFIER_LIST:[internal final] PRIMARY_CONSTRUCTOR: MODIFIER_LIST:[public] diff --git a/idea/testData/decompiler/stubBuilder/NestedClasses/NestedClasses.txt b/idea/testData/decompiler/stubBuilder/NestedClasses/NestedClasses.txt index f25df9b82b2..54288ee0dce 100644 --- a/idea/testData/decompiler/stubBuilder/NestedClasses/NestedClasses.txt +++ b/idea/testData/decompiler/stubBuilder/NestedClasses/NestedClasses.txt @@ -1,7 +1,7 @@ PsiJetFileStubImpl[package=test] PACKAGE_DIRECTIVE: REFERENCE_EXPRESSION:[referencedName=test] - CLASS:[fqName=test.NestedClasses, isEnumEntry=false, isLocal=false, isTopLevel=true, isTrait=false, name=NestedClasses, superNames=[]] + CLASS:[fqName=test.NestedClasses, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=NestedClasses, superNames=[]] MODIFIER_LIST:[internal final] TYPE_PARAMETER_LIST: TYPE_PARAMETER:[fqName=null, isInVariance=false, isOutVariance=false, name=TOuter] @@ -24,7 +24,7 @@ PsiJetFileStubImpl[package=test] USER_TYPE:[isAbsoluteInRootPackage=false] REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Unit] - CLASS:[fqName=test.NestedClasses.Inner, isEnumEntry=false, isLocal=false, isTopLevel=false, isTrait=false, name=Inner, superNames=[]] + CLASS:[fqName=test.NestedClasses.Inner, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=Inner, superNames=[]] MODIFIER_LIST:[inner public final] TYPE_PARAMETER_LIST: TYPE_PARAMETER:[fqName=null, isInVariance=false, isOutVariance=false, name=TI] @@ -47,7 +47,7 @@ PsiJetFileStubImpl[package=test] USER_TYPE:[isAbsoluteInRootPackage=false] REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Unit] - CLASS:[fqName=test.NestedClasses.Inner.II, isEnumEntry=false, isLocal=false, isTopLevel=false, isTrait=false, name=II, superNames=[]] + CLASS:[fqName=test.NestedClasses.Inner.II, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=II, superNames=[]] MODIFIER_LIST:[inner private final] TYPE_PARAMETER_LIST: TYPE_PARAMETER:[fqName=null, isInVariance=false, isOutVariance=false, name=TII] @@ -93,7 +93,7 @@ PsiJetFileStubImpl[package=test] USER_TYPE:[isAbsoluteInRootPackage=false] REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Unit] - CLASS:[fqName=test.NestedClasses.Nested, isEnumEntry=false, isLocal=false, isTopLevel=false, isTrait=false, name=Nested, superNames=[]] + CLASS:[fqName=test.NestedClasses.Nested, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=Nested, superNames=[]] MODIFIER_LIST:[private final] TYPE_PARAMETER_LIST: TYPE_PARAMETER:[fqName=null, isInVariance=false, isOutVariance=false, name=TN] @@ -120,7 +120,7 @@ PsiJetFileStubImpl[package=test] USER_TYPE:[isAbsoluteInRootPackage=false] REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Unit] - CLASS:[fqName=test.NestedClasses.Nested.NI, isEnumEntry=false, isLocal=false, isTopLevel=false, isTrait=false, name=NI, superNames=[]] + CLASS:[fqName=test.NestedClasses.Nested.NI, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=NI, superNames=[]] MODIFIER_LIST:[inner internal final] TYPE_PARAMETER_LIST: TYPE_PARAMETER:[fqName=null, isInVariance=false, isOutVariance=false, name=TNI] @@ -147,7 +147,7 @@ PsiJetFileStubImpl[package=test] USER_TYPE:[isAbsoluteInRootPackage=false] REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Unit] - CLASS:[fqName=test.NestedClasses.Nested.NN, isEnumEntry=false, isLocal=false, isTopLevel=false, isTrait=false, name=NN, superNames=[]] + CLASS:[fqName=test.NestedClasses.Nested.NN, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=NN, superNames=[]] MODIFIER_LIST:[public final] TYPE_PARAMETER_LIST: TYPE_PARAMETER:[fqName=null, isInVariance=false, isOutVariance=false, name=TNN] diff --git a/idea/testData/decompiler/stubBuilder/Objects/Objects.txt b/idea/testData/decompiler/stubBuilder/Objects/Objects.txt index 7a1d0eb8198..c0110be0bda 100644 --- a/idea/testData/decompiler/stubBuilder/Objects/Objects.txt +++ b/idea/testData/decompiler/stubBuilder/Objects/Objects.txt @@ -41,7 +41,7 @@ PsiJetFileStubImpl[package=] USER_TYPE:[isAbsoluteInRootPackage=false] REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Unit] - CLASS:[fqName=Objects.NestedClass, isEnumEntry=false, isLocal=false, isTopLevel=false, isTrait=false, name=NestedClass, superNames=[]] + CLASS:[fqName=Objects.NestedClass, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=NestedClass, superNames=[]] MODIFIER_LIST:[open internal] PRIMARY_CONSTRUCTOR: MODIFIER_LIST:[public] diff --git a/idea/testData/decompiler/stubBuilder/PrivateToThis/PrivateToThis.txt b/idea/testData/decompiler/stubBuilder/PrivateToThis/PrivateToThis.txt index eafb7b185db..6acbbd80da0 100644 --- a/idea/testData/decompiler/stubBuilder/PrivateToThis/PrivateToThis.txt +++ b/idea/testData/decompiler/stubBuilder/PrivateToThis/PrivateToThis.txt @@ -1,7 +1,7 @@ PsiJetFileStubImpl[package=p] PACKAGE_DIRECTIVE: REFERENCE_EXPRESSION:[referencedName=p] - CLASS:[fqName=p.PrivateToThis, isEnumEntry=false, isLocal=false, isTopLevel=true, isTrait=false, name=PrivateToThis, superNames=[]] + CLASS:[fqName=p.PrivateToThis, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=PrivateToThis, superNames=[]] MODIFIER_LIST:[internal final] TYPE_PARAMETER_LIST: TYPE_PARAMETER:[fqName=null, isInVariance=true, isOutVariance=false, name=I] diff --git a/idea/testData/decompiler/stubBuilder/SecondaryConstructors/SecondaryConstructors.txt b/idea/testData/decompiler/stubBuilder/SecondaryConstructors/SecondaryConstructors.txt index 211b6090a63..d4bb6e4f70c 100644 --- a/idea/testData/decompiler/stubBuilder/SecondaryConstructors/SecondaryConstructors.txt +++ b/idea/testData/decompiler/stubBuilder/SecondaryConstructors/SecondaryConstructors.txt @@ -1,7 +1,7 @@ PsiJetFileStubImpl[package=test] PACKAGE_DIRECTIVE: REFERENCE_EXPRESSION:[referencedName=test] - CLASS:[fqName=test.SecondaryConstructors, isEnumEntry=false, isLocal=false, isTopLevel=true, isTrait=false, name=SecondaryConstructors, superNames=[]] + CLASS:[fqName=test.SecondaryConstructors, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=SecondaryConstructors, superNames=[]] MODIFIER_LIST:[internal final] PRIMARY_CONSTRUCTOR: MODIFIER_LIST:[public] @@ -38,7 +38,7 @@ PsiJetFileStubImpl[package=test] USER_TYPE:[isAbsoluteInRootPackage=false] REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] - CLASS:[fqName=test.SecondaryConstructors.Inner, isEnumEntry=false, isLocal=false, isTopLevel=false, isTrait=false, name=Inner, superNames=[]] + CLASS:[fqName=test.SecondaryConstructors.Inner, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=Inner, superNames=[]] MODIFIER_LIST:[inner internal final] TYPE_PARAMETER_LIST: TYPE_PARAMETER:[fqName=null, isInVariance=false, isOutVariance=false, name=T] @@ -73,7 +73,7 @@ PsiJetFileStubImpl[package=test] TYPE_REFERENCE: USER_TYPE:[isAbsoluteInRootPackage=false] REFERENCE_EXPRESSION:[referencedName=G] - CLASS:[fqName=test.SecondaryConstructors.Nested, isEnumEntry=false, isLocal=false, isTopLevel=false, isTrait=false, name=Nested, superNames=[]] + CLASS:[fqName=test.SecondaryConstructors.Nested, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=Nested, superNames=[]] MODIFIER_LIST:[internal final] CLASS_BODY: SECONDARY_CONSTRUCTOR: diff --git a/idea/testData/decompiler/stubBuilder/TypeBoundsAndDelegationSpecifiers/TypeBoundsAndDelegationSpecifiers.txt b/idea/testData/decompiler/stubBuilder/TypeBoundsAndDelegationSpecifiers/TypeBoundsAndDelegationSpecifiers.txt index 10b3a3b26c3..e377336c682 100644 --- a/idea/testData/decompiler/stubBuilder/TypeBoundsAndDelegationSpecifiers/TypeBoundsAndDelegationSpecifiers.txt +++ b/idea/testData/decompiler/stubBuilder/TypeBoundsAndDelegationSpecifiers/TypeBoundsAndDelegationSpecifiers.txt @@ -1,7 +1,7 @@ PsiJetFileStubImpl[package=test] PACKAGE_DIRECTIVE: REFERENCE_EXPRESSION:[referencedName=test] - CLASS:[fqName=test.TypeBoundsAndDelegationSpecifiers, isEnumEntry=false, isLocal=false, isTopLevel=true, isTrait=false, name=TypeBoundsAndDelegationSpecifiers, superNames=[A, T]] + CLASS:[fqName=test.TypeBoundsAndDelegationSpecifiers, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=TypeBoundsAndDelegationSpecifiers, superNames=[A, T]] MODIFIER_LIST:[internal final] TYPE_PARAMETER_LIST: TYPE_PARAMETER:[fqName=null, isInVariance=false, isOutVariance=false, name=H] diff --git a/idea/testData/decompiler/stubBuilder/TypeParams/TypeParams.txt b/idea/testData/decompiler/stubBuilder/TypeParams/TypeParams.txt index 776d277f627..39694ae54a2 100644 --- a/idea/testData/decompiler/stubBuilder/TypeParams/TypeParams.txt +++ b/idea/testData/decompiler/stubBuilder/TypeParams/TypeParams.txt @@ -1,7 +1,7 @@ PsiJetFileStubImpl[package=test] PACKAGE_DIRECTIVE: REFERENCE_EXPRESSION:[referencedName=test] - CLASS:[fqName=test.TypeParams, isEnumEntry=false, isLocal=false, isTopLevel=true, isTrait=false, name=TypeParams, superNames=[]] + CLASS:[fqName=test.TypeParams, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=TypeParams, superNames=[]] MODIFIER_LIST:[internal final] TYPE_PARAMETER_LIST: TYPE_PARAMETER:[fqName=null, isInVariance=true, isOutVariance=false, name=T1] diff --git a/idea/testData/decompiler/stubBuilder/Types/Types.txt b/idea/testData/decompiler/stubBuilder/Types/Types.txt index c4e210e0f56..b1e26fa0df4 100644 --- a/idea/testData/decompiler/stubBuilder/Types/Types.txt +++ b/idea/testData/decompiler/stubBuilder/Types/Types.txt @@ -1,7 +1,7 @@ PsiJetFileStubImpl[package=test] PACKAGE_DIRECTIVE: REFERENCE_EXPRESSION:[referencedName=test] - CLASS:[fqName=test.Types, isEnumEntry=false, isLocal=false, isTopLevel=true, isTrait=false, name=Types, superNames=[]] + CLASS:[fqName=test.Types, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=Types, superNames=[]] MODIFIER_LIST:[abstract internal] PRIMARY_CONSTRUCTOR: MODIFIER_LIST:[public] diff --git a/idea/testData/stubs/AnnotationClass.expected b/idea/testData/stubs/AnnotationClass.expected index 1ab18625aed..9e7e93eaaca 100644 --- a/idea/testData/stubs/AnnotationClass.expected +++ b/idea/testData/stubs/AnnotationClass.expected @@ -1,4 +1,4 @@ PsiJetFileStubImpl[package=] PACKAGE_DIRECTIVE: - CLASS:[fqName=Test, isEnumEntry=false, isLocal=false, isTopLevel=true, isTrait=false, name=Test, superNames=[]] + CLASS:[fqName=Test, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=Test, superNames=[]] MODIFIER_LIST:[annotation] diff --git a/idea/testData/stubs/AnnotationOnClass.expected b/idea/testData/stubs/AnnotationOnClass.expected index 5b9f0bf5391..d40cb071a53 100644 --- a/idea/testData/stubs/AnnotationOnClass.expected +++ b/idea/testData/stubs/AnnotationOnClass.expected @@ -1,6 +1,6 @@ PsiJetFileStubImpl[package=] PACKAGE_DIRECTIVE: - CLASS:[fqName=Test, isEnumEntry=false, isLocal=false, isTopLevel=true, isTrait=false, name=Test, superNames=[]] + CLASS:[fqName=Test, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=Test, superNames=[]] MODIFIER_LIST:[] ANNOTATION_ENTRY:[hasValueArguments=false, shortName=Deprecated] CONSTRUCTOR_CALLEE: diff --git a/idea/testData/stubs/AnnotationsOnPrimaryCtr.expected b/idea/testData/stubs/AnnotationsOnPrimaryCtr.expected index df174320b7c..0fa4cfbe6a2 100644 --- a/idea/testData/stubs/AnnotationsOnPrimaryCtr.expected +++ b/idea/testData/stubs/AnnotationsOnPrimaryCtr.expected @@ -1,6 +1,6 @@ PsiJetFileStubImpl[package=] PACKAGE_DIRECTIVE: - CLASS:[fqName=A, isEnumEntry=false, isLocal=false, isTopLevel=true, isTrait=false, name=A, superNames=[]] + CLASS:[fqName=A, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=A, superNames=[]] PRIMARY_CONSTRUCTOR: MODIFIER_LIST:[private] ANNOTATION: diff --git a/idea/testData/stubs/AnonymousObject.expected b/idea/testData/stubs/AnonymousObject.expected index 3cffcc6b909..09b595a2be9 100644 --- a/idea/testData/stubs/AnonymousObject.expected +++ b/idea/testData/stubs/AnonymousObject.expected @@ -1,7 +1,7 @@ PsiJetFileStubImpl[package=] PACKAGE_DIRECTIVE: - CLASS:[fqName=A, isEnumEntry=false, isLocal=false, isTopLevel=true, isTrait=false, name=A, superNames=[]] - CLASS:[fqName=T, isEnumEntry=false, isLocal=false, isTopLevel=true, isTrait=true, name=T, superNames=[]] + CLASS:[fqName=A, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=A, superNames=[]] + CLASS:[fqName=T, isEnumEntry=false, isInterface=true, isLocal=false, isTopLevel=true, name=T, superNames=[]] PROPERTY:[fqName=obj, hasDelegate=false, hasDelegateExpression=false, hasInitializer=true, hasReturnTypeRef=false, isExtension=false, isTopLevel=true, isVar=false, name=obj] OBJECT_DECLARATION:[fqName=null, isCompanion=false, isLocal=true, isObjectLiteral=true, isTopLevel=false, name=null, superNames=[A, T]] DELEGATION_SPECIFIER_LIST: diff --git a/idea/testData/stubs/ClassObject.expected b/idea/testData/stubs/ClassObject.expected index ce0b1cee45b..cf47338ca11 100644 --- a/idea/testData/stubs/ClassObject.expected +++ b/idea/testData/stubs/ClassObject.expected @@ -1,6 +1,6 @@ PsiJetFileStubImpl[package=] PACKAGE_DIRECTIVE: - CLASS:[fqName=C, isEnumEntry=false, isLocal=false, isTopLevel=true, isTrait=false, name=C, superNames=[]] + CLASS:[fqName=C, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=C, superNames=[]] CLASS_BODY: OBJECT_DECLARATION:[fqName=C.Companion, isCompanion=true, isLocal=false, isObjectLiteral=false, isTopLevel=false, name=Companion, superNames=[]] MODIFIER_LIST:[companion] diff --git a/idea/testData/stubs/ClassProperty.expected b/idea/testData/stubs/ClassProperty.expected index 34bf43cd2e5..92fb23562fe 100644 --- a/idea/testData/stubs/ClassProperty.expected +++ b/idea/testData/stubs/ClassProperty.expected @@ -1,6 +1,6 @@ PsiJetFileStubImpl[package=] PACKAGE_DIRECTIVE: - CLASS:[fqName=More, isEnumEntry=false, isLocal=false, isTopLevel=true, isTrait=false, name=More, superNames=[]] + CLASS:[fqName=More, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=More, superNames=[]] CLASS_BODY: PROPERTY:[fqName=More.test, hasDelegate=false, hasDelegateExpression=false, hasInitializer=true, hasReturnTypeRef=true, isExtension=false, isTopLevel=false, isVar=false, name=test] MODIFIER_LIST:[private] diff --git a/idea/testData/stubs/ClassTypeParameters.expected b/idea/testData/stubs/ClassTypeParameters.expected index 6aa01faefd2..732c00ca124 100644 --- a/idea/testData/stubs/ClassTypeParameters.expected +++ b/idea/testData/stubs/ClassTypeParameters.expected @@ -1,6 +1,6 @@ PsiJetFileStubImpl[package=] PACKAGE_DIRECTIVE: - CLASS:[fqName=C, isEnumEntry=false, isLocal=false, isTopLevel=true, isTrait=false, name=C, superNames=[]] + CLASS:[fqName=C, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=C, superNames=[]] TYPE_PARAMETER_LIST: TYPE_PARAMETER:[fqName=null, isInVariance=false, isOutVariance=false, name=T] CLASS_BODY: diff --git a/idea/testData/stubs/DanglingAnnotations.expected b/idea/testData/stubs/DanglingAnnotations.expected index 1f77e0ec773..ac8e32d1143 100644 --- a/idea/testData/stubs/DanglingAnnotations.expected +++ b/idea/testData/stubs/DanglingAnnotations.expected @@ -1,6 +1,6 @@ PsiJetFileStubImpl[package=] PACKAGE_DIRECTIVE: - CLASS:[fqName=C, isEnumEntry=false, isLocal=false, isTopLevel=true, isTrait=false, name=C, superNames=[]] + CLASS:[fqName=C, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=C, superNames=[]] CLASS_BODY: MODIFIER_LIST:[] ANNOTATION: diff --git a/idea/testData/stubs/InnerClass.expected b/idea/testData/stubs/InnerClass.expected index d51ec800611..86a94987f46 100644 --- a/idea/testData/stubs/InnerClass.expected +++ b/idea/testData/stubs/InnerClass.expected @@ -1,7 +1,7 @@ PsiJetFileStubImpl[package=] PACKAGE_DIRECTIVE: - CLASS:[fqName=A, isEnumEntry=false, isLocal=false, isTopLevel=true, isTrait=false, name=A, superNames=[]] + CLASS:[fqName=A, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=A, superNames=[]] CLASS_BODY: - CLASS:[fqName=A.B, isEnumEntry=false, isLocal=false, isTopLevel=false, isTrait=false, name=B, superNames=[]] + CLASS:[fqName=A.B, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=B, superNames=[]] MODIFIER_LIST:[inner] CLASS_BODY: diff --git a/idea/testData/stubs/LocalClass.expected b/idea/testData/stubs/LocalClass.expected index 93914874ab9..c11ef812f0b 100644 --- a/idea/testData/stubs/LocalClass.expected +++ b/idea/testData/stubs/LocalClass.expected @@ -1,10 +1,10 @@ PsiJetFileStubImpl[package=] PACKAGE_DIRECTIVE: - CLASS:[fqName=A, isEnumEntry=false, isLocal=false, isTopLevel=true, isTrait=false, name=A, superNames=[]] - CLASS:[fqName=T, isEnumEntry=false, isLocal=false, isTopLevel=true, isTrait=true, name=T, superNames=[]] + CLASS:[fqName=A, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=A, superNames=[]] + CLASS:[fqName=T, isEnumEntry=false, isInterface=true, isLocal=false, isTopLevel=true, name=T, superNames=[]] FUN:[fqName=foo, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isTopLevel=true, name=foo] VALUE_PARAMETER_LIST: - CLASS:[fqName=null, isEnumEntry=false, isLocal=true, isTopLevel=false, isTrait=false, name=Test, superNames=[A, T]] + CLASS:[fqName=null, isEnumEntry=false, isInterface=false, isLocal=true, isTopLevel=false, name=Test, superNames=[A, T]] DELEGATION_SPECIFIER_LIST: DELEGATOR_SUPER_CALL: CONSTRUCTOR_CALLEE: diff --git a/idea/testData/stubs/LocalClassInLocalFunction.expected b/idea/testData/stubs/LocalClassInLocalFunction.expected index 93914874ab9..c11ef812f0b 100644 --- a/idea/testData/stubs/LocalClassInLocalFunction.expected +++ b/idea/testData/stubs/LocalClassInLocalFunction.expected @@ -1,10 +1,10 @@ PsiJetFileStubImpl[package=] PACKAGE_DIRECTIVE: - CLASS:[fqName=A, isEnumEntry=false, isLocal=false, isTopLevel=true, isTrait=false, name=A, superNames=[]] - CLASS:[fqName=T, isEnumEntry=false, isLocal=false, isTopLevel=true, isTrait=true, name=T, superNames=[]] + CLASS:[fqName=A, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=A, superNames=[]] + CLASS:[fqName=T, isEnumEntry=false, isInterface=true, isLocal=false, isTopLevel=true, name=T, superNames=[]] FUN:[fqName=foo, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isTopLevel=true, name=foo] VALUE_PARAMETER_LIST: - CLASS:[fqName=null, isEnumEntry=false, isLocal=true, isTopLevel=false, isTrait=false, name=Test, superNames=[A, T]] + CLASS:[fqName=null, isEnumEntry=false, isInterface=false, isLocal=true, isTopLevel=false, name=Test, superNames=[A, T]] DELEGATION_SPECIFIER_LIST: DELEGATOR_SUPER_CALL: CONSTRUCTOR_CALLEE: diff --git a/idea/testData/stubs/LocalNamedObject.expected b/idea/testData/stubs/LocalNamedObject.expected index c930379700c..9e4b218aaf7 100644 --- a/idea/testData/stubs/LocalNamedObject.expected +++ b/idea/testData/stubs/LocalNamedObject.expected @@ -1,7 +1,7 @@ PsiJetFileStubImpl[package=] PACKAGE_DIRECTIVE: - CLASS:[fqName=A, isEnumEntry=false, isLocal=false, isTopLevel=true, isTrait=false, name=A, superNames=[]] - CLASS:[fqName=T, isEnumEntry=false, isLocal=false, isTopLevel=true, isTrait=true, name=T, superNames=[]] + CLASS:[fqName=A, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=A, superNames=[]] + CLASS:[fqName=T, isEnumEntry=false, isInterface=true, isLocal=false, isTopLevel=true, name=T, superNames=[]] FUN:[fqName=foo, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isTopLevel=true, name=foo] VALUE_PARAMETER_LIST: OBJECT_DECLARATION:[fqName=null, isCompanion=false, isLocal=true, isObjectLiteral=false, isTopLevel=false, name=O, superNames=[A, T]] diff --git a/idea/testData/stubs/MembersInLocalClass.expected b/idea/testData/stubs/MembersInLocalClass.expected index 5aff8071d37..cc7f2a1b4d8 100644 --- a/idea/testData/stubs/MembersInLocalClass.expected +++ b/idea/testData/stubs/MembersInLocalClass.expected @@ -2,7 +2,7 @@ PsiJetFileStubImpl[package=] PACKAGE_DIRECTIVE: FUN:[fqName=f, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isTopLevel=true, name=f] MODIFIER_LIST:[public] - CLASS:[fqName=null, isEnumEntry=false, isLocal=true, isTopLevel=false, isTrait=false, name=C, superNames=[]] + CLASS:[fqName=null, isEnumEntry=false, isInterface=false, isLocal=true, isTopLevel=false, name=C, superNames=[]] CLASS_BODY: FUN:[fqName=null, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isTopLevel=false, name=f] VALUE_PARAMETER_LIST: diff --git a/idea/testData/stubs/NamedObject.expected b/idea/testData/stubs/NamedObject.expected index 31d13ff3f06..adde223b79f 100644 --- a/idea/testData/stubs/NamedObject.expected +++ b/idea/testData/stubs/NamedObject.expected @@ -1,7 +1,7 @@ PsiJetFileStubImpl[package=] PACKAGE_DIRECTIVE: - CLASS:[fqName=A, isEnumEntry=false, isLocal=false, isTopLevel=true, isTrait=false, name=A, superNames=[]] - CLASS:[fqName=T, isEnumEntry=false, isLocal=false, isTopLevel=true, isTrait=true, name=T, superNames=[]] + CLASS:[fqName=A, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=A, superNames=[]] + CLASS:[fqName=T, isEnumEntry=false, isInterface=true, isLocal=false, isTopLevel=true, name=T, superNames=[]] OBJECT_DECLARATION:[fqName=Test, isCompanion=false, isLocal=false, isObjectLiteral=false, isTopLevel=true, name=Test, superNames=[A, T]] DELEGATION_SPECIFIER_LIST: DELEGATOR_SUPER_CALL: diff --git a/idea/testData/stubs/NotStorePropertiesFrom.expected b/idea/testData/stubs/NotStorePropertiesFrom.expected index 18546464ed0..46a13c49509 100644 --- a/idea/testData/stubs/NotStorePropertiesFrom.expected +++ b/idea/testData/stubs/NotStorePropertiesFrom.expected @@ -1,6 +1,6 @@ PsiJetFileStubImpl[package=] PACKAGE_DIRECTIVE: - CLASS:[fqName=Test, isEnumEntry=false, isLocal=false, isTopLevel=true, isTrait=false, name=Test, superNames=[]] + CLASS:[fqName=Test, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=Test, superNames=[]] PRIMARY_CONSTRUCTOR: VALUE_PARAMETER_LIST: CLASS_BODY: diff --git a/idea/testData/stubs/ParametersWithFqName.expected b/idea/testData/stubs/ParametersWithFqName.expected index 5f65217a074..17e288dc004 100644 --- a/idea/testData/stubs/ParametersWithFqName.expected +++ b/idea/testData/stubs/ParametersWithFqName.expected @@ -1,7 +1,7 @@ PsiJetFileStubImpl[package=test] PACKAGE_DIRECTIVE: REFERENCE_EXPRESSION:[referencedName=test] - CLASS:[fqName=test.A, isEnumEntry=false, isLocal=false, isTopLevel=true, isTrait=false, name=A, superNames=[]] + CLASS:[fqName=test.A, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=A, superNames=[]] PRIMARY_CONSTRUCTOR: VALUE_PARAMETER_LIST: VALUE_PARAMETER:[fqName=test.A.b, hasDefaultValue=false, hasValOrVarNode=true, isMutable=false, name=b] diff --git a/idea/testData/stubs/SecondaryConstructors.expected b/idea/testData/stubs/SecondaryConstructors.expected index 8e808d7b220..90842a5c13e 100644 --- a/idea/testData/stubs/SecondaryConstructors.expected +++ b/idea/testData/stubs/SecondaryConstructors.expected @@ -1,7 +1,7 @@ PsiJetFileStubImpl[package=test] PACKAGE_DIRECTIVE: REFERENCE_EXPRESSION:[referencedName=test] - CLASS:[fqName=test.SecondaryConstructors, isEnumEntry=false, isLocal=false, isTopLevel=true, isTrait=false, name=SecondaryConstructors, superNames=[]] + CLASS:[fqName=test.SecondaryConstructors, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=SecondaryConstructors, superNames=[]] PRIMARY_CONSTRUCTOR: VALUE_PARAMETER_LIST: VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVarNode=false, isMutable=false, name=x] @@ -30,7 +30,7 @@ PsiJetFileStubImpl[package=test] TYPE_REFERENCE: USER_TYPE:[isAbsoluteInRootPackage=false] REFERENCE_EXPRESSION:[referencedName=Int] - CLASS:[fqName=test.SecondaryConstructors.Inner, isEnumEntry=false, isLocal=false, isTopLevel=false, isTrait=false, name=Inner, superNames=[]] + CLASS:[fqName=test.SecondaryConstructors.Inner, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=Inner, superNames=[]] MODIFIER_LIST:[inner] TYPE_PARAMETER_LIST: TYPE_PARAMETER:[fqName=null, isInVariance=false, isOutVariance=false, name=T] @@ -58,7 +58,7 @@ PsiJetFileStubImpl[package=test] TYPE_REFERENCE: USER_TYPE:[isAbsoluteInRootPackage=false] REFERENCE_EXPRESSION:[referencedName=G] - CLASS:[fqName=test.SecondaryConstructors.Nested, isEnumEntry=false, isLocal=false, isTopLevel=false, isTrait=false, name=Nested, superNames=[]] + CLASS:[fqName=test.SecondaryConstructors.Nested, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=Nested, superNames=[]] CLASS_BODY: SECONDARY_CONSTRUCTOR: MODIFIER_LIST:[] @@ -75,5 +75,5 @@ PsiJetFileStubImpl[package=test] SECONDARY_CONSTRUCTOR: MODIFIER_LIST:[internal] VALUE_PARAMETER_LIST: - CLASS:[fqName=test.anno, isEnumEntry=false, isLocal=false, isTopLevel=true, isTrait=false, name=anno, superNames=[]] + CLASS:[fqName=test.anno, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=anno, superNames=[]] MODIFIER_LIST:[annotation] diff --git a/idea/testData/stubs/SimpleEnumBuild.expected b/idea/testData/stubs/SimpleEnumBuild.expected index 93a70e8bcb2..d35abc82e7a 100644 --- a/idea/testData/stubs/SimpleEnumBuild.expected +++ b/idea/testData/stubs/SimpleEnumBuild.expected @@ -1,7 +1,7 @@ PsiJetFileStubImpl[package=] PACKAGE_DIRECTIVE: - CLASS:[fqName=Test, isEnumEntry=false, isLocal=false, isTopLevel=true, isTrait=false, name=Test, superNames=[]] + CLASS:[fqName=Test, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=Test, superNames=[]] MODIFIER_LIST:[enum] CLASS_BODY: - ENUM_ENTRY:[fqName=Test.First, isEnumEntry=true, isLocal=false, isTopLevel=false, isTrait=false, name=First, superNames=[]] - ENUM_ENTRY:[fqName=Test.Second, isEnumEntry=true, isLocal=false, isTopLevel=false, isTrait=false, name=Second, superNames=[]] + ENUM_ENTRY:[fqName=Test.First, isEnumEntry=true, isInterface=false, isLocal=false, isTopLevel=false, name=First, superNames=[]] + ENUM_ENTRY:[fqName=Test.Second, isEnumEntry=true, isInterface=false, isLocal=false, isTopLevel=false, name=Second, superNames=[]]