diff --git a/compiler/psi/src/org/jetbrains/kotlin/psi/KtClassLikeDeclaration.kt b/compiler/psi/src/org/jetbrains/kotlin/psi/KtClassLikeDeclaration.kt new file mode 100644 index 00000000000..4e8d5e0c2ce --- /dev/null +++ b/compiler/psi/src/org/jetbrains/kotlin/psi/KtClassLikeDeclaration.kt @@ -0,0 +1,22 @@ +/* + * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. + */ + +package org.jetbrains.kotlin.psi + +import org.jetbrains.kotlin.name.ClassId + +interface KtClassLikeDeclaration : KtDeclaration { + /** + * Return [ClassId], if the class is not local (E.e, if a class can be accessed by that [ClassId] from another context) + * + * For classes that itself local (are declared inside a function or other local scope), returns `null`. + * For nested classes in local classes returns `null`. + * For KtEnumEntry returns null as enum entry is not a class semantically. And so, for nested classes in enum entry, returns `null`. + * Otherwise, returns non-null [ClassId]. + * + * For returned ClassId, the [ClassId.isLocal] is always `false`. + */ + fun getClassId(): ClassId? +} \ No newline at end of file diff --git a/compiler/psi/src/org/jetbrains/kotlin/psi/KtClassOrObject.kt b/compiler/psi/src/org/jetbrains/kotlin/psi/KtClassOrObject.kt index f10262abbec..2e369eb6865 100644 --- a/compiler/psi/src/org/jetbrains/kotlin/psi/KtClassOrObject.kt +++ b/compiler/psi/src/org/jetbrains/kotlin/psi/KtClassOrObject.kt @@ -26,12 +26,15 @@ import com.intellij.psi.stubs.IStubElementType import com.intellij.psi.tree.TokenSet import com.intellij.psi.util.PsiTreeUtil import org.jetbrains.kotlin.lexer.KtTokens +import org.jetbrains.kotlin.name.ClassId +import org.jetbrains.kotlin.name.FqName +import org.jetbrains.kotlin.psi.psiUtil.ClassIdCalculator import org.jetbrains.kotlin.psi.stubs.KotlinClassOrObjectStub import org.jetbrains.kotlin.psi.stubs.elements.KtStubElementTypes abstract class KtClassOrObject : KtTypeParameterListOwnerStub>, KtDeclarationContainer, KtNamedDeclaration, - KtPureClassOrObject { + KtPureClassOrObject, KtClassLikeDeclaration { constructor(node: ASTNode) : super(node) constructor(stub: KotlinClassOrObjectStub, nodeType: IStubElementType<*, *>) : super(stub, nodeType) @@ -89,6 +92,11 @@ abstract class KtClassOrObject : fun isTopLevel(): Boolean = stub?.isTopLevel() ?: (parent is KtFile) + override fun getClassId(): ClassId? { + stub?.let { return it.getClassId() } + return ClassIdCalculator.calculateClassId(this) + } + override fun isLocal(): Boolean = stub?.isLocal() ?: KtPsiUtil.isLocal(this) override fun getDeclarations(): List = getBody()?.declarations.orEmpty() @@ -180,6 +188,7 @@ abstract class KtClassOrObject : } } + fun KtClassOrObject.getOrCreateBody(): KtClassBody { getBody()?.let { return it } diff --git a/compiler/psi/src/org/jetbrains/kotlin/psi/KtEnumEntry.java b/compiler/psi/src/org/jetbrains/kotlin/psi/KtEnumEntry.java index 7e4a952e024..e9aa64f0248 100644 --- a/compiler/psi/src/org/jetbrains/kotlin/psi/KtEnumEntry.java +++ b/compiler/psi/src/org/jetbrains/kotlin/psi/KtEnumEntry.java @@ -22,6 +22,7 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.PsiEnumConstant; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.kotlin.name.ClassId; import org.jetbrains.kotlin.psi.stubs.KotlinClassStub; import org.jetbrains.kotlin.psi.stubs.elements.KtStubElementTypes; @@ -51,6 +52,12 @@ public class KtEnumEntry extends KtClass { return !getSuperTypeListEntries().isEmpty(); } + @Nullable + @Override + public ClassId getClassId() { + return null; + } + @Nullable public KtInitializerList getInitializerList() { return getStubOrPsiChild(KtStubElementTypes.INITIALIZER_LIST); diff --git a/compiler/psi/src/org/jetbrains/kotlin/psi/psiUtil/ClassIdCalculator.kt b/compiler/psi/src/org/jetbrains/kotlin/psi/psiUtil/ClassIdCalculator.kt new file mode 100644 index 00000000000..eb1a81802f6 --- /dev/null +++ b/compiler/psi/src/org/jetbrains/kotlin/psi/psiUtil/ClassIdCalculator.kt @@ -0,0 +1,45 @@ +/* + * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. + */ + +package org.jetbrains.kotlin.psi.psiUtil + +import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.name.ClassId +import org.jetbrains.kotlin.name.FqName +import org.jetbrains.kotlin.name.SpecialNames +import org.jetbrains.kotlin.psi.* + +internal object ClassIdCalculator { + fun calculateClassId(declaration: KtClassLikeDeclaration): ClassId? { + var ktFile: KtFile? = null + var element: PsiElement? = declaration + val containingClasses = mutableListOf() + while (element != null) { + when (element) { + is KtEnumEntry -> { + return null + } + is KtClassOrObject -> { + containingClasses += element + } + is KtFile -> { + ktFile = element + break + } + is KtDeclaration -> { + return null + } + } + element = element.parent + } + if (ktFile == null) return null + val relativeClassName = FqName.fromSegments( + containingClasses.reversed().map { containingClass -> + containingClass.name ?: SpecialNames.NO_NAME_PROVIDED.asString() + } + ) + return ClassId(ktFile.packageFqName, relativeClassName, /*local=*/false) + } +} \ No newline at end of file diff --git a/compiler/psi/src/org/jetbrains/kotlin/psi/stubs/StubInterfaces.kt b/compiler/psi/src/org/jetbrains/kotlin/psi/stubs/StubInterfaces.kt index e910a1b67d9..ece668a1d86 100644 --- a/compiler/psi/src/org/jetbrains/kotlin/psi/stubs/StubInterfaces.kt +++ b/compiler/psi/src/org/jetbrains/kotlin/psi/stubs/StubInterfaces.kt @@ -21,6 +21,7 @@ import com.intellij.psi.stubs.NamedStub import com.intellij.psi.stubs.PsiFileStub import com.intellij.psi.stubs.StubElement import org.jetbrains.kotlin.lexer.KtModifierKeywordToken +import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.psi.* @@ -40,11 +41,15 @@ interface KotlinStubWithFqName : NamedStub { fun getFqName(): FqName? } +interface KotlinClassifierStub { + fun getClassId(): ClassId? +} + interface KotlinTypeAliasStub : KotlinStubWithFqName { fun isTopLevel(): Boolean } -interface KotlinClassOrObjectStub : KotlinStubWithFqName { +interface KotlinClassOrObjectStub : KotlinClassifierStub, KotlinStubWithFqName { fun isLocal(): Boolean fun getSuperNames(): List fun isTopLevel(): Boolean diff --git a/compiler/psi/src/org/jetbrains/kotlin/psi/stubs/StubUtils.kt b/compiler/psi/src/org/jetbrains/kotlin/psi/stubs/StubUtils.kt new file mode 100644 index 00000000000..0d2742a6bd2 --- /dev/null +++ b/compiler/psi/src/org/jetbrains/kotlin/psi/stubs/StubUtils.kt @@ -0,0 +1,23 @@ +/* + * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. + */ + +package org.jetbrains.kotlin.psi.stubs + +import com.intellij.psi.stubs.StubInputStream +import com.intellij.psi.stubs.StubOutputStream +import org.jetbrains.kotlin.name.ClassId + +object StubUtils { + @JvmStatic + fun deserializeClassId(dataStream: StubInputStream): ClassId? { + val classId = dataStream.readName() ?: return null + return ClassId.fromString(classId.string) + } + + @JvmStatic + fun serializeClassId(dataStream: StubOutputStream, classId: ClassId?) { + dataStream.writeName(classId?.asString()) + } +} \ No newline at end of file diff --git a/compiler/psi/src/org/jetbrains/kotlin/psi/stubs/elements/KtClassElementType.java b/compiler/psi/src/org/jetbrains/kotlin/psi/stubs/elements/KtClassElementType.java index 89cb6350d42..21e0c79ff0a 100644 --- a/compiler/psi/src/org/jetbrains/kotlin/psi/stubs/elements/KtClassElementType.java +++ b/compiler/psi/src/org/jetbrains/kotlin/psi/stubs/elements/KtClassElementType.java @@ -24,11 +24,13 @@ import com.intellij.psi.stubs.StubOutputStream; import com.intellij.util.io.StringRef; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; +import org.jetbrains.kotlin.name.ClassId; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.psi.KtClass; import org.jetbrains.kotlin.psi.KtEnumEntry; import org.jetbrains.kotlin.psi.psiUtil.KtPsiUtilKt; import org.jetbrains.kotlin.psi.stubs.KotlinClassStub; +import org.jetbrains.kotlin.psi.stubs.StubUtils; import org.jetbrains.kotlin.psi.stubs.impl.KotlinClassStubImpl; import org.jetbrains.kotlin.psi.stubs.impl.Utils; @@ -60,7 +62,7 @@ public class KtClassElementType extends KtStubElementType superNames = KtPsiUtilKt.getSuperNames(psi); return new KotlinClassStubImpl( getStubType(isEnumEntry), (StubElement) parentStub, - StringRef.fromString(fqName != null ? fqName.asString() : null), + StringRef.fromString(fqName != null ? fqName.asString() : null), psi.getClassId(), StringRef.fromString(psi.getName()), Utils.INSTANCE.wrapStrings(superNames), psi.isInterface(), isEnumEntry, psi.isLocal(), psi.isTopLevel() @@ -70,8 +72,12 @@ public class KtClassElementType extends KtStubElementType) parentStub, qualifiedName, name, superNames, + getStubType(isEnumEntry), (StubElement) parentStub, qualifiedName,classId, name, superNames, isTrait, isEnumEntry, isLocal, isTopLevel ); } diff --git a/compiler/psi/src/org/jetbrains/kotlin/psi/stubs/elements/KtObjectElementType.java b/compiler/psi/src/org/jetbrains/kotlin/psi/stubs/elements/KtObjectElementType.java index 6fecf5aeeb9..189b804fda9 100644 --- a/compiler/psi/src/org/jetbrains/kotlin/psi/stubs/elements/KtObjectElementType.java +++ b/compiler/psi/src/org/jetbrains/kotlin/psi/stubs/elements/KtObjectElementType.java @@ -23,10 +23,12 @@ import com.intellij.psi.stubs.StubOutputStream; import com.intellij.util.io.StringRef; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; +import org.jetbrains.kotlin.name.ClassId; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.psi.KtObjectDeclaration; import org.jetbrains.kotlin.psi.psiUtil.KtPsiUtilKt; import org.jetbrains.kotlin.psi.stubs.KotlinObjectStub; +import org.jetbrains.kotlin.psi.stubs.StubUtils; import org.jetbrains.kotlin.psi.stubs.impl.KotlinObjectStubImpl; import org.jetbrains.kotlin.psi.stubs.impl.Utils; @@ -45,7 +47,7 @@ public class KtObjectElementType extends KtStubElementType superNames = KtPsiUtilKt.getSuperNames(psi); return new KotlinObjectStubImpl( - (StubElement) parentStub, StringRef.fromString(name), fqName, Utils.INSTANCE.wrapStrings(superNames), + (StubElement) parentStub, StringRef.fromString(name), fqName, psi.getClassId(), Utils.INSTANCE.wrapStrings(superNames), psi.isTopLevel(), psi.isCompanion(), psi.isLocal(), psi.isObjectLiteral() ); } @@ -57,6 +59,8 @@ public class KtObjectElementType extends KtStubElementType) parentStub, name, fqName, superNames, isTopLevel, isCompanion, isLocal, isObjectLiteral + (StubElement) parentStub, name, fqName, classId, superNames, isTopLevel, isCompanion, isLocal, isObjectLiteral ); } diff --git a/compiler/psi/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinClassStubImpl.kt b/compiler/psi/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinClassStubImpl.kt index d2f0154c290..49f3c2b09df 100644 --- a/compiler/psi/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinClassStubImpl.kt +++ b/compiler/psi/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinClassStubImpl.kt @@ -19,6 +19,7 @@ package org.jetbrains.kotlin.psi.stubs.impl import com.intellij.psi.PsiElement import com.intellij.psi.stubs.StubElement import com.intellij.util.io.StringRef +import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.psi.KtClass import org.jetbrains.kotlin.psi.stubs.KotlinClassStub @@ -29,12 +30,13 @@ class KotlinClassStubImpl( type: KtClassElementType, parent: StubElement?, private val qualifiedName: StringRef?, + private val classId: ClassId?, private val name: StringRef?, private val superNames: Array, private val isInterface: Boolean, private val isEnumEntry: Boolean, private val isLocal: Boolean, - private val isTopLevel: Boolean + private val isTopLevel: Boolean, ) : KotlinStubBaseImpl(parent, type), KotlinClassStub { override fun getFqName(): FqName? { @@ -55,5 +57,7 @@ class KotlinClassStubImpl( return result } + override fun getClassId(): ClassId? = classId + override fun isTopLevel() = isTopLevel } diff --git a/compiler/psi/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinObjectStubImpl.kt b/compiler/psi/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinObjectStubImpl.kt index 07b0057caca..f4778742c36 100644 --- a/compiler/psi/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinObjectStubImpl.kt +++ b/compiler/psi/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinObjectStubImpl.kt @@ -24,16 +24,18 @@ import org.jetbrains.kotlin.psi.stubs.elements.KtStubElementTypes import org.jetbrains.kotlin.name.FqName import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.name.ClassId class KotlinObjectStubImpl( parent: StubElement?, private val name: StringRef?, private val fqName: FqName?, + private val classId: ClassId?, private val superNames: Array, private val isTopLevel: Boolean, private val isDefault: Boolean, private val isLocal: Boolean, - private val isObjectLiteral: Boolean + private val isObjectLiteral: Boolean, ) : KotlinStubBaseImpl(parent, KtStubElementTypes.OBJECT_DECLARATION), KotlinObjectStub { override fun getFqName() = fqName override fun getName() = StringRef.toString(name) @@ -42,4 +44,5 @@ class KotlinObjectStubImpl( override fun isCompanion() = isDefault override fun isObjectLiteral() = isObjectLiteral override fun isLocal() = isLocal + override fun getClassId(): ClassId? = classId } diff --git a/compiler/psi/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinStubBaseImpl.kt b/compiler/psi/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinStubBaseImpl.kt index 97e81c5ef60..99340f03e42 100644 --- a/compiler/psi/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinStubBaseImpl.kt +++ b/compiler/psi/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinStubBaseImpl.kt @@ -24,6 +24,7 @@ import com.intellij.psi.stubs.StubElement import org.jetbrains.kotlin.psi.KtElementImplStub import org.jetbrains.kotlin.psi.stubs.KotlinCallableStubBase import org.jetbrains.kotlin.psi.stubs.KotlinClassOrObjectStub +import org.jetbrains.kotlin.psi.stubs.KotlinClassifierStub import org.jetbrains.kotlin.psi.stubs.KotlinStubWithFqName import java.lang.reflect.Method import java.util.ArrayList @@ -82,6 +83,7 @@ open class KotlinStubBaseImpl>(parent: StubElement<*>?, private val BASE_STUB_INTERFACES = listOf( KotlinStubWithFqName::class.java, + KotlinClassifierStub::class.java, KotlinClassOrObjectStub::class.java, NamedStub::class.java, KotlinCallableStubBase::class.java diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClassClsStubBuilder.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClassClsStubBuilder.kt index ccfc22cd209..b92054503a5 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClassClsStubBuilder.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClassClsStubBuilder.kt @@ -124,14 +124,17 @@ private class ClassClsStubBuilder( //TODO: filtering function types should go away isNumberedFunctionClassFqName(it.asSingleFqName().toUnsafe()) }.map { it.shortClassName.ref() }.toTypedArray() + val classId = classId.takeUnless { it.isLocal } return when (classKind) { ProtoBuf.Class.Kind.OBJECT, ProtoBuf.Class.Kind.COMPANION_OBJECT -> { KotlinObjectStubImpl( - parentStub, shortName, fqName, superTypeRefs, - isTopLevel = !classId.isNestedClass, + parentStub, shortName, fqName, + classId = classId, + superTypeRefs, + isTopLevel = !this.classId.isNestedClass, isDefault = isCompanionObject, isLocal = false, - isObjectLiteral = false + isObjectLiteral = false, ) } else -> { @@ -139,12 +142,13 @@ private class ClassClsStubBuilder( KtClassElementType.getStubType(classKind == ProtoBuf.Class.Kind.ENUM_ENTRY), parentStub, fqName.ref(), + classId = classId, shortName, superTypeRefs, isInterface = classKind == ProtoBuf.Class.Kind.INTERFACE, isEnumEntry = classKind == ProtoBuf.Class.Kind.ENUM_ENTRY, isLocal = false, - isTopLevel = !classId.isNestedClass + isTopLevel = !this.classId.isNestedClass, ) } } @@ -200,6 +204,7 @@ private class ClassClsStubBuilder( KtStubElementTypes.ENUM_ENTRY, classBody, qualifiedName = c.containerFqName.child(name).ref(), + classId = null, // enum entry do not have class id name = name.ref(), superNames = arrayOf(), isInterface = false, diff --git a/idea/testData/decompiler/stubBuilder/AnnotatedFlexibleTypes/AnnotatedFlexibleTypes.txt b/idea/testData/decompiler/stubBuilder/AnnotatedFlexibleTypes/AnnotatedFlexibleTypes.txt index cdbcfffca38..fd4ad408ad7 100644 --- a/idea/testData/decompiler/stubBuilder/AnnotatedFlexibleTypes/AnnotatedFlexibleTypes.txt +++ b/idea/testData/decompiler/stubBuilder/AnnotatedFlexibleTypes/AnnotatedFlexibleTypes.txt @@ -2,7 +2,7 @@ PsiJetFileStubImpl[package=test] PACKAGE_DIRECTIVE REFERENCE_EXPRESSION[referencedName=test] IMPORT_LIST - CLASS[fqName=test.AnnotatedFlexibleTypes, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=AnnotatedFlexibleTypes, superNames=[]] + CLASS[classId=test/AnnotatedFlexibleTypes, fqName=test.AnnotatedFlexibleTypes, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=AnnotatedFlexibleTypes, superNames=[]] MODIFIER_LIST[public final] PRIMARY_CONSTRUCTOR MODIFIER_LIST[public] diff --git a/idea/testData/decompiler/stubBuilder/AnnotatedParameterInEnumConstructor/AnnotatedParameterInEnumConstructor.txt b/idea/testData/decompiler/stubBuilder/AnnotatedParameterInEnumConstructor/AnnotatedParameterInEnumConstructor.txt index 6f666667ad8..caa91d9fb3f 100644 --- a/idea/testData/decompiler/stubBuilder/AnnotatedParameterInEnumConstructor/AnnotatedParameterInEnumConstructor.txt +++ b/idea/testData/decompiler/stubBuilder/AnnotatedParameterInEnumConstructor/AnnotatedParameterInEnumConstructor.txt @@ -2,7 +2,7 @@ PsiJetFileStubImpl[package=test] PACKAGE_DIRECTIVE REFERENCE_EXPRESSION[referencedName=test] IMPORT_LIST - CLASS[fqName=test.AnnotatedParameterInEnumConstructor, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=AnnotatedParameterInEnumConstructor, superNames=[Enum]] + CLASS[classId=test/AnnotatedParameterInEnumConstructor, fqName=test.AnnotatedParameterInEnumConstructor, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=AnnotatedParameterInEnumConstructor, superNames=[Enum]] MODIFIER_LIST[enum public final] PRIMARY_CONSTRUCTOR MODIFIER_LIST[private] @@ -50,4 +50,4 @@ PsiJetFileStubImpl[package=test] REFERENCE_EXPRESSION[referencedName=test] REFERENCE_EXPRESSION[referencedName=AnnotatedParameterInEnumConstructor] CLASS_BODY - ENUM_ENTRY[fqName=test.AnnotatedParameterInEnumConstructor.A, isEnumEntry=true, isInterface=false, isLocal=false, isTopLevel=false, name=A, superNames=[]] + ENUM_ENTRY[classId=null, fqName=test.AnnotatedParameterInEnumConstructor.A, isEnumEntry=true, isInterface=false, isLocal=false, isTopLevel=false, name=A, superNames=[]] diff --git a/idea/testData/decompiler/stubBuilder/AnnotatedParameterInInnerClassConstructor/AnnotatedParameterInInnerClassConstructor.txt b/idea/testData/decompiler/stubBuilder/AnnotatedParameterInInnerClassConstructor/AnnotatedParameterInInnerClassConstructor.txt index 05957bbf64e..216ae99c2fc 100644 --- a/idea/testData/decompiler/stubBuilder/AnnotatedParameterInInnerClassConstructor/AnnotatedParameterInInnerClassConstructor.txt +++ b/idea/testData/decompiler/stubBuilder/AnnotatedParameterInInnerClassConstructor/AnnotatedParameterInInnerClassConstructor.txt @@ -2,13 +2,13 @@ PsiJetFileStubImpl[package=test] PACKAGE_DIRECTIVE REFERENCE_EXPRESSION[referencedName=test] IMPORT_LIST - CLASS[fqName=test.AnnotatedParameterInInnerClassConstructor, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=AnnotatedParameterInInnerClassConstructor, superNames=[]] + CLASS[classId=test/AnnotatedParameterInInnerClassConstructor, fqName=test.AnnotatedParameterInInnerClassConstructor, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=AnnotatedParameterInInnerClassConstructor, superNames=[]] MODIFIER_LIST[public final] PRIMARY_CONSTRUCTOR MODIFIER_LIST[public] VALUE_PARAMETER_LIST CLASS_BODY - CLASS[fqName=test.AnnotatedParameterInInnerClassConstructor.Inner, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=Inner, superNames=[]] + CLASS[classId=test/AnnotatedParameterInInnerClassConstructor.Inner, fqName=test.AnnotatedParameterInInnerClassConstructor.Inner, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=Inner, superNames=[]] MODIFIER_LIST[inner public final] PRIMARY_CONSTRUCTOR MODIFIER_LIST[public] @@ -42,7 +42,7 @@ PsiJetFileStubImpl[package=test] REFERENCE_EXPRESSION[referencedName=kotlin] REFERENCE_EXPRESSION[referencedName=String] CLASS_BODY - CLASS[fqName=test.AnnotatedParameterInInnerClassConstructor.InnerGeneric, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=InnerGeneric, superNames=[]] + CLASS[classId=test/AnnotatedParameterInInnerClassConstructor.InnerGeneric, fqName=test.AnnotatedParameterInInnerClassConstructor.InnerGeneric, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=InnerGeneric, superNames=[]] MODIFIER_LIST[inner public final] TYPE_PARAMETER_LIST TYPE_PARAMETER[fqName=null, isInVariance=false, isOutVariance=false, name=T] diff --git a/idea/testData/decompiler/stubBuilder/AnnotationClass/AnnotationClass.txt b/idea/testData/decompiler/stubBuilder/AnnotationClass/AnnotationClass.txt index e2f6fd56422..54d7edf0d69 100644 --- a/idea/testData/decompiler/stubBuilder/AnnotationClass/AnnotationClass.txt +++ b/idea/testData/decompiler/stubBuilder/AnnotationClass/AnnotationClass.txt @@ -4,7 +4,7 @@ PsiJetFileStubImpl[package=test.a] REFERENCE_EXPRESSION[referencedName=test] REFERENCE_EXPRESSION[referencedName=a] IMPORT_LIST - CLASS[fqName=test.a.AnnotationClass, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=AnnotationClass, superNames=[Annotation]] + CLASS[classId=test/a/AnnotationClass, fqName=test.a.AnnotationClass, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=AnnotationClass, superNames=[Annotation]] MODIFIER_LIST[public final annotation] PRIMARY_CONSTRUCTOR MODIFIER_LIST[public] diff --git a/idea/testData/decompiler/stubBuilder/AnnotationValues/AnnotationValues.txt b/idea/testData/decompiler/stubBuilder/AnnotationValues/AnnotationValues.txt index 86103271709..21f2118e991 100644 --- a/idea/testData/decompiler/stubBuilder/AnnotationValues/AnnotationValues.txt +++ b/idea/testData/decompiler/stubBuilder/AnnotationValues/AnnotationValues.txt @@ -2,13 +2,13 @@ PsiJetFileStubImpl[package=test] PACKAGE_DIRECTIVE REFERENCE_EXPRESSION[referencedName=test] IMPORT_LIST - CLASS[fqName=test.AnnotationValues, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=AnnotationValues, superNames=[]] + CLASS[classId=test/AnnotationValues, fqName=test.AnnotationValues, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=AnnotationValues, superNames=[]] MODIFIER_LIST[public final] PRIMARY_CONSTRUCTOR MODIFIER_LIST[public] VALUE_PARAMETER_LIST CLASS_BODY - CLASS[fqName=test.AnnotationValues.WithArrays, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=WithArrays, superNames=[]] + CLASS[classId=test/AnnotationValues.WithArrays, fqName=test.AnnotationValues.WithArrays, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=WithArrays, superNames=[]] MODIFIER_LIST[public final] ANNOTATION_ENTRY[hasValueArguments=false, shortName=Arrays] CONSTRUCTOR_CALLEE @@ -21,7 +21,7 @@ PsiJetFileStubImpl[package=test] MODIFIER_LIST[public] VALUE_PARAMETER_LIST CLASS_BODY - CLASS[fqName=test.AnnotationValues.WithClassLiteral, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=WithClassLiteral, superNames=[]] + CLASS[classId=test/AnnotationValues.WithClassLiteral, fqName=test.AnnotationValues.WithClassLiteral, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=WithClassLiteral, superNames=[]] MODIFIER_LIST[public final] ANNOTATION_ENTRY[hasValueArguments=false, shortName=ClassLiteral] CONSTRUCTOR_CALLEE @@ -36,7 +36,7 @@ PsiJetFileStubImpl[package=test] MODIFIER_LIST[public] VALUE_PARAMETER_LIST CLASS_BODY - CLASS[fqName=test.AnnotationValues.WithEnumLiteral, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=WithEnumLiteral, superNames=[]] + CLASS[classId=test/AnnotationValues.WithEnumLiteral, fqName=test.AnnotationValues.WithEnumLiteral, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=WithEnumLiteral, superNames=[]] MODIFIER_LIST[public final] ANNOTATION_ENTRY[hasValueArguments=false, shortName=EnumLiteral] CONSTRUCTOR_CALLEE @@ -49,7 +49,7 @@ PsiJetFileStubImpl[package=test] MODIFIER_LIST[public] VALUE_PARAMETER_LIST CLASS_BODY - CLASS[fqName=test.AnnotationValues.WithNested, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=WithNested, superNames=[]] + CLASS[classId=test/AnnotationValues.WithNested, fqName=test.AnnotationValues.WithNested, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=WithNested, superNames=[]] MODIFIER_LIST[public final] ANNOTATION_ENTRY[hasValueArguments=false, shortName=Outer] CONSTRUCTOR_CALLEE @@ -62,7 +62,7 @@ PsiJetFileStubImpl[package=test] MODIFIER_LIST[public] VALUE_PARAMETER_LIST CLASS_BODY - CLASS[fqName=test.AnnotationValues.WithSimple, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=WithSimple, superNames=[]] + CLASS[classId=test/AnnotationValues.WithSimple, fqName=test.AnnotationValues.WithSimple, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=WithSimple, superNames=[]] MODIFIER_LIST[public final] ANNOTATION_ENTRY[hasValueArguments=false, shortName=Simple] CONSTRUCTOR_CALLEE @@ -75,7 +75,7 @@ PsiJetFileStubImpl[package=test] MODIFIER_LIST[public] VALUE_PARAMETER_LIST CLASS_BODY - CLASS[fqName=test.AnnotationValues.WithStringLiteral, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=WithStringLiteral, superNames=[]] + CLASS[classId=test/AnnotationValues.WithStringLiteral, fqName=test.AnnotationValues.WithStringLiteral, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=WithStringLiteral, superNames=[]] MODIFIER_LIST[public final] ANNOTATION_ENTRY[hasValueArguments=false, shortName=StringLiteral] CONSTRUCTOR_CALLEE @@ -88,7 +88,7 @@ PsiJetFileStubImpl[package=test] MODIFIER_LIST[public] VALUE_PARAMETER_LIST CLASS_BODY - CLASS[fqName=test.AnnotationValues.WithVarArg, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=WithVarArg, superNames=[]] + CLASS[classId=test/AnnotationValues.WithVarArg, fqName=test.AnnotationValues.WithVarArg, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=WithVarArg, superNames=[]] MODIFIER_LIST[public final] ANNOTATION_ENTRY[hasValueArguments=false, shortName=VarArg] CONSTRUCTOR_CALLEE diff --git a/idea/testData/decompiler/stubBuilder/Annotations/Annotations.txt b/idea/testData/decompiler/stubBuilder/Annotations/Annotations.txt index a67510bc1f7..62d59addf01 100644 --- a/idea/testData/decompiler/stubBuilder/Annotations/Annotations.txt +++ b/idea/testData/decompiler/stubBuilder/Annotations/Annotations.txt @@ -1,7 +1,7 @@ PsiJetFileStubImpl[package=] PACKAGE_DIRECTIVE IMPORT_LIST - CLASS[fqName=Annotations, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=Annotations, superNames=[]] + CLASS[classId=/Annotations, 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 @@ -41,7 +41,7 @@ PsiJetFileStubImpl[package=] REFERENCE_EXPRESSION[referencedName=kotlin] REFERENCE_EXPRESSION[referencedName=Int] CLASS_BODY - OBJECT_DECLARATION[fqName=Annotations.Companion, isCompanion=true, isLocal=false, isObjectLiteral=false, isTopLevel=false, name=Companion, superNames=[]] + OBJECT_DECLARATION[classId=/Annotations.Companion, fqName=Annotations.Companion, isCompanion=true, isLocal=false, isObjectLiteral=false, isTopLevel=false, name=Companion, superNames=[]] MODIFIER_LIST[private companion] CLASS_BODY PROPERTY[fqName=Annotations.Companion.field, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=false, isTopLevel=false, isVar=false, name=field] @@ -315,7 +315,7 @@ PsiJetFileStubImpl[package=] USER_TYPE REFERENCE_EXPRESSION[referencedName=kotlin] REFERENCE_EXPRESSION[referencedName=Unit] - CLASS[fqName=Annotations.ClassWithConstructor, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=ClassWithConstructor, superNames=[]] + CLASS[classId=/Annotations.ClassWithConstructor, fqName=Annotations.ClassWithConstructor, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=ClassWithConstructor, superNames=[]] MODIFIER_LIST[public final] PRIMARY_CONSTRUCTOR MODIFIER_LIST[public] @@ -340,7 +340,7 @@ PsiJetFileStubImpl[package=] USER_TYPE REFERENCE_EXPRESSION[referencedName=kotlin] REFERENCE_EXPRESSION[referencedName=Int] - CLASS[fqName=Annotations.En, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=En, superNames=[Enum]] + CLASS[classId=/Annotations.En, fqName=Annotations.En, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=En, superNames=[Enum]] MODIFIER_LIST[enum public final] PRIMARY_CONSTRUCTOR MODIFIER_LIST[private] @@ -360,15 +360,15 @@ PsiJetFileStubImpl[package=] REFERENCE_EXPRESSION[referencedName=Annotations] REFERENCE_EXPRESSION[referencedName=En] CLASS_BODY - ENUM_ENTRY[fqName=Annotations.En.Entry1, isEnumEntry=true, isInterface=false, isLocal=false, isTopLevel=false, name=Entry1, superNames=[]] - ENUM_ENTRY[fqName=Annotations.En.Entry2, isEnumEntry=true, isInterface=false, isLocal=false, isTopLevel=false, name=Entry2, superNames=[]] + ENUM_ENTRY[classId=null, fqName=Annotations.En.Entry1, isEnumEntry=true, isInterface=false, isLocal=false, isTopLevel=false, name=Entry1, superNames=[]] + ENUM_ENTRY[classId=null, fqName=Annotations.En.Entry2, isEnumEntry=true, isInterface=false, isLocal=false, isTopLevel=false, name=Entry2, superNames=[]] MODIFIER_LIST[] ANNOTATION_ENTRY[hasValueArguments=false, shortName=a] CONSTRUCTOR_CALLEE TYPE_REFERENCE USER_TYPE REFERENCE_EXPRESSION[referencedName=a] - ENUM_ENTRY[fqName=Annotations.En.Entry3, isEnumEntry=true, isInterface=false, isLocal=false, isTopLevel=false, name=Entry3, superNames=[]] + ENUM_ENTRY[classId=null, fqName=Annotations.En.Entry3, isEnumEntry=true, isInterface=false, isLocal=false, isTopLevel=false, name=Entry3, superNames=[]] MODIFIER_LIST[] ANNOTATION_ENTRY[hasValueArguments=false, shortName=a] CONSTRUCTOR_CALLEE @@ -380,7 +380,7 @@ PsiJetFileStubImpl[package=] TYPE_REFERENCE USER_TYPE REFERENCE_EXPRESSION[referencedName=c] - CLASS[fqName=Annotations.Nested, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=Nested, superNames=[]] + CLASS[classId=/Annotations.Nested, fqName=Annotations.Nested, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=Nested, superNames=[]] MODIFIER_LIST[public final] PRIMARY_CONSTRUCTOR MODIFIER_LIST[private] diff --git a/idea/testData/decompiler/stubBuilder/AnnotationsOnNullableTypes/AnnotationsOnNullableTypes.txt b/idea/testData/decompiler/stubBuilder/AnnotationsOnNullableTypes/AnnotationsOnNullableTypes.txt index 8a170e3fcc9..7deca3695fe 100644 --- a/idea/testData/decompiler/stubBuilder/AnnotationsOnNullableTypes/AnnotationsOnNullableTypes.txt +++ b/idea/testData/decompiler/stubBuilder/AnnotationsOnNullableTypes/AnnotationsOnNullableTypes.txt @@ -1,7 +1,7 @@ PsiJetFileStubImpl[package=] PACKAGE_DIRECTIVE IMPORT_LIST - CLASS[fqName=AnnotationsOnNullableTypes, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=AnnotationsOnNullableTypes, superNames=[]] + CLASS[classId=/AnnotationsOnNullableTypes, fqName=AnnotationsOnNullableTypes, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=AnnotationsOnNullableTypes, superNames=[]] MODIFIER_LIST[public final] PRIMARY_CONSTRUCTOR MODIFIER_LIST[public] diff --git a/idea/testData/decompiler/stubBuilder/AnnotationsOnParenthesizedTypes/AnnotationsOnParenthesizedTypes.txt b/idea/testData/decompiler/stubBuilder/AnnotationsOnParenthesizedTypes/AnnotationsOnParenthesizedTypes.txt index c2e462dae04..510228d0d7f 100644 --- a/idea/testData/decompiler/stubBuilder/AnnotationsOnParenthesizedTypes/AnnotationsOnParenthesizedTypes.txt +++ b/idea/testData/decompiler/stubBuilder/AnnotationsOnParenthesizedTypes/AnnotationsOnParenthesizedTypes.txt @@ -1,7 +1,7 @@ PsiJetFileStubImpl[package=] PACKAGE_DIRECTIVE IMPORT_LIST - CLASS[fqName=AnnotationsOnParenthesizedTypes, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=AnnotationsOnParenthesizedTypes, superNames=[]] + CLASS[classId=/AnnotationsOnParenthesizedTypes, fqName=AnnotationsOnParenthesizedTypes, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=AnnotationsOnParenthesizedTypes, superNames=[]] MODIFIER_LIST[public final] PRIMARY_CONSTRUCTOR MODIFIER_LIST[public] diff --git a/idea/testData/decompiler/stubBuilder/AnonymousReturnWithGenericType/AnonymousReturnWithGenericType.txt b/idea/testData/decompiler/stubBuilder/AnonymousReturnWithGenericType/AnonymousReturnWithGenericType.txt index 80802c08ee4..b2220af5ffb 100644 --- a/idea/testData/decompiler/stubBuilder/AnonymousReturnWithGenericType/AnonymousReturnWithGenericType.txt +++ b/idea/testData/decompiler/stubBuilder/AnonymousReturnWithGenericType/AnonymousReturnWithGenericType.txt @@ -1,7 +1,7 @@ PsiJetFileStubImpl[package=] PACKAGE_DIRECTIVE IMPORT_LIST - CLASS[fqName=AnonymousReturnWithGenericType, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=AnonymousReturnWithGenericType, superNames=[]] + CLASS[classId=/AnonymousReturnWithGenericType, fqName=AnonymousReturnWithGenericType, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=AnonymousReturnWithGenericType, superNames=[]] MODIFIER_LIST[public final] TYPE_PARAMETER_LIST TYPE_PARAMETER[fqName=null, isInVariance=false, isOutVariance=false, name=T] diff --git a/idea/testData/decompiler/stubBuilder/ClassMembers/ClassMembers.txt b/idea/testData/decompiler/stubBuilder/ClassMembers/ClassMembers.txt index c2f32d98960..8fa15d85bfc 100644 --- a/idea/testData/decompiler/stubBuilder/ClassMembers/ClassMembers.txt +++ b/idea/testData/decompiler/stubBuilder/ClassMembers/ClassMembers.txt @@ -2,7 +2,7 @@ PsiJetFileStubImpl[package=test] PACKAGE_DIRECTIVE REFERENCE_EXPRESSION[referencedName=test] IMPORT_LIST - CLASS[fqName=test.ClassMembers, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=ClassMembers, superNames=[]] + CLASS[classId=test/ClassMembers, fqName=test.ClassMembers, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=ClassMembers, superNames=[]] MODIFIER_LIST[abstract public] PRIMARY_CONSTRUCTOR MODIFIER_LIST[public] diff --git a/idea/testData/decompiler/stubBuilder/ClassObject/ClassObject.txt b/idea/testData/decompiler/stubBuilder/ClassObject/ClassObject.txt index c59f73cd0a3..bb5037c38f7 100644 --- a/idea/testData/decompiler/stubBuilder/ClassObject/ClassObject.txt +++ b/idea/testData/decompiler/stubBuilder/ClassObject/ClassObject.txt @@ -4,13 +4,13 @@ PsiJetFileStubImpl[package=test.class_object] REFERENCE_EXPRESSION[referencedName=test] REFERENCE_EXPRESSION[referencedName=class_object] IMPORT_LIST - CLASS[fqName=test.class_object.ClassObject, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=ClassObject, superNames=[]] + CLASS[classId=test/class_object/ClassObject, fqName=test.class_object.ClassObject, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=ClassObject, superNames=[]] MODIFIER_LIST[public final] PRIMARY_CONSTRUCTOR MODIFIER_LIST[public] VALUE_PARAMETER_LIST CLASS_BODY - OBJECT_DECLARATION[fqName=test.class_object.ClassObject.Companion, isCompanion=true, isLocal=false, isObjectLiteral=false, isTopLevel=false, name=Companion, superNames=[]] + OBJECT_DECLARATION[classId=test/class_object/ClassObject.Companion, fqName=test.class_object.ClassObject.Companion, isCompanion=true, isLocal=false, isObjectLiteral=false, isTopLevel=false, name=Companion, superNames=[]] MODIFIER_LIST[public companion] CLASS_BODY PROPERTY[fqName=test.class_object.ClassObject.Companion.j, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=false, isTopLevel=false, isVar=false, name=j] @@ -28,13 +28,13 @@ PsiJetFileStubImpl[package=test.class_object] USER_TYPE REFERENCE_EXPRESSION[referencedName=kotlin] REFERENCE_EXPRESSION[referencedName=Int] - CLASS[fqName=test.class_object.ClassObject.Companion.A, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=A, superNames=[]] + CLASS[classId=test/class_object/ClassObject.Companion.A, fqName=test.class_object.ClassObject.Companion.A, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=A, superNames=[]] MODIFIER_LIST[public final] PRIMARY_CONSTRUCTOR MODIFIER_LIST[public] VALUE_PARAMETER_LIST CLASS_BODY - CLASS[fqName=test.class_object.ClassObject.Companion.A.B, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=B, superNames=[]] + CLASS[classId=test/class_object/ClassObject.Companion.A.B, fqName=test.class_object.ClassObject.Companion.A.B, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=B, superNames=[]] MODIFIER_LIST[public final] PRIMARY_CONSTRUCTOR MODIFIER_LIST[public] @@ -70,31 +70,31 @@ PsiJetFileStubImpl[package=test.class_object] USER_TYPE REFERENCE_EXPRESSION[referencedName=kotlin] REFERENCE_EXPRESSION[referencedName=Unit] - CLASS[fqName=test.class_object.ClassObject.B, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=B, superNames=[]] + CLASS[classId=test/class_object/ClassObject.B, fqName=test.class_object.ClassObject.B, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=B, superNames=[]] MODIFIER_LIST[public final] PRIMARY_CONSTRUCTOR MODIFIER_LIST[public] VALUE_PARAMETER_LIST CLASS_BODY - OBJECT_DECLARATION[fqName=test.class_object.ClassObject.B.Companion, isCompanion=true, isLocal=false, isObjectLiteral=false, isTopLevel=false, name=Companion, superNames=[]] + OBJECT_DECLARATION[classId=test/class_object/ClassObject.B.Companion, fqName=test.class_object.ClassObject.B.Companion, isCompanion=true, isLocal=false, isObjectLiteral=false, isTopLevel=false, name=Companion, superNames=[]] MODIFIER_LIST[public companion] CLASS_BODY - CLASS[fqName=test.class_object.ClassObject.B.Companion.C, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=C, superNames=[]] + CLASS[classId=test/class_object/ClassObject.B.Companion.C, fqName=test.class_object.ClassObject.B.Companion.C, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=C, superNames=[]] MODIFIER_LIST[public final] PRIMARY_CONSTRUCTOR MODIFIER_LIST[public] VALUE_PARAMETER_LIST CLASS_BODY - OBJECT_DECLARATION[fqName=test.class_object.ClassObject.B.Companion.C.Companion, isCompanion=true, isLocal=false, isObjectLiteral=false, isTopLevel=false, name=Companion, superNames=[]] + OBJECT_DECLARATION[classId=test/class_object/ClassObject.B.Companion.C.Companion, fqName=test.class_object.ClassObject.B.Companion.C.Companion, isCompanion=true, isLocal=false, isObjectLiteral=false, isTopLevel=false, name=Companion, superNames=[]] MODIFIER_LIST[public companion] CLASS_BODY - CLASS[fqName=test.class_object.ClassObject.B.Companion.C.Companion.D, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=D, superNames=[]] + CLASS[classId=test/class_object/ClassObject.B.Companion.C.Companion.D, fqName=test.class_object.ClassObject.B.Companion.C.Companion.D, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=D, superNames=[]] MODIFIER_LIST[public final] PRIMARY_CONSTRUCTOR MODIFIER_LIST[public] VALUE_PARAMETER_LIST CLASS_BODY - OBJECT_DECLARATION[fqName=test.class_object.ClassObject.B.Companion.C.Companion.D.Companion, isCompanion=true, isLocal=false, isObjectLiteral=false, isTopLevel=false, name=Companion, superNames=[]] + OBJECT_DECLARATION[classId=test/class_object/ClassObject.B.Companion.C.Companion.D.Companion, fqName=test.class_object.ClassObject.B.Companion.C.Companion.D.Companion, isCompanion=true, isLocal=false, isObjectLiteral=false, isTopLevel=false, name=Companion, superNames=[]] MODIFIER_LIST[public companion] CLASS_BODY PROPERTY[fqName=test.class_object.ClassObject.B.Companion.C.Companion.D.Companion.i, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=false, isTopLevel=false, isVar=false, name=i] @@ -112,7 +112,7 @@ PsiJetFileStubImpl[package=test.class_object] USER_TYPE REFERENCE_EXPRESSION[referencedName=kotlin] REFERENCE_EXPRESSION[referencedName=Unit] - 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]] + CLASS[classId=test/class_object/ClassObject.B.Companion.C.Companion.D.Companion.Anno, 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[public final annotation] PRIMARY_CONSTRUCTOR MODIFIER_LIST[public] @@ -125,7 +125,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, isInterface=false, isLocal=false, isTopLevel=false, name=En, superNames=[Enum]] + CLASS[classId=test/class_object/ClassObject.B.Companion.C.Companion.D.Companion.En, 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 public final] PRIMARY_CONSTRUCTOR MODIFIER_LIST[private] diff --git a/idea/testData/decompiler/stubBuilder/Const/Const.txt b/idea/testData/decompiler/stubBuilder/Const/Const.txt index d00ab3fe313..f6b6f71d648 100644 --- a/idea/testData/decompiler/stubBuilder/Const/Const.txt +++ b/idea/testData/decompiler/stubBuilder/Const/Const.txt @@ -2,7 +2,7 @@ PsiJetFileStubImpl[package=test] PACKAGE_DIRECTIVE REFERENCE_EXPRESSION[referencedName=test] IMPORT_LIST - OBJECT_DECLARATION[fqName=test.Const, isCompanion=false, isLocal=false, isObjectLiteral=false, isTopLevel=true, name=Const, superNames=[]] + OBJECT_DECLARATION[classId=test/Const, fqName=test.Const, isCompanion=false, isLocal=false, isObjectLiteral=false, isTopLevel=true, name=Const, superNames=[]] MODIFIER_LIST[public] CLASS_BODY PROPERTY[fqName=test.Const.inObject, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=false, isTopLevel=false, isVar=false, name=inObject] diff --git a/idea/testData/decompiler/stubBuilder/DataClass/DataClass.txt b/idea/testData/decompiler/stubBuilder/DataClass/DataClass.txt index f6a99667f22..29b338ac778 100644 --- a/idea/testData/decompiler/stubBuilder/DataClass/DataClass.txt +++ b/idea/testData/decompiler/stubBuilder/DataClass/DataClass.txt @@ -6,7 +6,7 @@ PsiJetFileStubImpl[package=a.b.c] REFERENCE_EXPRESSION[referencedName=b] REFERENCE_EXPRESSION[referencedName=c] IMPORT_LIST - CLASS[fqName=a.b.c.DataClass, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=DataClass, superNames=[]] + CLASS[classId=a/b/c/DataClass, fqName=a.b.c.DataClass, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=DataClass, superNames=[]] MODIFIER_LIST[public final data] PRIMARY_CONSTRUCTOR MODIFIER_LIST[public] diff --git a/idea/testData/decompiler/stubBuilder/Delegation/Delegation.txt b/idea/testData/decompiler/stubBuilder/Delegation/Delegation.txt index e73c64a4090..aa0bcbe03d1 100644 --- a/idea/testData/decompiler/stubBuilder/Delegation/Delegation.txt +++ b/idea/testData/decompiler/stubBuilder/Delegation/Delegation.txt @@ -1,7 +1,7 @@ PsiJetFileStubImpl[package=] PACKAGE_DIRECTIVE IMPORT_LIST - CLASS[fqName=Delegation, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=Delegation, superNames=[T]] + CLASS[classId=/Delegation, fqName=Delegation, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=Delegation, superNames=[T]] MODIFIER_LIST[public 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 61fffcf0067..20624dc7c5b 100644 --- a/idea/testData/decompiler/stubBuilder/DependencyOnNestedClasses/DependencyOnNestedClasses.txt +++ b/idea/testData/decompiler/stubBuilder/DependencyOnNestedClasses/DependencyOnNestedClasses.txt @@ -2,7 +2,7 @@ PsiJetFileStubImpl[package=test] PACKAGE_DIRECTIVE REFERENCE_EXPRESSION[referencedName=test] IMPORT_LIST - CLASS[fqName=test.DependencyOnNestedClasses, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=DependencyOnNestedClasses, superNames=[Nested]] + CLASS[classId=test/DependencyOnNestedClasses, 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 bb416e29380..d7d119fa049 100644 --- a/idea/testData/decompiler/stubBuilder/Enum/Enum.txt +++ b/idea/testData/decompiler/stubBuilder/Enum/Enum.txt @@ -10,7 +10,7 @@ PsiJetFileStubImpl[package=a.b.c.test.enum] REFERENCE_EXPRESSION[referencedName=test] REFERENCE_EXPRESSION[referencedName=enum] IMPORT_LIST - CLASS[fqName=a.b.c.test.enum.Enum, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=Enum, superNames=[Enum]] + CLASS[classId=a/b/c/test/enum/Enum, fqName=a.b.c.test.enum.Enum, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=Enum, superNames=[Enum]] MODIFIER_LIST[enum public final] PRIMARY_CONSTRUCTOR MODIFIER_LIST[private] @@ -38,13 +38,13 @@ PsiJetFileStubImpl[package=a.b.c.test.enum] REFERENCE_EXPRESSION[referencedName=enum] REFERENCE_EXPRESSION[referencedName=Enum] CLASS_BODY - 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=[]] - OBJECT_DECLARATION[fqName=a.b.c.test.enum.Enum.Companion, isCompanion=true, isLocal=false, isObjectLiteral=false, isTopLevel=false, name=Companion, superNames=[]] + ENUM_ENTRY[classId=null, fqName=a.b.c.test.enum.Enum.A, isEnumEntry=true, isInterface=false, isLocal=false, isTopLevel=false, name=A, superNames=[]] + ENUM_ENTRY[classId=null, fqName=a.b.c.test.enum.Enum.B, isEnumEntry=true, isInterface=false, isLocal=false, isTopLevel=false, name=B, superNames=[]] + ENUM_ENTRY[classId=null, fqName=a.b.c.test.enum.Enum.C, isEnumEntry=true, isInterface=false, isLocal=false, isTopLevel=false, name=C, superNames=[]] + ENUM_ENTRY[classId=null, fqName=a.b.c.test.enum.Enum.D, isEnumEntry=true, isInterface=false, isLocal=false, isTopLevel=false, name=D, superNames=[]] + ENUM_ENTRY[classId=null, fqName=a.b.c.test.enum.Enum.E, isEnumEntry=true, isInterface=false, isLocal=false, isTopLevel=false, name=E, superNames=[]] + ENUM_ENTRY[classId=null, fqName=a.b.c.test.enum.Enum.F, isEnumEntry=true, isInterface=false, isLocal=false, isTopLevel=false, name=F, superNames=[]] + OBJECT_DECLARATION[classId=a/b/c/test/enum/Enum.Companion, fqName=a.b.c.test.enum.Enum.Companion, isCompanion=true, isLocal=false, isObjectLiteral=false, isTopLevel=false, name=Companion, superNames=[]] MODIFIER_LIST[public companion] CLASS_BODY PROPERTY[fqName=a.b.c.test.enum.Enum.Companion.c, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=false, isTopLevel=false, isVar=false, name=c] diff --git a/idea/testData/decompiler/stubBuilder/FlexibleTypes/FlexibleTypes.txt b/idea/testData/decompiler/stubBuilder/FlexibleTypes/FlexibleTypes.txt index 1bcc86804db..6aa419687c2 100644 --- a/idea/testData/decompiler/stubBuilder/FlexibleTypes/FlexibleTypes.txt +++ b/idea/testData/decompiler/stubBuilder/FlexibleTypes/FlexibleTypes.txt @@ -2,7 +2,7 @@ PsiJetFileStubImpl[package=test] PACKAGE_DIRECTIVE REFERENCE_EXPRESSION[referencedName=test] IMPORT_LIST - CLASS[fqName=test.FlexibleTypes, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=FlexibleTypes, superNames=[]] + CLASS[classId=test/FlexibleTypes, fqName=test.FlexibleTypes, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=FlexibleTypes, superNames=[]] MODIFIER_LIST[abstract public] PRIMARY_CONSTRUCTOR MODIFIER_LIST[public] diff --git a/idea/testData/decompiler/stubBuilder/FunInterfaceDeclaration/FunInterfaceDeclaration.txt b/idea/testData/decompiler/stubBuilder/FunInterfaceDeclaration/FunInterfaceDeclaration.txt index c1a8bdc702c..f41ceb7e0eb 100644 --- a/idea/testData/decompiler/stubBuilder/FunInterfaceDeclaration/FunInterfaceDeclaration.txt +++ b/idea/testData/decompiler/stubBuilder/FunInterfaceDeclaration/FunInterfaceDeclaration.txt @@ -2,13 +2,13 @@ PsiJetFileStubImpl[package=test] PACKAGE_DIRECTIVE REFERENCE_EXPRESSION[referencedName=test] IMPORT_LIST - CLASS[fqName=test.FunInterfaceDeclaration, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=FunInterfaceDeclaration, superNames=[]] + CLASS[classId=test/FunInterfaceDeclaration, fqName=test.FunInterfaceDeclaration, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=FunInterfaceDeclaration, superNames=[]] MODIFIER_LIST[public final] PRIMARY_CONSTRUCTOR MODIFIER_LIST[public] VALUE_PARAMETER_LIST CLASS_BODY - CLASS[fqName=test.FunInterfaceDeclaration.GenericKRunnable, isEnumEntry=false, isInterface=true, isLocal=false, isTopLevel=false, name=GenericKRunnable, superNames=[]] + CLASS[classId=test/FunInterfaceDeclaration.GenericKRunnable, fqName=test.FunInterfaceDeclaration.GenericKRunnable, isEnumEntry=false, isInterface=true, isLocal=false, isTopLevel=false, name=GenericKRunnable, superNames=[]] MODIFIER_LIST[public fun] TYPE_PARAMETER_LIST TYPE_PARAMETER[fqName=null, isInVariance=false, isOutVariance=false, name=T] @@ -24,7 +24,7 @@ PsiJetFileStubImpl[package=test] TYPE_REFERENCE USER_TYPE REFERENCE_EXPRESSION[referencedName=R] - CLASS[fqName=test.FunInterfaceDeclaration.KRunnable, isEnumEntry=false, isInterface=true, isLocal=false, isTopLevel=false, name=KRunnable, superNames=[]] + CLASS[classId=test/FunInterfaceDeclaration.KRunnable, fqName=test.FunInterfaceDeclaration.KRunnable, isEnumEntry=false, isInterface=true, isLocal=false, isTopLevel=false, name=KRunnable, superNames=[]] MODIFIER_LIST[public fun] CLASS_BODY FUN[fqName=test.FunInterfaceDeclaration.KRunnable.invoke, hasBlockBody=true, hasBody=false, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isTopLevel=false, mayHaveContract=false, name=invoke] diff --git a/idea/testData/decompiler/stubBuilder/InheritingClasses/InheritingClasses.txt b/idea/testData/decompiler/stubBuilder/InheritingClasses/InheritingClasses.txt index 487b23096c7..7a332259b73 100644 --- a/idea/testData/decompiler/stubBuilder/InheritingClasses/InheritingClasses.txt +++ b/idea/testData/decompiler/stubBuilder/InheritingClasses/InheritingClasses.txt @@ -2,13 +2,13 @@ PsiJetFileStubImpl[package=a] PACKAGE_DIRECTIVE REFERENCE_EXPRESSION[referencedName=a] IMPORT_LIST - CLASS[fqName=a.InheritingClasses, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=InheritingClasses, superNames=[]] + CLASS[classId=a/InheritingClasses, fqName=a.InheritingClasses, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=InheritingClasses, superNames=[]] MODIFIER_LIST[public final] PRIMARY_CONSTRUCTOR MODIFIER_LIST[public] VALUE_PARAMETER_LIST CLASS_BODY - CLASS[fqName=a.InheritingClasses.A, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=A, superNames=[C]] + CLASS[classId=a/InheritingClasses.A, fqName=a.InheritingClasses.A, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=A, superNames=[C]] MODIFIER_LIST[abstract public] PRIMARY_CONSTRUCTOR MODIFIER_LIST[public] @@ -66,7 +66,7 @@ PsiJetFileStubImpl[package=a] USER_TYPE REFERENCE_EXPRESSION[referencedName=kotlin] REFERENCE_EXPRESSION[referencedName=Int] - CLASS[fqName=a.InheritingClasses.B, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=B, superNames=[A]] + CLASS[classId=a/InheritingClasses.B, fqName=a.InheritingClasses.B, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=B, superNames=[A]] MODIFIER_LIST[open public] PRIMARY_CONSTRUCTOR MODIFIER_LIST[public] @@ -111,7 +111,7 @@ PsiJetFileStubImpl[package=a] USER_TYPE REFERENCE_EXPRESSION[referencedName=kotlin] REFERENCE_EXPRESSION[referencedName=Int] - CLASS[fqName=a.InheritingClasses.C, isEnumEntry=false, isInterface=true, isLocal=false, isTopLevel=false, name=C, superNames=[]] + CLASS[classId=a/InheritingClasses.C, fqName=a.InheritingClasses.C, isEnumEntry=false, isInterface=true, isLocal=false, isTopLevel=false, name=C, superNames=[]] MODIFIER_LIST[public] CLASS_BODY PROPERTY[fqName=a.InheritingClasses.C.c, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=false, isTopLevel=false, isVar=false, name=c] @@ -121,7 +121,7 @@ PsiJetFileStubImpl[package=a] USER_TYPE REFERENCE_EXPRESSION[referencedName=kotlin] REFERENCE_EXPRESSION[referencedName=Int] - CLASS[fqName=a.InheritingClasses.D, isEnumEntry=false, isInterface=true, isLocal=false, isTopLevel=false, name=D, superNames=[C]] + CLASS[classId=a/InheritingClasses.D, fqName=a.InheritingClasses.D, isEnumEntry=false, isInterface=true, isLocal=false, isTopLevel=false, name=D, superNames=[C]] MODIFIER_LIST[public] TYPE_PARAMETER_LIST TYPE_PARAMETER[fqName=null, isInVariance=false, isOutVariance=false, name=T] @@ -142,10 +142,10 @@ PsiJetFileStubImpl[package=a] USER_TYPE REFERENCE_EXPRESSION[referencedName=kotlin] REFERENCE_EXPRESSION[referencedName=Int] - CLASS[fqName=a.InheritingClasses.E, isEnumEntry=false, isInterface=true, isLocal=false, isTopLevel=false, name=E, superNames=[]] + CLASS[classId=a/InheritingClasses.E, fqName=a.InheritingClasses.E, isEnumEntry=false, isInterface=true, isLocal=false, isTopLevel=false, name=E, superNames=[]] MODIFIER_LIST[public] CLASS_BODY - CLASS[fqName=a.InheritingClasses.G, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=G, superNames=[B, C, D, E]] + CLASS[classId=a/InheritingClasses.G, fqName=a.InheritingClasses.G, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=G, superNames=[B, C, D, E]] MODIFIER_LIST[public final] PRIMARY_CONSTRUCTOR MODIFIER_LIST[public] @@ -191,25 +191,25 @@ PsiJetFileStubImpl[package=a] REFERENCE_EXPRESSION[referencedName=InheritingClasses] REFERENCE_EXPRESSION[referencedName=E] CLASS_BODY - CLASS[fqName=a.InheritingClasses.InheritAny, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=InheritAny, superNames=[]] + CLASS[classId=a/InheritingClasses.InheritAny, fqName=a.InheritingClasses.InheritAny, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=InheritAny, superNames=[]] MODIFIER_LIST[public final] PRIMARY_CONSTRUCTOR MODIFIER_LIST[public] VALUE_PARAMETER_LIST CLASS_BODY - CLASS[fqName=a.InheritingClasses.InheritAny.ExplicitAny, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=ExplicitAny, superNames=[]] + CLASS[classId=a/InheritingClasses.InheritAny.ExplicitAny, fqName=a.InheritingClasses.InheritAny.ExplicitAny, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=ExplicitAny, superNames=[]] MODIFIER_LIST[public final] PRIMARY_CONSTRUCTOR MODIFIER_LIST[public] VALUE_PARAMETER_LIST CLASS_BODY - CLASS[fqName=a.InheritingClasses.InheritAny.ImplicitAny, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=ImplicitAny, superNames=[]] + CLASS[classId=a/InheritingClasses.InheritAny.ImplicitAny, fqName=a.InheritingClasses.InheritAny.ImplicitAny, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=ImplicitAny, superNames=[]] MODIFIER_LIST[public final] PRIMARY_CONSTRUCTOR MODIFIER_LIST[public] VALUE_PARAMETER_LIST CLASS_BODY - CLASS[fqName=a.InheritingClasses.InheritAny.OnlyTrait, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=OnlyTrait, superNames=[SomeTrait]] + CLASS[classId=a/InheritingClasses.InheritAny.OnlyTrait, fqName=a.InheritingClasses.InheritAny.OnlyTrait, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=OnlyTrait, superNames=[SomeTrait]] MODIFIER_LIST[public final] PRIMARY_CONSTRUCTOR MODIFIER_LIST[public] @@ -226,7 +226,7 @@ PsiJetFileStubImpl[package=a] REFERENCE_EXPRESSION[referencedName=InheritAny] REFERENCE_EXPRESSION[referencedName=SomeTrait] CLASS_BODY - CLASS[fqName=a.InheritingClasses.InheritAny.OnlyTraits, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=OnlyTraits, superNames=[SomeTrait, SomeTrait2]] + CLASS[classId=a/InheritingClasses.InheritAny.OnlyTraits, fqName=a.InheritingClasses.InheritAny.OnlyTraits, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=OnlyTraits, superNames=[SomeTrait, SomeTrait2]] MODIFIER_LIST[public final] PRIMARY_CONSTRUCTOR MODIFIER_LIST[public] @@ -253,13 +253,13 @@ PsiJetFileStubImpl[package=a] REFERENCE_EXPRESSION[referencedName=InheritAny] REFERENCE_EXPRESSION[referencedName=SomeTrait2] CLASS_BODY - CLASS[fqName=a.InheritingClasses.InheritAny.SomeTrait, isEnumEntry=false, isInterface=true, isLocal=false, isTopLevel=false, name=SomeTrait, superNames=[]] + CLASS[classId=a/InheritingClasses.InheritAny.SomeTrait, fqName=a.InheritingClasses.InheritAny.SomeTrait, isEnumEntry=false, isInterface=true, isLocal=false, isTopLevel=false, name=SomeTrait, superNames=[]] MODIFIER_LIST[public] CLASS_BODY - CLASS[fqName=a.InheritingClasses.InheritAny.SomeTrait2, isEnumEntry=false, isInterface=true, isLocal=false, isTopLevel=false, name=SomeTrait2, superNames=[]] + CLASS[classId=a/InheritingClasses.InheritAny.SomeTrait2, fqName=a.InheritingClasses.InheritAny.SomeTrait2, isEnumEntry=false, isInterface=true, isLocal=false, isTopLevel=false, name=SomeTrait2, superNames=[]] MODIFIER_LIST[public] CLASS_BODY - CLASS[fqName=a.InheritingClasses.InheritAny.TraitWithExplicitAny, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=TraitWithExplicitAny, superNames=[Any, SomeTrait]] + CLASS[classId=a/InheritingClasses.InheritAny.TraitWithExplicitAny, fqName=a.InheritingClasses.InheritAny.TraitWithExplicitAny, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=TraitWithExplicitAny, superNames=[Any, SomeTrait]] MODIFIER_LIST[public final] PRIMARY_CONSTRUCTOR MODIFIER_LIST[public] @@ -282,7 +282,7 @@ PsiJetFileStubImpl[package=a] REFERENCE_EXPRESSION[referencedName=InheritAny] REFERENCE_EXPRESSION[referencedName=SomeTrait] CLASS_BODY - CLASS[fqName=a.InheritingClasses.InheritAny.TraitsWithExplicitAny, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=TraitsWithExplicitAny, superNames=[SomeTrait2, Any, SomeTrait]] + CLASS[classId=a/InheritingClasses.InheritAny.TraitsWithExplicitAny, fqName=a.InheritingClasses.InheritAny.TraitsWithExplicitAny, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=TraitsWithExplicitAny, superNames=[SomeTrait2, Any, SomeTrait]] MODIFIER_LIST[public final] PRIMARY_CONSTRUCTOR MODIFIER_LIST[public] @@ -315,7 +315,7 @@ PsiJetFileStubImpl[package=a] REFERENCE_EXPRESSION[referencedName=InheritAny] REFERENCE_EXPRESSION[referencedName=SomeTrait] CLASS_BODY - CLASS[fqName=a.InheritingClasses.InheritFunctionType, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=InheritFunctionType, superNames=[]] + CLASS[classId=a/InheritingClasses.InheritFunctionType, fqName=a.InheritingClasses.InheritFunctionType, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=InheritFunctionType, superNames=[]] MODIFIER_LIST[abstract public] PRIMARY_CONSTRUCTOR MODIFIER_LIST[public] diff --git a/idea/testData/decompiler/stubBuilder/InnerClassEnumEntry/InnerClassEnumEntry.kt b/idea/testData/decompiler/stubBuilder/InnerClassEnumEntry/InnerClassEnumEntry.kt new file mode 100644 index 00000000000..cb6135a8722 --- /dev/null +++ b/idea/testData/decompiler/stubBuilder/InnerClassEnumEntry/InnerClassEnumEntry.kt @@ -0,0 +1,5 @@ +enum class InnerClassEnumEntry { + ENTRY { + inner class InnerClass + } +} \ No newline at end of file diff --git a/idea/testData/decompiler/stubBuilder/InnerClassEnumEntry/InnerClassEnumEntry.txt b/idea/testData/decompiler/stubBuilder/InnerClassEnumEntry/InnerClassEnumEntry.txt new file mode 100644 index 00000000000..d1742328a11 --- /dev/null +++ b/idea/testData/decompiler/stubBuilder/InnerClassEnumEntry/InnerClassEnumEntry.txt @@ -0,0 +1,22 @@ +PsiJetFileStubImpl[package=] + PACKAGE_DIRECTIVE + IMPORT_LIST + CLASS[classId=/InnerClassEnumEntry, fqName=InnerClassEnumEntry, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=InnerClassEnumEntry, superNames=[Enum]] + MODIFIER_LIST[enum public final] + PRIMARY_CONSTRUCTOR + MODIFIER_LIST[private] + VALUE_PARAMETER_LIST + SUPER_TYPE_LIST + SUPER_TYPE_ENTRY + TYPE_REFERENCE + USER_TYPE + USER_TYPE + REFERENCE_EXPRESSION[referencedName=kotlin] + REFERENCE_EXPRESSION[referencedName=Enum] + TYPE_ARGUMENT_LIST + TYPE_PROJECTION[projectionKind=NONE] + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION[referencedName=InnerClassEnumEntry] + CLASS_BODY + ENUM_ENTRY[classId=null, fqName=InnerClassEnumEntry.ENTRY, isEnumEntry=true, isInterface=false, isLocal=false, isTopLevel=false, name=ENTRY, superNames=[]] diff --git a/idea/testData/decompiler/stubBuilder/InnerTypes/InnerTypes.txt b/idea/testData/decompiler/stubBuilder/InnerTypes/InnerTypes.txt index 4b96142a43d..ec9dfd3e05f 100644 --- a/idea/testData/decompiler/stubBuilder/InnerTypes/InnerTypes.txt +++ b/idea/testData/decompiler/stubBuilder/InnerTypes/InnerTypes.txt @@ -2,7 +2,7 @@ PsiJetFileStubImpl[package=test] PACKAGE_DIRECTIVE REFERENCE_EXPRESSION[referencedName=test] IMPORT_LIST - CLASS[fqName=test.InnerTypes, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=InnerTypes, superNames=[]] + CLASS[classId=test/InnerTypes, fqName=test.InnerTypes, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=InnerTypes, superNames=[]] MODIFIER_LIST[public final] TYPE_PARAMETER_LIST TYPE_PARAMETER[fqName=null, isInVariance=false, isOutVariance=false, name=E] @@ -57,7 +57,7 @@ PsiJetFileStubImpl[package=test] USER_TYPE REFERENCE_EXPRESSION[referencedName=kotlin] REFERENCE_EXPRESSION[referencedName=Unit] - CLASS[fqName=test.InnerTypes.Inner, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=Inner, superNames=[]] + CLASS[classId=test/InnerTypes.Inner, fqName=test.InnerTypes.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=G] @@ -66,7 +66,7 @@ PsiJetFileStubImpl[package=test] MODIFIER_LIST[public] VALUE_PARAMETER_LIST CLASS_BODY - CLASS[fqName=test.InnerTypes.Inner.Inner3, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=Inner3, superNames=[]] + CLASS[classId=test/InnerTypes.Inner.Inner3, fqName=test.InnerTypes.Inner.Inner3, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=Inner3, superNames=[]] MODIFIER_LIST[inner public final] TYPE_PARAMETER_LIST TYPE_PARAMETER[fqName=null, isInVariance=false, isOutVariance=false, name=I] @@ -209,7 +209,7 @@ PsiJetFileStubImpl[package=test] USER_TYPE REFERENCE_EXPRESSION[referencedName=kotlin] REFERENCE_EXPRESSION[referencedName=Unit] - CLASS[fqName=test.InnerTypes.Inner2, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=Inner2, superNames=[]] + CLASS[classId=test/InnerTypes.Inner2, fqName=test.InnerTypes.Inner2, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=Inner2, superNames=[]] MODIFIER_LIST[inner public final] PRIMARY_CONSTRUCTOR MODIFIER_LIST[public] diff --git a/idea/testData/decompiler/stubBuilder/LocalClass/LocalClass.txt b/idea/testData/decompiler/stubBuilder/LocalClass/LocalClass.txt index 96b5e7da6be..7e1c85a61d7 100644 --- a/idea/testData/decompiler/stubBuilder/LocalClass/LocalClass.txt +++ b/idea/testData/decompiler/stubBuilder/LocalClass/LocalClass.txt @@ -2,7 +2,7 @@ PsiJetFileStubImpl[package=test] PACKAGE_DIRECTIVE REFERENCE_EXPRESSION[referencedName=test] IMPORT_LIST - CLASS[fqName=test.LocalClass, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=LocalClass, superNames=[]] + CLASS[classId=test/LocalClass, fqName=test.LocalClass, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=LocalClass, superNames=[]] MODIFIER_LIST[public final] PRIMARY_CONSTRUCTOR MODIFIER_LIST[public] diff --git a/idea/testData/decompiler/stubBuilder/Modifiers/Modifiers.txt b/idea/testData/decompiler/stubBuilder/Modifiers/Modifiers.txt index e0aecc64b88..d7d45a07ed0 100644 --- a/idea/testData/decompiler/stubBuilder/Modifiers/Modifiers.txt +++ b/idea/testData/decompiler/stubBuilder/Modifiers/Modifiers.txt @@ -2,7 +2,7 @@ PsiJetFileStubImpl[package=test] PACKAGE_DIRECTIVE REFERENCE_EXPRESSION[referencedName=test] IMPORT_LIST - CLASS[fqName=test.Modifiers, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=Modifiers, superNames=[]] + CLASS[classId=test/Modifiers, fqName=test.Modifiers, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=Modifiers, superNames=[]] MODIFIER_LIST[public final data] PRIMARY_CONSTRUCTOR MODIFIER_LIST[public] @@ -154,7 +154,7 @@ PsiJetFileStubImpl[package=test] USER_TYPE REFERENCE_EXPRESSION[referencedName=kotlin] REFERENCE_EXPRESSION[referencedName=Unit] - CLASS[fqName=test.Modifiers.Ann, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=Ann, superNames=[Annotation]] + CLASS[classId=test/Modifiers.Ann, fqName=test.Modifiers.Ann, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=Ann, superNames=[Annotation]] MODIFIER_LIST[public final annotation] PRIMARY_CONSTRUCTOR MODIFIER_LIST[public] diff --git a/idea/testData/decompiler/stubBuilder/NamedCompanionObject/NamedCompanionObject.txt b/idea/testData/decompiler/stubBuilder/NamedCompanionObject/NamedCompanionObject.txt index 9c6d279654e..a140192b7a0 100644 --- a/idea/testData/decompiler/stubBuilder/NamedCompanionObject/NamedCompanionObject.txt +++ b/idea/testData/decompiler/stubBuilder/NamedCompanionObject/NamedCompanionObject.txt @@ -2,13 +2,13 @@ PsiJetFileStubImpl[package=test] PACKAGE_DIRECTIVE REFERENCE_EXPRESSION[referencedName=test] IMPORT_LIST - CLASS[fqName=test.NamedCompanionObject, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=NamedCompanionObject, superNames=[]] + CLASS[classId=test/NamedCompanionObject, fqName=test.NamedCompanionObject, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=NamedCompanionObject, superNames=[]] MODIFIER_LIST[public final] PRIMARY_CONSTRUCTOR MODIFIER_LIST[public] VALUE_PARAMETER_LIST CLASS_BODY - OBJECT_DECLARATION[fqName=test.NamedCompanionObject.Named, isCompanion=true, isLocal=false, isObjectLiteral=false, isTopLevel=false, name=Named, superNames=[]] + OBJECT_DECLARATION[classId=test/NamedCompanionObject.Named, fqName=test.NamedCompanionObject.Named, isCompanion=true, isLocal=false, isObjectLiteral=false, isTopLevel=false, name=Named, superNames=[]] MODIFIER_LIST[public companion] CLASS_BODY PROPERTY[fqName=test.NamedCompanionObject.Named.j, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=false, isTopLevel=false, isVar=false, name=j] @@ -26,13 +26,13 @@ PsiJetFileStubImpl[package=test] USER_TYPE REFERENCE_EXPRESSION[referencedName=kotlin] REFERENCE_EXPRESSION[referencedName=Int] - CLASS[fqName=test.NamedCompanionObject.Named.A, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=A, superNames=[]] + CLASS[classId=test/NamedCompanionObject.Named.A, fqName=test.NamedCompanionObject.Named.A, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=A, superNames=[]] MODIFIER_LIST[public final] PRIMARY_CONSTRUCTOR MODIFIER_LIST[public] VALUE_PARAMETER_LIST CLASS_BODY - CLASS[fqName=test.NamedCompanionObject.Named.A.B, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=B, superNames=[]] + CLASS[classId=test/NamedCompanionObject.Named.A.B, fqName=test.NamedCompanionObject.Named.A.B, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=B, superNames=[]] MODIFIER_LIST[public final] PRIMARY_CONSTRUCTOR MODIFIER_LIST[public] @@ -68,31 +68,31 @@ PsiJetFileStubImpl[package=test] USER_TYPE REFERENCE_EXPRESSION[referencedName=kotlin] REFERENCE_EXPRESSION[referencedName=Unit] - CLASS[fqName=test.NamedCompanionObject.B, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=B, superNames=[]] + CLASS[classId=test/NamedCompanionObject.B, fqName=test.NamedCompanionObject.B, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=B, superNames=[]] MODIFIER_LIST[public final] PRIMARY_CONSTRUCTOR MODIFIER_LIST[public] VALUE_PARAMETER_LIST CLASS_BODY - OBJECT_DECLARATION[fqName=test.NamedCompanionObject.B.NamedInB, isCompanion=true, isLocal=false, isObjectLiteral=false, isTopLevel=false, name=NamedInB, superNames=[]] + OBJECT_DECLARATION[classId=test/NamedCompanionObject.B.NamedInB, fqName=test.NamedCompanionObject.B.NamedInB, isCompanion=true, isLocal=false, isObjectLiteral=false, isTopLevel=false, name=NamedInB, superNames=[]] MODIFIER_LIST[public companion] CLASS_BODY - CLASS[fqName=test.NamedCompanionObject.B.NamedInB.C, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=C, superNames=[]] + CLASS[classId=test/NamedCompanionObject.B.NamedInB.C, fqName=test.NamedCompanionObject.B.NamedInB.C, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=C, superNames=[]] MODIFIER_LIST[public final] PRIMARY_CONSTRUCTOR MODIFIER_LIST[public] VALUE_PARAMETER_LIST CLASS_BODY - OBJECT_DECLARATION[fqName=test.NamedCompanionObject.B.NamedInB.C.NamedInC, isCompanion=true, isLocal=false, isObjectLiteral=false, isTopLevel=false, name=NamedInC, superNames=[]] + OBJECT_DECLARATION[classId=test/NamedCompanionObject.B.NamedInB.C.NamedInC, fqName=test.NamedCompanionObject.B.NamedInB.C.NamedInC, isCompanion=true, isLocal=false, isObjectLiteral=false, isTopLevel=false, name=NamedInC, superNames=[]] MODIFIER_LIST[public companion] CLASS_BODY - CLASS[fqName=test.NamedCompanionObject.B.NamedInB.C.NamedInC.D, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=D, superNames=[]] + CLASS[classId=test/NamedCompanionObject.B.NamedInB.C.NamedInC.D, fqName=test.NamedCompanionObject.B.NamedInB.C.NamedInC.D, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=D, superNames=[]] MODIFIER_LIST[public final] PRIMARY_CONSTRUCTOR MODIFIER_LIST[public] VALUE_PARAMETER_LIST CLASS_BODY - OBJECT_DECLARATION[fqName=test.NamedCompanionObject.B.NamedInB.C.NamedInC.D.Companion, isCompanion=true, isLocal=false, isObjectLiteral=false, isTopLevel=false, name=Companion, superNames=[]] + OBJECT_DECLARATION[classId=test/NamedCompanionObject.B.NamedInB.C.NamedInC.D.Companion, fqName=test.NamedCompanionObject.B.NamedInB.C.NamedInC.D.Companion, isCompanion=true, isLocal=false, isObjectLiteral=false, isTopLevel=false, name=Companion, superNames=[]] MODIFIER_LIST[public companion] CLASS_BODY PROPERTY[fqName=test.NamedCompanionObject.B.NamedInB.C.NamedInC.D.Companion.i, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=false, isTopLevel=false, isVar=false, name=i] @@ -110,7 +110,7 @@ PsiJetFileStubImpl[package=test] USER_TYPE REFERENCE_EXPRESSION[referencedName=kotlin] REFERENCE_EXPRESSION[referencedName=Unit] - CLASS[fqName=test.NamedCompanionObject.B.NamedInB.C.NamedInC.D.Companion.Anno, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=Anno, superNames=[Annotation]] + CLASS[classId=test/NamedCompanionObject.B.NamedInB.C.NamedInC.D.Companion.Anno, fqName=test.NamedCompanionObject.B.NamedInB.C.NamedInC.D.Companion.Anno, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=Anno, superNames=[Annotation]] MODIFIER_LIST[public final annotation] PRIMARY_CONSTRUCTOR MODIFIER_LIST[public] @@ -123,7 +123,7 @@ PsiJetFileStubImpl[package=test] REFERENCE_EXPRESSION[referencedName=kotlin] REFERENCE_EXPRESSION[referencedName=Annotation] CLASS_BODY - CLASS[fqName=test.NamedCompanionObject.B.NamedInB.C.NamedInC.D.Companion.En, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=En, superNames=[Enum]] + CLASS[classId=test/NamedCompanionObject.B.NamedInB.C.NamedInC.D.Companion.En, fqName=test.NamedCompanionObject.B.NamedInB.C.NamedInC.D.Companion.En, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=En, superNames=[Enum]] MODIFIER_LIST[enum public final] PRIMARY_CONSTRUCTOR MODIFIER_LIST[private] @@ -157,7 +157,7 @@ PsiJetFileStubImpl[package=test] REFERENCE_EXPRESSION[referencedName=Companion] REFERENCE_EXPRESSION[referencedName=En] CLASS_BODY - ENUM_ENTRY[fqName=test.NamedCompanionObject.B.NamedInB.C.NamedInC.D.Companion.En.A, isEnumEntry=true, isInterface=false, isLocal=false, isTopLevel=false, name=A, superNames=[]] - OBJECT_DECLARATION[fqName=test.NamedCompanionObject.B.NamedInB.C.NamedInC.D.Companion.En.NamedInEn, isCompanion=true, isLocal=false, isObjectLiteral=false, isTopLevel=false, name=NamedInEn, superNames=[]] + ENUM_ENTRY[classId=null, fqName=test.NamedCompanionObject.B.NamedInB.C.NamedInC.D.Companion.En.A, isEnumEntry=true, isInterface=false, isLocal=false, isTopLevel=false, name=A, superNames=[]] + OBJECT_DECLARATION[classId=test/NamedCompanionObject.B.NamedInB.C.NamedInC.D.Companion.En.NamedInEn, fqName=test.NamedCompanionObject.B.NamedInB.C.NamedInC.D.Companion.En.NamedInEn, isCompanion=true, isLocal=false, isObjectLiteral=false, isTopLevel=false, name=NamedInEn, superNames=[]] MODIFIER_LIST[public companion] CLASS_BODY diff --git a/idea/testData/decompiler/stubBuilder/NestedClasses/NestedClasses.txt b/idea/testData/decompiler/stubBuilder/NestedClasses/NestedClasses.txt index b2dd4a20220..c87643bb129 100644 --- a/idea/testData/decompiler/stubBuilder/NestedClasses/NestedClasses.txt +++ b/idea/testData/decompiler/stubBuilder/NestedClasses/NestedClasses.txt @@ -2,7 +2,7 @@ PsiJetFileStubImpl[package=test] PACKAGE_DIRECTIVE REFERENCE_EXPRESSION[referencedName=test] IMPORT_LIST - CLASS[fqName=test.NestedClasses, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=NestedClasses, superNames=[]] + CLASS[classId=test/NestedClasses, fqName=test.NestedClasses, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=NestedClasses, superNames=[]] MODIFIER_LIST[public final] TYPE_PARAMETER_LIST TYPE_PARAMETER[fqName=null, isInVariance=false, isOutVariance=false, name=TOuter] @@ -25,7 +25,7 @@ PsiJetFileStubImpl[package=test] USER_TYPE REFERENCE_EXPRESSION[referencedName=kotlin] REFERENCE_EXPRESSION[referencedName=Unit] - CLASS[fqName=test.NestedClasses.Inner, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=Inner, superNames=[]] + CLASS[classId=test/NestedClasses.Inner, 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] @@ -48,7 +48,7 @@ PsiJetFileStubImpl[package=test] USER_TYPE REFERENCE_EXPRESSION[referencedName=kotlin] REFERENCE_EXPRESSION[referencedName=Unit] - CLASS[fqName=test.NestedClasses.Inner.II, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=II, superNames=[]] + CLASS[classId=test/NestedClasses.Inner.II, 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] @@ -104,7 +104,7 @@ PsiJetFileStubImpl[package=test] USER_TYPE REFERENCE_EXPRESSION[referencedName=kotlin] REFERENCE_EXPRESSION[referencedName=Unit] - CLASS[fqName=test.NestedClasses.Nested, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=Nested, superNames=[]] + CLASS[classId=test/NestedClasses.Nested, 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] @@ -131,7 +131,7 @@ PsiJetFileStubImpl[package=test] USER_TYPE REFERENCE_EXPRESSION[referencedName=kotlin] REFERENCE_EXPRESSION[referencedName=Unit] - CLASS[fqName=test.NestedClasses.Nested.NI, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=NI, superNames=[]] + CLASS[classId=test/NestedClasses.Nested.NI, fqName=test.NestedClasses.Nested.NI, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=NI, superNames=[]] MODIFIER_LIST[inner public final] TYPE_PARAMETER_LIST TYPE_PARAMETER[fqName=null, isInVariance=false, isOutVariance=false, name=TNI] @@ -158,7 +158,7 @@ PsiJetFileStubImpl[package=test] USER_TYPE REFERENCE_EXPRESSION[referencedName=kotlin] REFERENCE_EXPRESSION[referencedName=Unit] - CLASS[fqName=test.NestedClasses.Nested.NN, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=NN, superNames=[]] + CLASS[classId=test/NestedClasses.Nested.NN, 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 1d92fab97fc..df62221e586 100644 --- a/idea/testData/decompiler/stubBuilder/Objects/Objects.txt +++ b/idea/testData/decompiler/stubBuilder/Objects/Objects.txt @@ -1,7 +1,7 @@ PsiJetFileStubImpl[package=] PACKAGE_DIRECTIVE IMPORT_LIST - OBJECT_DECLARATION[fqName=Objects, isCompanion=false, isLocal=false, isObjectLiteral=false, isTopLevel=true, name=Objects, superNames=[]] + OBJECT_DECLARATION[classId=/Objects, fqName=Objects, isCompanion=false, isLocal=false, isObjectLiteral=false, isTopLevel=true, name=Objects, superNames=[]] MODIFIER_LIST[public] CLASS_BODY PROPERTY[fqName=Objects.c, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=false, isTopLevel=false, isVar=false, name=c] @@ -19,7 +19,7 @@ PsiJetFileStubImpl[package=] USER_TYPE REFERENCE_EXPRESSION[referencedName=kotlin] REFERENCE_EXPRESSION[referencedName=Unit] - OBJECT_DECLARATION[fqName=Objects.InnerObject, isCompanion=false, isLocal=false, isObjectLiteral=false, isTopLevel=false, name=InnerObject, superNames=[A]] + OBJECT_DECLARATION[classId=/Objects.InnerObject, fqName=Objects.InnerObject, isCompanion=false, isLocal=false, isObjectLiteral=false, isTopLevel=false, name=InnerObject, superNames=[A]] MODIFIER_LIST[private] SUPER_TYPE_LIST SUPER_TYPE_ENTRY @@ -42,13 +42,13 @@ PsiJetFileStubImpl[package=] USER_TYPE REFERENCE_EXPRESSION[referencedName=kotlin] REFERENCE_EXPRESSION[referencedName=Unit] - CLASS[fqName=Objects.NestedClass, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=NestedClass, superNames=[]] + CLASS[classId=/Objects.NestedClass, fqName=Objects.NestedClass, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=NestedClass, superNames=[]] MODIFIER_LIST[open public] PRIMARY_CONSTRUCTOR MODIFIER_LIST[public] VALUE_PARAMETER_LIST CLASS_BODY - OBJECT_DECLARATION[fqName=Objects.OtherObject, isCompanion=false, isLocal=false, isObjectLiteral=false, isTopLevel=false, name=OtherObject, superNames=[NestedClass]] + OBJECT_DECLARATION[classId=/Objects.OtherObject, fqName=Objects.OtherObject, isCompanion=false, isLocal=false, isObjectLiteral=false, isTopLevel=false, name=OtherObject, superNames=[NestedClass]] MODIFIER_LIST[public] SUPER_TYPE_LIST SUPER_TYPE_ENTRY diff --git a/idea/testData/decompiler/stubBuilder/PrivateConstField/PrivateConstField.txt b/idea/testData/decompiler/stubBuilder/PrivateConstField/PrivateConstField.txt index c59bb1faff3..3751359f238 100644 --- a/idea/testData/decompiler/stubBuilder/PrivateConstField/PrivateConstField.txt +++ b/idea/testData/decompiler/stubBuilder/PrivateConstField/PrivateConstField.txt @@ -2,13 +2,13 @@ PsiJetFileStubImpl[package=test] PACKAGE_DIRECTIVE REFERENCE_EXPRESSION[referencedName=test] IMPORT_LIST - CLASS[fqName=test.PrivateConstField, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=PrivateConstField, superNames=[]] + CLASS[classId=test/PrivateConstField, fqName=test.PrivateConstField, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=PrivateConstField, superNames=[]] MODIFIER_LIST[public final] PRIMARY_CONSTRUCTOR MODIFIER_LIST[public] VALUE_PARAMETER_LIST CLASS_BODY - OBJECT_DECLARATION[fqName=test.PrivateConstField.Companion, isCompanion=true, isLocal=false, isObjectLiteral=false, isTopLevel=false, name=Companion, superNames=[]] + OBJECT_DECLARATION[classId=test/PrivateConstField.Companion, fqName=test.PrivateConstField.Companion, isCompanion=true, isLocal=false, isObjectLiteral=false, isTopLevel=false, name=Companion, superNames=[]] MODIFIER_LIST[private companion] CLASS_BODY PROPERTY[fqName=test.PrivateConstField.Companion.CONST, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=false, isTopLevel=false, isVar=false, name=CONST] diff --git a/idea/testData/decompiler/stubBuilder/PrivateToThis/PrivateToThis.txt b/idea/testData/decompiler/stubBuilder/PrivateToThis/PrivateToThis.txt index 1864f996187..f47bd949cdc 100644 --- a/idea/testData/decompiler/stubBuilder/PrivateToThis/PrivateToThis.txt +++ b/idea/testData/decompiler/stubBuilder/PrivateToThis/PrivateToThis.txt @@ -2,7 +2,7 @@ PsiJetFileStubImpl[package=p] PACKAGE_DIRECTIVE REFERENCE_EXPRESSION[referencedName=p] IMPORT_LIST - CLASS[fqName=p.PrivateToThis, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=PrivateToThis, superNames=[]] + CLASS[classId=p/PrivateToThis, fqName=p.PrivateToThis, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=PrivateToThis, superNames=[]] MODIFIER_LIST[public final] TYPE_PARAMETER_LIST TYPE_PARAMETER[fqName=null, isInVariance=true, isOutVariance=false, name=I] diff --git a/idea/testData/decompiler/stubBuilder/Sealed/Sealed.txt b/idea/testData/decompiler/stubBuilder/Sealed/Sealed.txt index ba85febe4fc..cf87da7156d 100644 --- a/idea/testData/decompiler/stubBuilder/Sealed/Sealed.txt +++ b/idea/testData/decompiler/stubBuilder/Sealed/Sealed.txt @@ -2,13 +2,13 @@ PsiJetFileStubImpl[package=test] PACKAGE_DIRECTIVE REFERENCE_EXPRESSION[referencedName=test] IMPORT_LIST - CLASS[fqName=test.Sealed, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=Sealed, superNames=[]] + CLASS[classId=test/Sealed, fqName=test.Sealed, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=Sealed, superNames=[]] MODIFIER_LIST[public sealed] PRIMARY_CONSTRUCTOR MODIFIER_LIST[protected] VALUE_PARAMETER_LIST CLASS_BODY - CLASS[fqName=test.Sealed.Nested, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=Nested, superNames=[Sealed]] + CLASS[classId=test/Sealed.Nested, fqName=test.Sealed.Nested, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=Nested, superNames=[Sealed]] MODIFIER_LIST[public final] PRIMARY_CONSTRUCTOR MODIFIER_LIST[public] @@ -21,7 +21,7 @@ PsiJetFileStubImpl[package=test] REFERENCE_EXPRESSION[referencedName=test] REFERENCE_EXPRESSION[referencedName=Sealed] CLASS_BODY - OBJECT_DECLARATION[fqName=test.Sealed.Top, isCompanion=false, isLocal=false, isObjectLiteral=false, isTopLevel=false, name=Top, superNames=[Sealed]] + OBJECT_DECLARATION[classId=test/Sealed.Top, fqName=test.Sealed.Top, isCompanion=false, isLocal=false, isObjectLiteral=false, isTopLevel=false, name=Top, superNames=[Sealed]] MODIFIER_LIST[public] SUPER_TYPE_LIST SUPER_TYPE_ENTRY diff --git a/idea/testData/decompiler/stubBuilder/SecondaryConstructors/SecondaryConstructors.txt b/idea/testData/decompiler/stubBuilder/SecondaryConstructors/SecondaryConstructors.txt index 65991801475..4b1b7125653 100644 --- a/idea/testData/decompiler/stubBuilder/SecondaryConstructors/SecondaryConstructors.txt +++ b/idea/testData/decompiler/stubBuilder/SecondaryConstructors/SecondaryConstructors.txt @@ -2,7 +2,7 @@ PsiJetFileStubImpl[package=test] PACKAGE_DIRECTIVE REFERENCE_EXPRESSION[referencedName=test] IMPORT_LIST - CLASS[fqName=test.SecondaryConstructors, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=SecondaryConstructors, superNames=[]] + CLASS[classId=test/SecondaryConstructors, fqName=test.SecondaryConstructors, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=SecondaryConstructors, superNames=[]] MODIFIER_LIST[public final] PRIMARY_CONSTRUCTOR MODIFIER_LIST[public] @@ -39,7 +39,7 @@ PsiJetFileStubImpl[package=test] USER_TYPE REFERENCE_EXPRESSION[referencedName=kotlin] REFERENCE_EXPRESSION[referencedName=Int] - CLASS[fqName=test.SecondaryConstructors.Inner, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=Inner, superNames=[]] + CLASS[classId=test/SecondaryConstructors.Inner, fqName=test.SecondaryConstructors.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=T] @@ -76,7 +76,7 @@ PsiJetFileStubImpl[package=test] TYPE_REFERENCE USER_TYPE REFERENCE_EXPRESSION[referencedName=G] - CLASS[fqName=test.SecondaryConstructors.Nested, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=Nested, superNames=[]] + CLASS[classId=test/SecondaryConstructors.Nested, fqName=test.SecondaryConstructors.Nested, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=Nested, superNames=[]] MODIFIER_LIST[public final] CLASS_BODY SECONDARY_CONSTRUCTOR diff --git a/idea/testData/decompiler/stubBuilder/SuspendLambda/SuspendLambda.txt b/idea/testData/decompiler/stubBuilder/SuspendLambda/SuspendLambda.txt index 4aff4774d4f..5c3bb7d85b7 100644 --- a/idea/testData/decompiler/stubBuilder/SuspendLambda/SuspendLambda.txt +++ b/idea/testData/decompiler/stubBuilder/SuspendLambda/SuspendLambda.txt @@ -2,7 +2,7 @@ PsiJetFileStubImpl[package=test] PACKAGE_DIRECTIVE REFERENCE_EXPRESSION[referencedName=test] IMPORT_LIST - CLASS[fqName=test.SuspendLambda, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=SuspendLambda, superNames=[]] + CLASS[classId=test/SuspendLambda, fqName=test.SuspendLambda, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=SuspendLambda, superNames=[]] MODIFIER_LIST[public final] PRIMARY_CONSTRUCTOR MODIFIER_LIST[public] diff --git a/idea/testData/decompiler/stubBuilder/TypeAliases/TypeAliases.txt b/idea/testData/decompiler/stubBuilder/TypeAliases/TypeAliases.txt index ee657258e04..2a8583b5d0a 100644 --- a/idea/testData/decompiler/stubBuilder/TypeAliases/TypeAliases.txt +++ b/idea/testData/decompiler/stubBuilder/TypeAliases/TypeAliases.txt @@ -2,7 +2,7 @@ PsiJetFileStubImpl[package=test] PACKAGE_DIRECTIVE REFERENCE_EXPRESSION[referencedName=test] IMPORT_LIST - CLASS[fqName=test.TypeAliases, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=TypeAliases, superNames=[]] + CLASS[classId=test/TypeAliases, fqName=test.TypeAliases, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=TypeAliases, superNames=[]] MODIFIER_LIST[public final] PRIMARY_CONSTRUCTOR MODIFIER_LIST[public] @@ -95,13 +95,13 @@ PsiJetFileStubImpl[package=test] USER_TYPE REFERENCE_EXPRESSION[referencedName=kotlin] REFERENCE_EXPRESSION[referencedName=Unit] - CLASS[fqName=test.TypeAliases.OrderA, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=OrderA, superNames=[]] + CLASS[classId=test/TypeAliases.OrderA, fqName=test.TypeAliases.OrderA, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=OrderA, superNames=[]] MODIFIER_LIST[public final] PRIMARY_CONSTRUCTOR MODIFIER_LIST[public] VALUE_PARAMETER_LIST CLASS_BODY - CLASS[fqName=test.TypeAliases.OrderB, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=OrderB, superNames=[]] + CLASS[classId=test/TypeAliases.OrderB, fqName=test.TypeAliases.OrderB, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=OrderB, superNames=[]] MODIFIER_LIST[public final] PRIMARY_CONSTRUCTOR MODIFIER_LIST[public] diff --git a/idea/testData/decompiler/stubBuilder/TypeBoundsAndDelegationSpecifiers/TypeBoundsAndDelegationSpecifiers.txt b/idea/testData/decompiler/stubBuilder/TypeBoundsAndDelegationSpecifiers/TypeBoundsAndDelegationSpecifiers.txt index 1217406e51c..379a79b417d 100644 --- a/idea/testData/decompiler/stubBuilder/TypeBoundsAndDelegationSpecifiers/TypeBoundsAndDelegationSpecifiers.txt +++ b/idea/testData/decompiler/stubBuilder/TypeBoundsAndDelegationSpecifiers/TypeBoundsAndDelegationSpecifiers.txt @@ -2,7 +2,7 @@ PsiJetFileStubImpl[package=test] PACKAGE_DIRECTIVE REFERENCE_EXPRESSION[referencedName=test] IMPORT_LIST - CLASS[fqName=test.TypeBoundsAndDelegationSpecifiers, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=TypeBoundsAndDelegationSpecifiers, superNames=[A, T]] + CLASS[classId=test/TypeBoundsAndDelegationSpecifiers, fqName=test.TypeBoundsAndDelegationSpecifiers, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=TypeBoundsAndDelegationSpecifiers, superNames=[A, T]] MODIFIER_LIST[public final] TYPE_PARAMETER_LIST TYPE_PARAMETER[fqName=null, isInVariance=false, isOutVariance=false, name=H] diff --git a/idea/testData/decompiler/stubBuilder/TypeModifiers/TypeModifiers.txt b/idea/testData/decompiler/stubBuilder/TypeModifiers/TypeModifiers.txt index 19fdad621ae..f290bed7c5a 100644 --- a/idea/testData/decompiler/stubBuilder/TypeModifiers/TypeModifiers.txt +++ b/idea/testData/decompiler/stubBuilder/TypeModifiers/TypeModifiers.txt @@ -1,7 +1,7 @@ PsiJetFileStubImpl[package=] PACKAGE_DIRECTIVE IMPORT_LIST - CLASS[fqName=TypeModifiers, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=TypeModifiers, superNames=[]] + CLASS[classId=/TypeModifiers, fqName=TypeModifiers, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=TypeModifiers, superNames=[]] MODIFIER_LIST[public final] PRIMARY_CONSTRUCTOR MODIFIER_LIST[public] diff --git a/idea/testData/decompiler/stubBuilder/TypeParams/TypeParams.txt b/idea/testData/decompiler/stubBuilder/TypeParams/TypeParams.txt index a824cada927..5e8112de3dc 100644 --- a/idea/testData/decompiler/stubBuilder/TypeParams/TypeParams.txt +++ b/idea/testData/decompiler/stubBuilder/TypeParams/TypeParams.txt @@ -2,7 +2,7 @@ PsiJetFileStubImpl[package=test] PACKAGE_DIRECTIVE REFERENCE_EXPRESSION[referencedName=test] IMPORT_LIST - CLASS[fqName=test.TypeParams, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=TypeParams, superNames=[]] + CLASS[classId=test/TypeParams, fqName=test.TypeParams, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=TypeParams, superNames=[]] MODIFIER_LIST[public 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 7100d63ed3c..f12faa12bfb 100644 --- a/idea/testData/decompiler/stubBuilder/Types/Types.txt +++ b/idea/testData/decompiler/stubBuilder/Types/Types.txt @@ -2,7 +2,7 @@ PsiJetFileStubImpl[package=test] PACKAGE_DIRECTIVE REFERENCE_EXPRESSION[referencedName=test] IMPORT_LIST - CLASS[fqName=test.Types, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=Types, superNames=[]] + CLASS[classId=test/Types, fqName=test.Types, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=Types, superNames=[]] MODIFIER_LIST[abstract public] PRIMARY_CONSTRUCTOR MODIFIER_LIST[public] diff --git a/idea/testData/stubs/AnnotationClass.expected b/idea/testData/stubs/AnnotationClass.expected index 89543c5f293..bca57115482 100644 --- a/idea/testData/stubs/AnnotationClass.expected +++ b/idea/testData/stubs/AnnotationClass.expected @@ -1,5 +1,5 @@ PsiJetFileStubImpl[package=] PACKAGE_DIRECTIVE IMPORT_LIST - CLASS[fqName=Test, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=Test, superNames=[]] + CLASS[classId=/Test, 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 6f5055321c6..5d60d8b8552 100644 --- a/idea/testData/stubs/AnnotationOnClass.expected +++ b/idea/testData/stubs/AnnotationOnClass.expected @@ -1,7 +1,7 @@ PsiJetFileStubImpl[package=] PACKAGE_DIRECTIVE IMPORT_LIST - CLASS[fqName=Test, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=Test, superNames=[]] + CLASS[classId=/Test, 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/AnnotationValues.expected b/idea/testData/stubs/AnnotationValues.expected index cc181ded727..145e30c7983 100644 --- a/idea/testData/stubs/AnnotationValues.expected +++ b/idea/testData/stubs/AnnotationValues.expected @@ -14,7 +14,7 @@ PsiJetFileStubImpl[package=test] REFERENCE_EXPRESSION[referencedName=kotlin] REFERENCE_EXPRESSION[referencedName=reflect] REFERENCE_EXPRESSION[referencedName=KClass] - CLASS[fqName=test.Simple, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=Simple, superNames=[]] + CLASS[classId=test/Simple, fqName=test.Simple, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=Simple, superNames=[]] MODIFIER_LIST[annotation] PRIMARY_CONSTRUCTOR VALUE_PARAMETER_LIST @@ -50,7 +50,7 @@ PsiJetFileStubImpl[package=test] TYPE_REFERENCE USER_TYPE REFERENCE_EXPRESSION[referencedName=Boolean] - CLASS[fqName=test.WithSimple, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=WithSimple, superNames=[]] + CLASS[classId=test/WithSimple, fqName=test.WithSimple, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=WithSimple, superNames=[]] MODIFIER_LIST[] ANNOTATION_ENTRY[hasValueArguments=true, shortName=Simple] CONSTRUCTOR_CALLEE @@ -82,7 +82,7 @@ PsiJetFileStubImpl[package=test] VALUE_ARGUMENT_NAME REFERENCE_EXPRESSION[referencedName=b2] BOOLEAN_CONSTANT[kind=BOOLEAN_CONSTANT, value=false] - CLASS[fqName=test.StringLiteral, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=StringLiteral, superNames=[]] + CLASS[classId=test/StringLiteral, fqName=test.StringLiteral, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=StringLiteral, superNames=[]] MODIFIER_LIST[annotation] PRIMARY_CONSTRUCTOR VALUE_PARAMETER_LIST @@ -100,7 +100,7 @@ PsiJetFileStubImpl[package=test] REFERENCE_EXPRESSION[referencedName=String] PROPERTY[fqName=test.CONSTANT, hasDelegate=false, hasDelegateExpression=false, hasInitializer=true, hasReturnTypeRef=false, isExtension=false, isTopLevel=true, isVar=false, name=CONSTANT] MODIFIER_LIST[const] - CLASS[fqName=test.WithStringLiteral, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=WithStringLiteral, superNames=[]] + CLASS[classId=test/WithStringLiteral, fqName=test.WithStringLiteral, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=WithStringLiteral, superNames=[]] MODIFIER_LIST[] ANNOTATION_ENTRY[hasValueArguments=true, shortName=StringLiteral] CONSTRUCTOR_CALLEE @@ -118,12 +118,12 @@ PsiJetFileStubImpl[package=test] LITERAL_STRING_TEMPLATE_ENTRY[text=H] SHORT_STRING_TEMPLATE_ENTRY[text=$CONSTANT] REFERENCE_EXPRESSION[referencedName=CONSTANT] - CLASS[fqName=test.E, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=E, superNames=[]] + CLASS[classId=test/E, fqName=test.E, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=E, superNames=[]] MODIFIER_LIST[enum] CLASS_BODY - ENUM_ENTRY[fqName=test.E.E1, isEnumEntry=true, isInterface=false, isLocal=false, isTopLevel=false, name=E1, superNames=[]] - ENUM_ENTRY[fqName=test.E.E2, isEnumEntry=true, isInterface=false, isLocal=false, isTopLevel=false, name=E2, superNames=[]] - CLASS[fqName=test.EnumLiteral, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=EnumLiteral, superNames=[]] + ENUM_ENTRY[classId=null, fqName=test.E.E1, isEnumEntry=true, isInterface=false, isLocal=false, isTopLevel=false, name=E1, superNames=[]] + ENUM_ENTRY[classId=null, fqName=test.E.E2, isEnumEntry=true, isInterface=false, isLocal=false, isTopLevel=false, name=E2, superNames=[]] + CLASS[classId=test/EnumLiteral, fqName=test.EnumLiteral, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=EnumLiteral, superNames=[]] MODIFIER_LIST[annotation] PRIMARY_CONSTRUCTOR VALUE_PARAMETER_LIST @@ -139,7 +139,7 @@ PsiJetFileStubImpl[package=test] TYPE_REFERENCE USER_TYPE REFERENCE_EXPRESSION[referencedName=E] - CLASS[fqName=test.WithEnumLiteral, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=WithEnumLiteral, superNames=[]] + CLASS[classId=test/WithEnumLiteral, fqName=test.WithEnumLiteral, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=WithEnumLiteral, superNames=[]] MODIFIER_LIST[] ANNOTATION_ENTRY[hasValueArguments=true, shortName=EnumLiteral] CONSTRUCTOR_CALLEE @@ -161,7 +161,7 @@ PsiJetFileStubImpl[package=test] REFERENCE_EXPRESSION[referencedName=test] REFERENCE_EXPRESSION[referencedName=E] REFERENCE_EXPRESSION[referencedName=E2] - CLASS[fqName=test.VarArg, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=VarArg, superNames=[]] + CLASS[classId=test/VarArg, fqName=test.VarArg, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=VarArg, superNames=[]] MODIFIER_LIST[annotation] PRIMARY_CONSTRUCTOR VALUE_PARAMETER_LIST @@ -170,7 +170,7 @@ PsiJetFileStubImpl[package=test] TYPE_REFERENCE USER_TYPE REFERENCE_EXPRESSION[referencedName=Int] - CLASS[fqName=test.WithVarArg, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=WithVarArg, superNames=[]] + CLASS[classId=test/WithVarArg, fqName=test.WithVarArg, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=WithVarArg, superNames=[]] MODIFIER_LIST[] ANNOTATION_ENTRY[hasValueArguments=true, shortName=VarArg] CONSTRUCTOR_CALLEE @@ -184,7 +184,7 @@ PsiJetFileStubImpl[package=test] INTEGER_CONSTANT[kind=INTEGER_CONSTANT, value=2] VALUE_ARGUMENT[isSpread=false] INTEGER_CONSTANT[kind=INTEGER_CONSTANT, value=3] - CLASS[fqName=test.Arrays, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=Arrays, superNames=[]] + CLASS[classId=test/Arrays, fqName=test.Arrays, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=Arrays, superNames=[]] MODIFIER_LIST[annotation] PRIMARY_CONSTRUCTOR VALUE_PARAMETER_LIST @@ -212,7 +212,7 @@ PsiJetFileStubImpl[package=test] TYPE_REFERENCE USER_TYPE REFERENCE_EXPRESSION[referencedName=BooleanArray] - CLASS[fqName=test.WithArrays, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=WithArrays, superNames=[]] + CLASS[classId=test/WithArrays, fqName=test.WithArrays, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=WithArrays, superNames=[]] MODIFIER_LIST[] ANNOTATION_ENTRY[hasValueArguments=true, shortName=Arrays] CONSTRUCTOR_CALLEE @@ -226,7 +226,7 @@ PsiJetFileStubImpl[package=test] VALUE_ARGUMENT[isSpread=false] VALUE_ARGUMENT[isSpread=false] VALUE_ARGUMENT[isSpread=false] - CLASS[fqName=test.ClassLiteral, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=ClassLiteral, superNames=[]] + CLASS[classId=test/ClassLiteral, fqName=test.ClassLiteral, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=ClassLiteral, superNames=[]] MODIFIER_LIST[annotation] PRIMARY_CONSTRUCTOR VALUE_PARAMETER_LIST @@ -248,7 +248,7 @@ PsiJetFileStubImpl[package=test] REFERENCE_EXPRESSION[referencedName=KClass] TYPE_ARGUMENT_LIST TYPE_PROJECTION[projectionKind=STAR] - CLASS[fqName=test.WithClassLiteral, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=WithClassLiteral, superNames=[]] + CLASS[classId=test/WithClassLiteral, fqName=test.WithClassLiteral, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=WithClassLiteral, superNames=[]] MODIFIER_LIST[] ANNOTATION_ENTRY[hasValueArguments=true, shortName=ClassLiteral] CONSTRUCTOR_CALLEE @@ -261,7 +261,7 @@ PsiJetFileStubImpl[package=test] VALUE_ARGUMENT[isSpread=false] TYPE_PARAMETER_LIST TYPE_PARAMETER[fqName=null, isInVariance=false, isOutVariance=false, name=T] - CLASS[fqName=test.Nested, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=Nested, superNames=[]] + CLASS[classId=test/Nested, fqName=test.Nested, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=Nested, superNames=[]] MODIFIER_LIST[annotation] PRIMARY_CONSTRUCTOR VALUE_PARAMETER_LIST @@ -273,7 +273,7 @@ PsiJetFileStubImpl[package=test] TYPE_REFERENCE USER_TYPE REFERENCE_EXPRESSION[referencedName=String] - CLASS[fqName=test.Outer, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=Outer, superNames=[]] + CLASS[classId=test/Outer, fqName=test.Outer, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=Outer, superNames=[]] MODIFIER_LIST[annotation] PRIMARY_CONSTRUCTOR VALUE_PARAMETER_LIST @@ -285,7 +285,7 @@ PsiJetFileStubImpl[package=test] TYPE_REFERENCE USER_TYPE REFERENCE_EXPRESSION[referencedName=Nested] - CLASS[fqName=test.WithNested, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=WithNested, superNames=[]] + CLASS[classId=test/WithNested, fqName=test.WithNested, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=WithNested, superNames=[]] MODIFIER_LIST[] ANNOTATION_ENTRY[hasValueArguments=true, shortName=Outer] CONSTRUCTOR_CALLEE @@ -299,7 +299,7 @@ PsiJetFileStubImpl[package=test] VALUE_ARGUMENT[isSpread=false] VALUE_ARGUMENT_NAME REFERENCE_EXPRESSION[referencedName=nested] - CLASS[fqName=test.ArraysSpread, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=ArraysSpread, superNames=[]] + CLASS[classId=test/ArraysSpread, fqName=test.ArraysSpread, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=ArraysSpread, superNames=[]] MODIFIER_LIST[annotation] PRIMARY_CONSTRUCTOR VALUE_PARAMETER_LIST @@ -308,7 +308,7 @@ PsiJetFileStubImpl[package=test] TYPE_REFERENCE USER_TYPE REFERENCE_EXPRESSION[referencedName=Int] - CLASS[fqName=test.WithSpreadOperatorArrays, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=WithSpreadOperatorArrays, superNames=[]] + CLASS[classId=test/WithSpreadOperatorArrays, fqName=test.WithSpreadOperatorArrays, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=WithSpreadOperatorArrays, superNames=[]] MODIFIER_LIST[] ANNOTATION_ENTRY[hasValueArguments=true, shortName=ArraysSpread] CONSTRUCTOR_CALLEE @@ -317,7 +317,7 @@ PsiJetFileStubImpl[package=test] REFERENCE_EXPRESSION[referencedName=ArraysSpread] VALUE_ARGUMENT_LIST VALUE_ARGUMENT[isSpread=true] - CLASS[fqName=test.WithComplexDotQualifiedAnnotation, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=WithComplexDotQualifiedAnnotation, superNames=[]] + CLASS[classId=test/WithComplexDotQualifiedAnnotation, fqName=test.WithComplexDotQualifiedAnnotation, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=WithComplexDotQualifiedAnnotation, superNames=[]] MODIFIER_LIST[] ANNOTATION_ENTRY[hasValueArguments=true, shortName=SomeAnno1] CONSTRUCTOR_CALLEE diff --git a/idea/testData/stubs/AnnotationWithValue.expected b/idea/testData/stubs/AnnotationWithValue.expected index eaf268d6eae..e0ae83d287b 100644 --- a/idea/testData/stubs/AnnotationWithValue.expected +++ b/idea/testData/stubs/AnnotationWithValue.expected @@ -1,7 +1,7 @@ PsiJetFileStubImpl[package=] PACKAGE_DIRECTIVE IMPORT_LIST - CLASS[fqName=Test, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=Test, superNames=[]] + CLASS[classId=/Test, fqName=Test, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=Test, superNames=[]] MODIFIER_LIST[annotation] PRIMARY_CONSTRUCTOR VALUE_PARAMETER_LIST @@ -13,7 +13,7 @@ PsiJetFileStubImpl[package=] TYPE_REFERENCE USER_TYPE REFERENCE_EXPRESSION[referencedName=String] - CLASS[fqName=Annotated, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=Annotated, superNames=[]] + CLASS[classId=/Annotated, fqName=Annotated, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=Annotated, superNames=[]] MODIFIER_LIST[] ANNOTATION_ENTRY[hasValueArguments=true, shortName=Test] CONSTRUCTOR_CALLEE diff --git a/idea/testData/stubs/AnnotationsOnPrimaryCtr.expected b/idea/testData/stubs/AnnotationsOnPrimaryCtr.expected index 60b047d0a52..7df4f024631 100644 --- a/idea/testData/stubs/AnnotationsOnPrimaryCtr.expected +++ b/idea/testData/stubs/AnnotationsOnPrimaryCtr.expected @@ -1,7 +1,7 @@ PsiJetFileStubImpl[package=] PACKAGE_DIRECTIVE IMPORT_LIST - CLASS[fqName=A, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=A, superNames=[]] + CLASS[classId=/A, 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 d1cb5c93412..a0175bef642 100644 --- a/idea/testData/stubs/AnonymousObject.expected +++ b/idea/testData/stubs/AnonymousObject.expected @@ -1,10 +1,10 @@ PsiJetFileStubImpl[package=] PACKAGE_DIRECTIVE IMPORT_LIST - 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=[]] + CLASS[classId=/A, fqName=A, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=A, superNames=[]] + CLASS[classId=/T, 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]] + OBJECT_DECLARATION[classId=null, fqName=null, isCompanion=false, isLocal=true, isObjectLiteral=true, isTopLevel=false, name=null, superNames=[A, T]] SUPER_TYPE_LIST SUPER_TYPE_CALL_ENTRY CONSTRUCTOR_CALLEE diff --git a/idea/testData/stubs/ClassObject.expected b/idea/testData/stubs/ClassObject.expected index 4f1f07aa746..cd5ab342ee5 100644 --- a/idea/testData/stubs/ClassObject.expected +++ b/idea/testData/stubs/ClassObject.expected @@ -1,16 +1,16 @@ PsiJetFileStubImpl[package=] PACKAGE_DIRECTIVE IMPORT_LIST - CLASS[fqName=C, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=C, superNames=[]] + CLASS[classId=/C, 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=[]] + OBJECT_DECLARATION[classId=/C.Companion, fqName=C.Companion, isCompanion=true, isLocal=false, isObjectLiteral=false, isTopLevel=false, name=Companion, superNames=[]] MODIFIER_LIST[companion] CLASS_BODY FUN[fqName=C.Companion.foo, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isTopLevel=false, mayHaveContract=false, name=foo] VALUE_PARAMETER_LIST - CLASS[fqName=D, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=D, superNames=[]] + CLASS[classId=/D, fqName=D, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=D, superNames=[]] CLASS_BODY - OBJECT_DECLARATION[fqName=D.Named, isCompanion=true, isLocal=false, isObjectLiteral=false, isTopLevel=false, name=Named, superNames=[]] + OBJECT_DECLARATION[classId=/D.Named, fqName=D.Named, isCompanion=true, isLocal=false, isObjectLiteral=false, isTopLevel=false, name=Named, superNames=[]] MODIFIER_LIST[companion] CLASS_BODY PROPERTY[fqName=D.Named.c, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=false, isTopLevel=false, isVar=false, name=c] diff --git a/idea/testData/stubs/ClassProperty.expected b/idea/testData/stubs/ClassProperty.expected index 5d48d564ca7..5f87e007ec1 100644 --- a/idea/testData/stubs/ClassProperty.expected +++ b/idea/testData/stubs/ClassProperty.expected @@ -1,7 +1,7 @@ PsiJetFileStubImpl[package=] PACKAGE_DIRECTIVE IMPORT_LIST - CLASS[fqName=More, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=More, superNames=[]] + CLASS[classId=/More, 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 a53a9f819e0..61e9993aaec 100644 --- a/idea/testData/stubs/ClassTypeParameters.expected +++ b/idea/testData/stubs/ClassTypeParameters.expected @@ -1,7 +1,7 @@ PsiJetFileStubImpl[package=] PACKAGE_DIRECTIVE IMPORT_LIST - CLASS[fqName=C, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=C, superNames=[]] + CLASS[classId=/C, 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/Const.expected b/idea/testData/stubs/Const.expected index 1ae0d7e36b8..31ccac84806 100644 --- a/idea/testData/stubs/Const.expected +++ b/idea/testData/stubs/Const.expected @@ -2,7 +2,7 @@ PsiJetFileStubImpl[package=test] PACKAGE_DIRECTIVE REFERENCE_EXPRESSION[referencedName=test] IMPORT_LIST - OBJECT_DECLARATION[fqName=test.Const, isCompanion=false, isLocal=false, isObjectLiteral=false, isTopLevel=true, name=Const, superNames=[]] + OBJECT_DECLARATION[classId=test/Const, fqName=test.Const, isCompanion=false, isLocal=false, isObjectLiteral=false, isTopLevel=true, name=Const, superNames=[]] CLASS_BODY PROPERTY[fqName=test.Const.inObject, hasDelegate=false, hasDelegateExpression=false, hasInitializer=true, hasReturnTypeRef=false, isExtension=false, isTopLevel=false, isVar=false, name=inObject] MODIFIER_LIST[private const] diff --git a/idea/testData/stubs/DanglingAnnotations.expected b/idea/testData/stubs/DanglingAnnotations.expected index b61a18dc083..021585a4d29 100644 --- a/idea/testData/stubs/DanglingAnnotations.expected +++ b/idea/testData/stubs/DanglingAnnotations.expected @@ -1,7 +1,7 @@ PsiJetFileStubImpl[package=] PACKAGE_DIRECTIVE IMPORT_LIST - CLASS[fqName=C, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=C, superNames=[]] + CLASS[classId=/C, fqName=C, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=C, superNames=[]] CLASS_BODY MODIFIER_LIST[] ANNOTATION diff --git a/idea/testData/stubs/DynamicType.expected b/idea/testData/stubs/DynamicType.expected index 438ffb82477..92e58cbe6a9 100644 --- a/idea/testData/stubs/DynamicType.expected +++ b/idea/testData/stubs/DynamicType.expected @@ -27,7 +27,7 @@ PsiJetFileStubImpl[package=] REFERENCE_EXPRESSION[referencedName=A] NULLABLE_TYPE DYNAMIC_TYPE - CLASS[fqName=A, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=A, superNames=[]] + CLASS[classId=/A, fqName=A, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=A, superNames=[]] MODIFIER_LIST[annotation] ANNOTATION_ENTRY[hasValueArguments=true, shortName=Target] CONSTRUCTOR_CALLEE diff --git a/idea/testData/stubs/FunctionInNotNamedObject.expected b/idea/testData/stubs/FunctionInNotNamedObject.expected index 254921d9dcd..8f51094f95d 100644 --- a/idea/testData/stubs/FunctionInNotNamedObject.expected +++ b/idea/testData/stubs/FunctionInNotNamedObject.expected @@ -1,7 +1,7 @@ PsiJetFileStubImpl[package=] PACKAGE_DIRECTIVE IMPORT_LIST - OBJECT_DECLARATION[fqName=, isCompanion=false, isLocal=false, isObjectLiteral=false, isTopLevel=true, name=null, superNames=[]] + OBJECT_DECLARATION[classId=/, fqName=, isCompanion=false, isLocal=false, isObjectLiteral=false, isTopLevel=true, name=null, superNames=[]] CLASS_BODY FUN[fqName=null, hasBlockBody=false, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isTopLevel=false, mayHaveContract=false, name=testing] VALUE_PARAMETER_LIST diff --git a/idea/testData/stubs/InnerClass.expected b/idea/testData/stubs/InnerClass.expected index 5cdbb0f9554..50010e508b0 100644 --- a/idea/testData/stubs/InnerClass.expected +++ b/idea/testData/stubs/InnerClass.expected @@ -1,8 +1,8 @@ PsiJetFileStubImpl[package=] PACKAGE_DIRECTIVE IMPORT_LIST - CLASS[fqName=A, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=A, superNames=[]] + CLASS[classId=/A, fqName=A, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=A, superNames=[]] CLASS_BODY - CLASS[fqName=A.B, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=B, superNames=[]] + CLASS[classId=/A.B, 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/InnerClassInEnumEntry.expected b/idea/testData/stubs/InnerClassInEnumEntry.expected new file mode 100644 index 00000000000..aecf90bc785 --- /dev/null +++ b/idea/testData/stubs/InnerClassInEnumEntry.expected @@ -0,0 +1,10 @@ +PsiJetFileStubImpl[package=] + PACKAGE_DIRECTIVE + IMPORT_LIST + CLASS[classId=/Enum, fqName=Enum, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=Enum, superNames=[]] + MODIFIER_LIST[enum] + CLASS_BODY + ENUM_ENTRY[classId=null, fqName=Enum.ENTRY, isEnumEntry=true, isInterface=false, isLocal=false, isTopLevel=false, name=ENTRY, superNames=[]] + CLASS_BODY + CLASS[classId=null, fqName=Enum.ENTRY.InnerClass, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=InnerClass, superNames=[]] + MODIFIER_LIST[inner] diff --git a/idea/testData/stubs/InnerClassInEnumEntry.kt b/idea/testData/stubs/InnerClassInEnumEntry.kt new file mode 100644 index 00000000000..2e0b47d73d7 --- /dev/null +++ b/idea/testData/stubs/InnerClassInEnumEntry.kt @@ -0,0 +1,5 @@ +enum class Enum { + ENTRY { + inner class InnerClass + } +} \ No newline at end of file diff --git a/idea/testData/stubs/LocalClass.expected b/idea/testData/stubs/LocalClass.expected index fb16279d34b..aa248385ac0 100644 --- a/idea/testData/stubs/LocalClass.expected +++ b/idea/testData/stubs/LocalClass.expected @@ -1,11 +1,11 @@ PsiJetFileStubImpl[package=] PACKAGE_DIRECTIVE IMPORT_LIST - 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=[]] + CLASS[classId=/A, fqName=A, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=A, superNames=[]] + CLASS[classId=/T, 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, mayHaveContract=false, name=foo] VALUE_PARAMETER_LIST - CLASS[fqName=null, isEnumEntry=false, isInterface=false, isLocal=true, isTopLevel=false, name=Test, superNames=[A, T]] + CLASS[classId=null, fqName=null, isEnumEntry=false, isInterface=false, isLocal=true, isTopLevel=false, name=Test, superNames=[A, T]] SUPER_TYPE_LIST SUPER_TYPE_CALL_ENTRY CONSTRUCTOR_CALLEE diff --git a/idea/testData/stubs/LocalClassInLocalFunction.expected b/idea/testData/stubs/LocalClassInLocalFunction.expected index adca93a1faf..570ad6a0951 100644 --- a/idea/testData/stubs/LocalClassInLocalFunction.expected +++ b/idea/testData/stubs/LocalClassInLocalFunction.expected @@ -1,13 +1,13 @@ PsiJetFileStubImpl[package=] PACKAGE_DIRECTIVE IMPORT_LIST - 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=[]] + CLASS[classId=/A, fqName=A, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=A, superNames=[]] + CLASS[classId=/T, 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, mayHaveContract=false, name=foo] VALUE_PARAMETER_LIST FUN[fqName=null, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isTopLevel=false, mayHaveContract=false, name=bar] VALUE_PARAMETER_LIST - CLASS[fqName=null, isEnumEntry=false, isInterface=false, isLocal=true, isTopLevel=false, name=Test, superNames=[A, T]] + CLASS[classId=null, fqName=null, isEnumEntry=false, isInterface=false, isLocal=true, isTopLevel=false, name=Test, superNames=[A, T]] SUPER_TYPE_LIST SUPER_TYPE_CALL_ENTRY CONSTRUCTOR_CALLEE diff --git a/idea/testData/stubs/LocalNamedObject.expected b/idea/testData/stubs/LocalNamedObject.expected index 366322a9046..8531264a60a 100644 --- a/idea/testData/stubs/LocalNamedObject.expected +++ b/idea/testData/stubs/LocalNamedObject.expected @@ -1,11 +1,11 @@ PsiJetFileStubImpl[package=] PACKAGE_DIRECTIVE IMPORT_LIST - 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=[]] + CLASS[classId=/A, fqName=A, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=A, superNames=[]] + CLASS[classId=/T, 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, mayHaveContract=false, name=foo] VALUE_PARAMETER_LIST - OBJECT_DECLARATION[fqName=null, isCompanion=false, isLocal=true, isObjectLiteral=false, isTopLevel=false, name=O, superNames=[A, T]] + OBJECT_DECLARATION[classId=null, fqName=null, isCompanion=false, isLocal=true, isObjectLiteral=false, isTopLevel=false, name=O, superNames=[A, T]] SUPER_TYPE_LIST SUPER_TYPE_CALL_ENTRY CONSTRUCTOR_CALLEE diff --git a/idea/testData/stubs/MembersInLocalClass.expected b/idea/testData/stubs/MembersInLocalClass.expected index d6970a24b91..3fa63025295 100644 --- a/idea/testData/stubs/MembersInLocalClass.expected +++ b/idea/testData/stubs/MembersInLocalClass.expected @@ -3,7 +3,7 @@ PsiJetFileStubImpl[package=] IMPORT_LIST FUN[fqName=f, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isTopLevel=true, mayHaveContract=false, name=f] MODIFIER_LIST[public] - CLASS[fqName=null, isEnumEntry=false, isInterface=false, isLocal=true, isTopLevel=false, name=C, superNames=[]] + CLASS[classId=null, 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, mayHaveContract=false, name=f] VALUE_PARAMETER_LIST diff --git a/idea/testData/stubs/MembersInLocalObject.expected b/idea/testData/stubs/MembersInLocalObject.expected index 861a77625f7..db77e164de2 100644 --- a/idea/testData/stubs/MembersInLocalObject.expected +++ b/idea/testData/stubs/MembersInLocalObject.expected @@ -3,7 +3,7 @@ PsiJetFileStubImpl[package=] IMPORT_LIST FUN[fqName=f, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isTopLevel=true, mayHaveContract=false, name=f] VALUE_PARAMETER_LIST - OBJECT_DECLARATION[fqName=null, isCompanion=false, isLocal=true, isObjectLiteral=false, isTopLevel=false, name=foo, superNames=[]] + OBJECT_DECLARATION[classId=null, fqName=null, isCompanion=false, isLocal=true, isObjectLiteral=false, isTopLevel=false, name=foo, superNames=[]] CLASS_BODY FUN[fqName=null, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isTopLevel=false, mayHaveContract=false, name=foo] VALUE_PARAMETER_LIST diff --git a/idea/testData/stubs/NamedObject.expected b/idea/testData/stubs/NamedObject.expected index a633441cc33..536e94255b0 100644 --- a/idea/testData/stubs/NamedObject.expected +++ b/idea/testData/stubs/NamedObject.expected @@ -1,9 +1,9 @@ PsiJetFileStubImpl[package=] PACKAGE_DIRECTIVE IMPORT_LIST - 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]] + CLASS[classId=/A, fqName=A, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=A, superNames=[]] + CLASS[classId=/T, fqName=T, isEnumEntry=false, isInterface=true, isLocal=false, isTopLevel=true, name=T, superNames=[]] + OBJECT_DECLARATION[classId=/Test, fqName=Test, isCompanion=false, isLocal=false, isObjectLiteral=false, isTopLevel=true, name=Test, superNames=[A, T]] SUPER_TYPE_LIST SUPER_TYPE_CALL_ENTRY CONSTRUCTOR_CALLEE diff --git a/idea/testData/stubs/NotStorePropertiesFrom.expected b/idea/testData/stubs/NotStorePropertiesFrom.expected index 95c7d5db633..56a08bbd17e 100644 --- a/idea/testData/stubs/NotStorePropertiesFrom.expected +++ b/idea/testData/stubs/NotStorePropertiesFrom.expected @@ -1,7 +1,7 @@ PsiJetFileStubImpl[package=] PACKAGE_DIRECTIVE IMPORT_LIST - CLASS[fqName=Test, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=Test, superNames=[]] + CLASS[classId=/Test, 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/ObjectInInitializer.expected b/idea/testData/stubs/ObjectInInitializer.expected index 8dcc21cda00..7c8e8f76f3b 100644 --- a/idea/testData/stubs/ObjectInInitializer.expected +++ b/idea/testData/stubs/ObjectInInitializer.expected @@ -2,7 +2,7 @@ PsiJetFileStubImpl[package=] PACKAGE_DIRECTIVE IMPORT_LIST PROPERTY[fqName=p, hasDelegate=false, hasDelegateExpression=false, hasInitializer=true, hasReturnTypeRef=false, isExtension=false, isTopLevel=true, isVar=false, name=p] - OBJECT_DECLARATION[fqName=null, isCompanion=false, isLocal=true, isObjectLiteral=true, isTopLevel=false, name=null, superNames=[]] + OBJECT_DECLARATION[classId=null, fqName=null, isCompanion=false, isLocal=true, isObjectLiteral=true, isTopLevel=false, name=null, superNames=[]] CLASS_BODY FUN[fqName=null, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isTopLevel=false, mayHaveContract=false, name=f] VALUE_PARAMETER_LIST diff --git a/idea/testData/stubs/ObjectInPropertyDelegate.expected b/idea/testData/stubs/ObjectInPropertyDelegate.expected index 3bc016a06a7..20aded4fb54 100644 --- a/idea/testData/stubs/ObjectInPropertyDelegate.expected +++ b/idea/testData/stubs/ObjectInPropertyDelegate.expected @@ -2,7 +2,7 @@ PsiJetFileStubImpl[package=] PACKAGE_DIRECTIVE IMPORT_LIST PROPERTY[fqName=p, hasDelegate=true, hasDelegateExpression=true, hasInitializer=false, hasReturnTypeRef=false, isExtension=false, isTopLevel=true, isVar=false, name=p] - OBJECT_DECLARATION[fqName=null, isCompanion=false, isLocal=true, isObjectLiteral=true, isTopLevel=false, name=null, superNames=[]] + OBJECT_DECLARATION[classId=null, fqName=null, isCompanion=false, isLocal=true, isObjectLiteral=true, isTopLevel=false, name=null, superNames=[]] CLASS_BODY FUN[fqName=null, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isTopLevel=false, mayHaveContract=false, name=f] VALUE_PARAMETER_LIST diff --git a/idea/testData/stubs/ParametersWithFqName.expected b/idea/testData/stubs/ParametersWithFqName.expected index 83c5f13d4da..514bf5c61f5 100644 --- a/idea/testData/stubs/ParametersWithFqName.expected +++ b/idea/testData/stubs/ParametersWithFqName.expected @@ -2,7 +2,7 @@ PsiJetFileStubImpl[package=test] PACKAGE_DIRECTIVE REFERENCE_EXPRESSION[referencedName=test] IMPORT_LIST - CLASS[fqName=test.A, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=A, superNames=[]] + CLASS[classId=test/A, 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, hasValOrVar=true, isMutable=false, name=b] diff --git a/idea/testData/stubs/SecondaryConstructors.expected b/idea/testData/stubs/SecondaryConstructors.expected index de102dd0eff..e646468e1e6 100644 --- a/idea/testData/stubs/SecondaryConstructors.expected +++ b/idea/testData/stubs/SecondaryConstructors.expected @@ -2,7 +2,7 @@ PsiJetFileStubImpl[package=test] PACKAGE_DIRECTIVE REFERENCE_EXPRESSION[referencedName=test] IMPORT_LIST - CLASS[fqName=test.SecondaryConstructors, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=SecondaryConstructors, superNames=[]] + CLASS[classId=test/SecondaryConstructors, 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, hasValOrVar=false, isMutable=false, name=x] @@ -31,7 +31,7 @@ PsiJetFileStubImpl[package=test] TYPE_REFERENCE USER_TYPE REFERENCE_EXPRESSION[referencedName=Int] - CLASS[fqName=test.SecondaryConstructors.Inner, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=Inner, superNames=[]] + CLASS[classId=test/SecondaryConstructors.Inner, 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] @@ -59,7 +59,7 @@ PsiJetFileStubImpl[package=test] TYPE_REFERENCE USER_TYPE REFERENCE_EXPRESSION[referencedName=G] - CLASS[fqName=test.SecondaryConstructors.Nested, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=Nested, superNames=[]] + CLASS[classId=test/SecondaryConstructors.Nested, fqName=test.SecondaryConstructors.Nested, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=Nested, superNames=[]] CLASS_BODY SECONDARY_CONSTRUCTOR MODIFIER_LIST[] @@ -76,5 +76,5 @@ PsiJetFileStubImpl[package=test] SECONDARY_CONSTRUCTOR MODIFIER_LIST[internal] VALUE_PARAMETER_LIST - CLASS[fqName=test.anno, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=anno, superNames=[]] + CLASS[classId=test/anno, 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 cfdfaf3a9c0..b1fe93cbd8b 100644 --- a/idea/testData/stubs/SimpleEnumBuild.expected +++ b/idea/testData/stubs/SimpleEnumBuild.expected @@ -1,8 +1,8 @@ PsiJetFileStubImpl[package=] PACKAGE_DIRECTIVE IMPORT_LIST - CLASS[fqName=Test, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=Test, superNames=[]] + CLASS[classId=/Test, 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, 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=[]] + ENUM_ENTRY[classId=null, fqName=Test.First, isEnumEntry=true, isInterface=false, isLocal=false, isTopLevel=false, name=First, superNames=[]] + ENUM_ENTRY[classId=null, fqName=Test.Second, isEnumEntry=true, isInterface=false, isLocal=false, isTopLevel=false, name=Second, superNames=[]] diff --git a/idea/testData/stubs/TypeAnnotation.expected b/idea/testData/stubs/TypeAnnotation.expected index 01abc1b0027..17dfa14f286 100644 --- a/idea/testData/stubs/TypeAnnotation.expected +++ b/idea/testData/stubs/TypeAnnotation.expected @@ -1,9 +1,9 @@ PsiJetFileStubImpl[package=] PACKAGE_DIRECTIVE IMPORT_LIST - CLASS[fqName=a, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=a, superNames=[]] + CLASS[classId=/a, fqName=a, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=a, superNames=[]] MODIFIER_LIST[annotation] - CLASS[fqName=b, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=b, superNames=[]] + CLASS[classId=/b, fqName=b, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=b, superNames=[]] MODIFIER_LIST[annotation] PRIMARY_CONSTRUCTOR VALUE_PARAMETER_LIST @@ -11,11 +11,11 @@ PsiJetFileStubImpl[package=] TYPE_REFERENCE USER_TYPE REFERENCE_EXPRESSION[referencedName=E] - CLASS[fqName=E, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=E, superNames=[]] + CLASS[classId=/E, fqName=E, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=E, superNames=[]] MODIFIER_LIST[enum] CLASS_BODY - ENUM_ENTRY[fqName=E.E1, isEnumEntry=true, isInterface=false, isLocal=false, isTopLevel=false, name=E1, superNames=[]] - ENUM_ENTRY[fqName=E.E2, isEnumEntry=true, isInterface=false, isLocal=false, isTopLevel=false, name=E2, superNames=[]] + ENUM_ENTRY[classId=null, fqName=E.E1, isEnumEntry=true, isInterface=false, isLocal=false, isTopLevel=false, name=E1, superNames=[]] + ENUM_ENTRY[classId=null, fqName=E.E2, isEnumEntry=true, isInterface=false, isLocal=false, isTopLevel=false, name=E2, superNames=[]] FUN[fqName=types, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isTopLevel=true, mayHaveContract=false, name=types] VALUE_PARAMETER_LIST VALUE_PARAMETER[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=param] diff --git a/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClsStubBuilderTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClsStubBuilderTestGenerated.java index 9805f510860..eb27e70a44e 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClsStubBuilderTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClsStubBuilderTestGenerated.java @@ -129,6 +129,11 @@ public class ClsStubBuilderTestGenerated extends AbstractClsStubBuilderTest { runTest("idea/testData/decompiler/stubBuilder/InheritingClasses/"); } + @TestMetadata("InnerClassEnumEntry") + public void testInnerClassEnumEntry() throws Exception { + runTest("idea/testData/decompiler/stubBuilder/InnerClassEnumEntry/"); + } + @TestMetadata("InnerTypes") public void testInnerTypes() throws Exception { runTest("idea/testData/decompiler/stubBuilder/InnerTypes/"); diff --git a/idea/tests/org/jetbrains/kotlin/idea/stubs/StubBuilderTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/stubs/StubBuilderTestGenerated.java index 268eaf90192..101a67da084 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/stubs/StubBuilderTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/stubs/StubBuilderTestGenerated.java @@ -124,6 +124,11 @@ public class StubBuilderTestGenerated extends AbstractStubBuilderTest { runTest("idea/testData/stubs/InnerClass.kt"); } + @TestMetadata("InnerClassInEnumEntry.kt") + public void testInnerClassInEnumEntry() throws Exception { + runTest("idea/testData/stubs/InnerClassInEnumEntry.kt"); + } + @TestMetadata("LocalClass.kt") public void testLocalClass() throws Exception { runTest("idea/testData/stubs/LocalClass.kt");