From 1e9764c6394861fcc55218a7c615a9a64cc23ce8 Mon Sep 17 00:00:00 2001 From: Ilya Kirillov Date: Mon, 20 Dec 2021 17:56:11 +0300 Subject: [PATCH] Move stub building from psi module to analysis module --- .../build.gradle.kts | 2 +- .../decompiler/stub/file}/ClsClassFinder.kt | 2 +- .../stub/file}/ClsKotlinBinaryClassCache.kt | 7 +- .../stub/file}/DirectoryBasedClassFinder.kt | 2 +- .../stub/file}/DirectoryBasedDataFinder.kt | 2 +- .../stub/file}/FileAttributeService.kt | 2 +- .../stub/file}/KotlinClsStubBuilder.kt | 4 +- .../AnnotatedFlexibleTypes.kt | 0 .../AnnotatedFlexibleTypes.txt | 0 .../AnnotatedFlexibleTypes/d/JavaClass.java | 0 .../AnnotatedParameterInEnumConstructor.kt | 0 .../AnnotatedParameterInEnumConstructor.txt | 0 ...notatedParameterInInnerClassConstructor.kt | 0 ...otatedParameterInInnerClassConstructor.txt | 0 .../AnnotationClass/AnnotationClass.kt | 0 .../AnnotationClass/AnnotationClass.txt | 0 .../AnnotationValues/AnnotationValues.kt | 0 .../AnnotationValues/AnnotationValues.txt | 0 .../Annotations/Annotations.kt | 0 .../Annotations/Annotations.txt | 0 .../AnnotationsOnNullableTypes.kt | 0 .../AnnotationsOnNullableTypes.txt | 0 .../AnnotationsOnParenthesizedTypes.kt | 0 .../AnnotationsOnParenthesizedTypes.txt | 0 .../AnonymousReturnWithGenericType.kt | 0 .../AnonymousReturnWithGenericType.txt | 0 .../ClassMembers/ClassMembers.kt | 0 .../ClassMembers/ClassMembers.txt | 0 .../ClassObject/ClassObject.kt | 0 .../ClassObject/ClassObject.txt | 0 .../clsFileStubBuilder/Const/Const.kt | 0 .../clsFileStubBuilder/Const/Const.txt | 0 .../clsFileStubBuilder/Contracts/Contracts.kt | 0 .../Contracts/Contracts.txt | 0 .../clsFileStubBuilder/DataClass/DataClass.kt | 0 .../DataClass/DataClass.txt | 0 .../Delegation/Delegation.kt | 0 .../Delegation/Delegation.txt | 0 .../DependencyOnNestedClasses/Dependency.kt | 0 .../DependencyOnNestedClasses.kt | 0 .../DependencyOnNestedClasses.txt | 0 .../testData/clsFileStubBuilder/Enum/Enum.kt | 0 .../testData/clsFileStubBuilder/Enum/Enum.txt | 0 .../FlexibleTypes/FlexibleTypes.kt | 0 .../FlexibleTypes/FlexibleTypes.txt | 0 .../clsFileStubBuilder/FlexibleTypes/ft.kt | 0 .../FunInterfaceDeclaration.kt | 0 .../FunInterfaceDeclaration.txt | 0 .../InheritingClasses/InheritingClasses.kt | 0 .../InheritingClasses/InheritingClasses.txt | 0 .../InnerClassEnumEntry.kt | 0 .../InnerClassEnumEntry.txt | 0 .../InnerTypes/InnerTypes.kt | 0 .../InnerTypes/InnerTypes.txt | 0 .../LocalClass/LocalClass.kt | 0 .../LocalClass/LocalClass.txt | 0 .../clsFileStubBuilder/Modifiers/Modifiers.kt | 0 .../Modifiers/Modifiers.txt | 0 .../MultifileClass/MultifileClass.kt | 0 .../MultifileClass/MultifileClass.txt | 0 .../MultifileClass/SecondPart.kt | 0 .../NamedCompanionObject.kt | 0 .../NamedCompanionObject.txt | 0 .../NestedClasses/NestedClasses.kt | 0 .../NestedClasses/NestedClasses.txt | 0 .../clsFileStubBuilder/Objects/Objects.kt | 0 .../clsFileStubBuilder/Objects/Objects.txt | 0 .../PrivateConstField/PrivateConstField.kt | 0 .../PrivateConstField/PrivateConstField.txt | 0 .../PrivateToThis/PrivateToThis.kt | 0 .../PrivateToThis/PrivateToThis.txt | 0 .../clsFileStubBuilder/Sealed/Sealed.kt | 0 .../clsFileStubBuilder/Sealed/Sealed.txt | 0 .../SecondaryConstructors.kt | 0 .../SecondaryConstructors.txt | 0 .../SuspendLambda/SuspendLambda.kt | 0 .../SuspendLambda/SuspendLambda.txt | 0 .../TopJvmPackageName/TopJvmPackageName.kt | 0 .../TopJvmPackageName/TopJvmPackageName.txt | 0 .../TopLevelMembersAnnotatedKt.txt | 0 .../TopLevelMembersAnnotatedKt/annotations.kt | 0 .../topLevelMembersAnnotated.kt | 0 .../TopLevelMembersKt/TopLevelMembers.kt | 0 .../TopLevelMembersKt/TopLevelMembersKt.txt | 0 .../TypeAliases/Dependency.kt | 0 .../TypeAliases/TypeAliases.kt | 0 .../TypeAliases/TypeAliases.txt | 0 .../TypeBoundsAndDelegationSpecifiers.kt | 0 .../TypeBoundsAndDelegationSpecifiers.txt | 0 .../TypeModifiers/TypeModifiers.kt | 0 .../TypeModifiers/TypeModifiers.txt | 0 .../TypeParams/TypeParams.kt | 0 .../TypeParams/TypeParams.txt | 0 .../clsFileStubBuilder/Types/Types.kt | 0 .../clsFileStubBuilder/Types/Types.txt | 0 .../stub/files}/AbstractClsStubBuilderTest.kt | 6 +- .../files/ClsStubBuilderTestGenerated.java | 272 ++++++++++++++++++ .../decompiler-to-psi/build.gradle.kts | 4 +- .../psi/DeserializerForClassfileDecompiler.kt | 11 +- .../psi/KotlinClassFileDecompiler.kt | 6 +- .../decompiler/psi/ResolverForDecompiler.kt | 2 +- .../text/buildDecompiledTextForClassFile.kt | 4 +- .../decompiler-to-stubs}/build.gradle.kts | 0 .../stub}/CallableClsStubBuilder.kt | 4 +- .../decompiler/stub}/ClassClsStubBuilder.kt | 4 +- .../decompiler/stub}/ClsStubBuilderContext.kt | 7 +- .../decompiler/stub}/TypeClsStubBuilder.kt | 3 +- .../decompiler/stub}/clsStubBuilding.kt | 4 +- .../analysis/decompiler/stub}/flags/flags.kt | 3 +- .../stub}/typeAliasClsStubBuilding.kt | 4 +- .../builder/ClsStubBuilderTestGenerated.java | 236 --------------- .../analysis-api-generator/build.gradle.kts | 1 + generators/build.gradle.kts | 1 - settings.gradle | 7 +- 114 files changed, 323 insertions(+), 277 deletions(-) rename {compiler/psi/cls-psi-file-stub-builder => analysis/decompiled/decompiler-to-file-stubs}/build.gradle.kts (89%) rename {compiler/psi/cls-psi-file-stub-builder/src/org/jetbrains/kotlin/psi/stubs/file/builder => analysis/decompiled/decompiler-to-file-stubs/src/org/jetbrains/kotlin/analysis/decompiler/stub/file}/ClsClassFinder.kt (97%) rename {compiler/psi/cls-psi-file-stub-builder/src/org/jetbrains/kotlin/psi/stubs/file/builder => analysis/decompiled/decompiler-to-file-stubs/src/org/jetbrains/kotlin/analysis/decompiler/stub/file}/ClsKotlinBinaryClassCache.kt (94%) rename {compiler/psi/cls-psi-file-stub-builder/src/org/jetbrains/kotlin/psi/stubs/file/builder => analysis/decompiled/decompiler-to-file-stubs/src/org/jetbrains/kotlin/analysis/decompiler/stub/file}/DirectoryBasedClassFinder.kt (97%) rename {compiler/psi/cls-psi-file-stub-builder/src/org/jetbrains/kotlin/psi/stubs/file/builder => analysis/decompiled/decompiler-to-file-stubs/src/org/jetbrains/kotlin/analysis/decompiler/stub/file}/DirectoryBasedDataFinder.kt (96%) rename {compiler/psi/cls-psi-file-stub-builder/src/org/jetbrains/kotlin/psi/stubs/file/builder => analysis/decompiled/decompiler-to-file-stubs/src/org/jetbrains/kotlin/analysis/decompiler/stub/file}/FileAttributeService.kt (95%) rename {compiler/psi/cls-psi-file-stub-builder/src/org/jetbrains/kotlin/psi/stubs/file/builder => analysis/decompiled/decompiler-to-file-stubs/src/org/jetbrains/kotlin/analysis/decompiler/stub/file}/KotlinClsStubBuilder.kt (98%) rename {compiler/psi/cls-psi-file-stub-builder => analysis/decompiled/decompiler-to-file-stubs}/testData/clsFileStubBuilder/AnnotatedFlexibleTypes/AnnotatedFlexibleTypes.kt (100%) rename {compiler/psi/cls-psi-file-stub-builder => analysis/decompiled/decompiler-to-file-stubs}/testData/clsFileStubBuilder/AnnotatedFlexibleTypes/AnnotatedFlexibleTypes.txt (100%) rename {compiler/psi/cls-psi-file-stub-builder => analysis/decompiled/decompiler-to-file-stubs}/testData/clsFileStubBuilder/AnnotatedFlexibleTypes/d/JavaClass.java (100%) rename {compiler/psi/cls-psi-file-stub-builder => analysis/decompiled/decompiler-to-file-stubs}/testData/clsFileStubBuilder/AnnotatedParameterInEnumConstructor/AnnotatedParameterInEnumConstructor.kt (100%) rename {compiler/psi/cls-psi-file-stub-builder => analysis/decompiled/decompiler-to-file-stubs}/testData/clsFileStubBuilder/AnnotatedParameterInEnumConstructor/AnnotatedParameterInEnumConstructor.txt (100%) rename {compiler/psi/cls-psi-file-stub-builder => analysis/decompiled/decompiler-to-file-stubs}/testData/clsFileStubBuilder/AnnotatedParameterInInnerClassConstructor/AnnotatedParameterInInnerClassConstructor.kt (100%) rename {compiler/psi/cls-psi-file-stub-builder => analysis/decompiled/decompiler-to-file-stubs}/testData/clsFileStubBuilder/AnnotatedParameterInInnerClassConstructor/AnnotatedParameterInInnerClassConstructor.txt (100%) rename {compiler/psi/cls-psi-file-stub-builder => analysis/decompiled/decompiler-to-file-stubs}/testData/clsFileStubBuilder/AnnotationClass/AnnotationClass.kt (100%) rename {compiler/psi/cls-psi-file-stub-builder => analysis/decompiled/decompiler-to-file-stubs}/testData/clsFileStubBuilder/AnnotationClass/AnnotationClass.txt (100%) rename {compiler/psi/cls-psi-file-stub-builder => analysis/decompiled/decompiler-to-file-stubs}/testData/clsFileStubBuilder/AnnotationValues/AnnotationValues.kt (100%) rename {compiler/psi/cls-psi-file-stub-builder => analysis/decompiled/decompiler-to-file-stubs}/testData/clsFileStubBuilder/AnnotationValues/AnnotationValues.txt (100%) rename {compiler/psi/cls-psi-file-stub-builder => analysis/decompiled/decompiler-to-file-stubs}/testData/clsFileStubBuilder/Annotations/Annotations.kt (100%) rename {compiler/psi/cls-psi-file-stub-builder => analysis/decompiled/decompiler-to-file-stubs}/testData/clsFileStubBuilder/Annotations/Annotations.txt (100%) rename {compiler/psi/cls-psi-file-stub-builder => analysis/decompiled/decompiler-to-file-stubs}/testData/clsFileStubBuilder/AnnotationsOnNullableTypes/AnnotationsOnNullableTypes.kt (100%) rename {compiler/psi/cls-psi-file-stub-builder => analysis/decompiled/decompiler-to-file-stubs}/testData/clsFileStubBuilder/AnnotationsOnNullableTypes/AnnotationsOnNullableTypes.txt (100%) rename {compiler/psi/cls-psi-file-stub-builder => analysis/decompiled/decompiler-to-file-stubs}/testData/clsFileStubBuilder/AnnotationsOnParenthesizedTypes/AnnotationsOnParenthesizedTypes.kt (100%) rename {compiler/psi/cls-psi-file-stub-builder => analysis/decompiled/decompiler-to-file-stubs}/testData/clsFileStubBuilder/AnnotationsOnParenthesizedTypes/AnnotationsOnParenthesizedTypes.txt (100%) rename {compiler/psi/cls-psi-file-stub-builder => analysis/decompiled/decompiler-to-file-stubs}/testData/clsFileStubBuilder/AnonymousReturnWithGenericType/AnonymousReturnWithGenericType.kt (100%) rename {compiler/psi/cls-psi-file-stub-builder => analysis/decompiled/decompiler-to-file-stubs}/testData/clsFileStubBuilder/AnonymousReturnWithGenericType/AnonymousReturnWithGenericType.txt (100%) rename {compiler/psi/cls-psi-file-stub-builder => analysis/decompiled/decompiler-to-file-stubs}/testData/clsFileStubBuilder/ClassMembers/ClassMembers.kt (100%) rename {compiler/psi/cls-psi-file-stub-builder => analysis/decompiled/decompiler-to-file-stubs}/testData/clsFileStubBuilder/ClassMembers/ClassMembers.txt (100%) rename {compiler/psi/cls-psi-file-stub-builder => analysis/decompiled/decompiler-to-file-stubs}/testData/clsFileStubBuilder/ClassObject/ClassObject.kt (100%) rename {compiler/psi/cls-psi-file-stub-builder => analysis/decompiled/decompiler-to-file-stubs}/testData/clsFileStubBuilder/ClassObject/ClassObject.txt (100%) rename {compiler/psi/cls-psi-file-stub-builder => analysis/decompiled/decompiler-to-file-stubs}/testData/clsFileStubBuilder/Const/Const.kt (100%) rename {compiler/psi/cls-psi-file-stub-builder => analysis/decompiled/decompiler-to-file-stubs}/testData/clsFileStubBuilder/Const/Const.txt (100%) rename {compiler/psi/cls-psi-file-stub-builder => analysis/decompiled/decompiler-to-file-stubs}/testData/clsFileStubBuilder/Contracts/Contracts.kt (100%) rename {compiler/psi/cls-psi-file-stub-builder => analysis/decompiled/decompiler-to-file-stubs}/testData/clsFileStubBuilder/Contracts/Contracts.txt (100%) rename {compiler/psi/cls-psi-file-stub-builder => analysis/decompiled/decompiler-to-file-stubs}/testData/clsFileStubBuilder/DataClass/DataClass.kt (100%) rename {compiler/psi/cls-psi-file-stub-builder => analysis/decompiled/decompiler-to-file-stubs}/testData/clsFileStubBuilder/DataClass/DataClass.txt (100%) rename {compiler/psi/cls-psi-file-stub-builder => analysis/decompiled/decompiler-to-file-stubs}/testData/clsFileStubBuilder/Delegation/Delegation.kt (100%) rename {compiler/psi/cls-psi-file-stub-builder => analysis/decompiled/decompiler-to-file-stubs}/testData/clsFileStubBuilder/Delegation/Delegation.txt (100%) rename {compiler/psi/cls-psi-file-stub-builder => analysis/decompiled/decompiler-to-file-stubs}/testData/clsFileStubBuilder/DependencyOnNestedClasses/Dependency.kt (100%) rename {compiler/psi/cls-psi-file-stub-builder => analysis/decompiled/decompiler-to-file-stubs}/testData/clsFileStubBuilder/DependencyOnNestedClasses/DependencyOnNestedClasses.kt (100%) rename {compiler/psi/cls-psi-file-stub-builder => analysis/decompiled/decompiler-to-file-stubs}/testData/clsFileStubBuilder/DependencyOnNestedClasses/DependencyOnNestedClasses.txt (100%) rename {compiler/psi/cls-psi-file-stub-builder => analysis/decompiled/decompiler-to-file-stubs}/testData/clsFileStubBuilder/Enum/Enum.kt (100%) rename {compiler/psi/cls-psi-file-stub-builder => analysis/decompiled/decompiler-to-file-stubs}/testData/clsFileStubBuilder/Enum/Enum.txt (100%) rename {compiler/psi/cls-psi-file-stub-builder => analysis/decompiled/decompiler-to-file-stubs}/testData/clsFileStubBuilder/FlexibleTypes/FlexibleTypes.kt (100%) rename {compiler/psi/cls-psi-file-stub-builder => analysis/decompiled/decompiler-to-file-stubs}/testData/clsFileStubBuilder/FlexibleTypes/FlexibleTypes.txt (100%) rename {compiler/psi/cls-psi-file-stub-builder => analysis/decompiled/decompiler-to-file-stubs}/testData/clsFileStubBuilder/FlexibleTypes/ft.kt (100%) rename {compiler/psi/cls-psi-file-stub-builder => analysis/decompiled/decompiler-to-file-stubs}/testData/clsFileStubBuilder/FunInterfaceDeclaration/FunInterfaceDeclaration.kt (100%) rename {compiler/psi/cls-psi-file-stub-builder => analysis/decompiled/decompiler-to-file-stubs}/testData/clsFileStubBuilder/FunInterfaceDeclaration/FunInterfaceDeclaration.txt (100%) rename {compiler/psi/cls-psi-file-stub-builder => analysis/decompiled/decompiler-to-file-stubs}/testData/clsFileStubBuilder/InheritingClasses/InheritingClasses.kt (100%) rename {compiler/psi/cls-psi-file-stub-builder => analysis/decompiled/decompiler-to-file-stubs}/testData/clsFileStubBuilder/InheritingClasses/InheritingClasses.txt (100%) rename {compiler/psi/cls-psi-file-stub-builder => analysis/decompiled/decompiler-to-file-stubs}/testData/clsFileStubBuilder/InnerClassEnumEntry/InnerClassEnumEntry.kt (100%) rename {compiler/psi/cls-psi-file-stub-builder => analysis/decompiled/decompiler-to-file-stubs}/testData/clsFileStubBuilder/InnerClassEnumEntry/InnerClassEnumEntry.txt (100%) rename {compiler/psi/cls-psi-file-stub-builder => analysis/decompiled/decompiler-to-file-stubs}/testData/clsFileStubBuilder/InnerTypes/InnerTypes.kt (100%) rename {compiler/psi/cls-psi-file-stub-builder => analysis/decompiled/decompiler-to-file-stubs}/testData/clsFileStubBuilder/InnerTypes/InnerTypes.txt (100%) rename {compiler/psi/cls-psi-file-stub-builder => analysis/decompiled/decompiler-to-file-stubs}/testData/clsFileStubBuilder/LocalClass/LocalClass.kt (100%) rename {compiler/psi/cls-psi-file-stub-builder => analysis/decompiled/decompiler-to-file-stubs}/testData/clsFileStubBuilder/LocalClass/LocalClass.txt (100%) rename {compiler/psi/cls-psi-file-stub-builder => analysis/decompiled/decompiler-to-file-stubs}/testData/clsFileStubBuilder/Modifiers/Modifiers.kt (100%) rename {compiler/psi/cls-psi-file-stub-builder => analysis/decompiled/decompiler-to-file-stubs}/testData/clsFileStubBuilder/Modifiers/Modifiers.txt (100%) rename {compiler/psi/cls-psi-file-stub-builder => analysis/decompiled/decompiler-to-file-stubs}/testData/clsFileStubBuilder/MultifileClass/MultifileClass.kt (100%) rename {compiler/psi/cls-psi-file-stub-builder => analysis/decompiled/decompiler-to-file-stubs}/testData/clsFileStubBuilder/MultifileClass/MultifileClass.txt (100%) rename {compiler/psi/cls-psi-file-stub-builder => analysis/decompiled/decompiler-to-file-stubs}/testData/clsFileStubBuilder/MultifileClass/SecondPart.kt (100%) rename {compiler/psi/cls-psi-file-stub-builder => analysis/decompiled/decompiler-to-file-stubs}/testData/clsFileStubBuilder/NamedCompanionObject/NamedCompanionObject.kt (100%) rename {compiler/psi/cls-psi-file-stub-builder => analysis/decompiled/decompiler-to-file-stubs}/testData/clsFileStubBuilder/NamedCompanionObject/NamedCompanionObject.txt (100%) rename {compiler/psi/cls-psi-file-stub-builder => analysis/decompiled/decompiler-to-file-stubs}/testData/clsFileStubBuilder/NestedClasses/NestedClasses.kt (100%) rename {compiler/psi/cls-psi-file-stub-builder => analysis/decompiled/decompiler-to-file-stubs}/testData/clsFileStubBuilder/NestedClasses/NestedClasses.txt (100%) rename {compiler/psi/cls-psi-file-stub-builder => analysis/decompiled/decompiler-to-file-stubs}/testData/clsFileStubBuilder/Objects/Objects.kt (100%) rename {compiler/psi/cls-psi-file-stub-builder => analysis/decompiled/decompiler-to-file-stubs}/testData/clsFileStubBuilder/Objects/Objects.txt (100%) rename {compiler/psi/cls-psi-file-stub-builder => analysis/decompiled/decompiler-to-file-stubs}/testData/clsFileStubBuilder/PrivateConstField/PrivateConstField.kt (100%) rename {compiler/psi/cls-psi-file-stub-builder => analysis/decompiled/decompiler-to-file-stubs}/testData/clsFileStubBuilder/PrivateConstField/PrivateConstField.txt (100%) rename {compiler/psi/cls-psi-file-stub-builder => analysis/decompiled/decompiler-to-file-stubs}/testData/clsFileStubBuilder/PrivateToThis/PrivateToThis.kt (100%) rename {compiler/psi/cls-psi-file-stub-builder => analysis/decompiled/decompiler-to-file-stubs}/testData/clsFileStubBuilder/PrivateToThis/PrivateToThis.txt (100%) rename {compiler/psi/cls-psi-file-stub-builder => analysis/decompiled/decompiler-to-file-stubs}/testData/clsFileStubBuilder/Sealed/Sealed.kt (100%) rename {compiler/psi/cls-psi-file-stub-builder => analysis/decompiled/decompiler-to-file-stubs}/testData/clsFileStubBuilder/Sealed/Sealed.txt (100%) rename {compiler/psi/cls-psi-file-stub-builder => analysis/decompiled/decompiler-to-file-stubs}/testData/clsFileStubBuilder/SecondaryConstructors/SecondaryConstructors.kt (100%) rename {compiler/psi/cls-psi-file-stub-builder => analysis/decompiled/decompiler-to-file-stubs}/testData/clsFileStubBuilder/SecondaryConstructors/SecondaryConstructors.txt (100%) rename {compiler/psi/cls-psi-file-stub-builder => analysis/decompiled/decompiler-to-file-stubs}/testData/clsFileStubBuilder/SuspendLambda/SuspendLambda.kt (100%) rename {compiler/psi/cls-psi-file-stub-builder => analysis/decompiled/decompiler-to-file-stubs}/testData/clsFileStubBuilder/SuspendLambda/SuspendLambda.txt (100%) rename {compiler/psi/cls-psi-file-stub-builder => analysis/decompiled/decompiler-to-file-stubs}/testData/clsFileStubBuilder/TopJvmPackageName/TopJvmPackageName.kt (100%) rename {compiler/psi/cls-psi-file-stub-builder => analysis/decompiled/decompiler-to-file-stubs}/testData/clsFileStubBuilder/TopJvmPackageName/TopJvmPackageName.txt (100%) rename {compiler/psi/cls-psi-file-stub-builder => analysis/decompiled/decompiler-to-file-stubs}/testData/clsFileStubBuilder/TopLevelMembersAnnotatedKt/TopLevelMembersAnnotatedKt.txt (100%) rename {compiler/psi/cls-psi-file-stub-builder => analysis/decompiled/decompiler-to-file-stubs}/testData/clsFileStubBuilder/TopLevelMembersAnnotatedKt/annotations.kt (100%) rename {compiler/psi/cls-psi-file-stub-builder => analysis/decompiled/decompiler-to-file-stubs}/testData/clsFileStubBuilder/TopLevelMembersAnnotatedKt/topLevelMembersAnnotated.kt (100%) rename {compiler/psi/cls-psi-file-stub-builder => analysis/decompiled/decompiler-to-file-stubs}/testData/clsFileStubBuilder/TopLevelMembersKt/TopLevelMembers.kt (100%) rename {compiler/psi/cls-psi-file-stub-builder => analysis/decompiled/decompiler-to-file-stubs}/testData/clsFileStubBuilder/TopLevelMembersKt/TopLevelMembersKt.txt (100%) rename {compiler/psi/cls-psi-file-stub-builder => analysis/decompiled/decompiler-to-file-stubs}/testData/clsFileStubBuilder/TypeAliases/Dependency.kt (100%) rename {compiler/psi/cls-psi-file-stub-builder => analysis/decompiled/decompiler-to-file-stubs}/testData/clsFileStubBuilder/TypeAliases/TypeAliases.kt (100%) rename {compiler/psi/cls-psi-file-stub-builder => analysis/decompiled/decompiler-to-file-stubs}/testData/clsFileStubBuilder/TypeAliases/TypeAliases.txt (100%) rename {compiler/psi/cls-psi-file-stub-builder => analysis/decompiled/decompiler-to-file-stubs}/testData/clsFileStubBuilder/TypeBoundsAndDelegationSpecifiers/TypeBoundsAndDelegationSpecifiers.kt (100%) rename {compiler/psi/cls-psi-file-stub-builder => analysis/decompiled/decompiler-to-file-stubs}/testData/clsFileStubBuilder/TypeBoundsAndDelegationSpecifiers/TypeBoundsAndDelegationSpecifiers.txt (100%) rename {compiler/psi/cls-psi-file-stub-builder => analysis/decompiled/decompiler-to-file-stubs}/testData/clsFileStubBuilder/TypeModifiers/TypeModifiers.kt (100%) rename {compiler/psi/cls-psi-file-stub-builder => analysis/decompiled/decompiler-to-file-stubs}/testData/clsFileStubBuilder/TypeModifiers/TypeModifiers.txt (100%) rename {compiler/psi/cls-psi-file-stub-builder => analysis/decompiled/decompiler-to-file-stubs}/testData/clsFileStubBuilder/TypeParams/TypeParams.kt (100%) rename {compiler/psi/cls-psi-file-stub-builder => analysis/decompiled/decompiler-to-file-stubs}/testData/clsFileStubBuilder/TypeParams/TypeParams.txt (100%) rename {compiler/psi/cls-psi-file-stub-builder => analysis/decompiled/decompiler-to-file-stubs}/testData/clsFileStubBuilder/Types/Types.kt (100%) rename {compiler/psi/cls-psi-file-stub-builder => analysis/decompiled/decompiler-to-file-stubs}/testData/clsFileStubBuilder/Types/Types.txt (100%) rename {compiler/psi/cls-psi-file-stub-builder/tests/org/jetbrains/kotlin/psi/stubs/file/builder => analysis/decompiled/decompiler-to-file-stubs/tests/org/jetbrains/kotlin/analysis/decompiler/stub/files}/AbstractClsStubBuilderTest.kt (93%) create mode 100644 analysis/decompiled/decompiler-to-file-stubs/tests/org/jetbrains/kotlin/analysis/decompiler/stub/files/ClsStubBuilderTestGenerated.java rename {compiler/psi/cls-psi-stub-builder => analysis/decompiled/decompiler-to-stubs}/build.gradle.kts (100%) rename {compiler/psi/cls-psi-stub-builder/src/org/jetbrains/kotlin/psi/stubs/builder => analysis/decompiled/decompiler-to-stubs/src/org/jetbrains/kotlin/analysis/decompiler/stub}/CallableClsStubBuilder.kt (99%) rename {compiler/psi/cls-psi-stub-builder/src/org/jetbrains/kotlin/psi/stubs/builder => analysis/decompiled/decompiler-to-stubs/src/org/jetbrains/kotlin/analysis/decompiler/stub}/ClassClsStubBuilder.kt (99%) rename {compiler/psi/cls-psi-stub-builder/src/org/jetbrains/kotlin/psi/stubs/builder => analysis/decompiled/decompiler-to-stubs/src/org/jetbrains/kotlin/analysis/decompiler/stub}/ClsStubBuilderContext.kt (88%) rename {compiler/psi/cls-psi-stub-builder/src/org/jetbrains/kotlin/psi/stubs/builder => analysis/decompiled/decompiler-to-stubs/src/org/jetbrains/kotlin/analysis/decompiler/stub}/TypeClsStubBuilder.kt (99%) rename {compiler/psi/cls-psi-stub-builder/src/org/jetbrains/kotlin/psi/stubs/builder => analysis/decompiled/decompiler-to-stubs/src/org/jetbrains/kotlin/analysis/decompiler/stub}/clsStubBuilding.kt (98%) rename {compiler/psi/cls-psi-stub-builder/src/org/jetbrains/kotlin/psi/stubs/builder => analysis/decompiled/decompiler-to-stubs/src/org/jetbrains/kotlin/analysis/decompiler/stub}/flags/flags.kt (97%) rename {compiler/psi/cls-psi-stub-builder/src/org/jetbrains/kotlin/psi/stubs/builder => analysis/decompiled/decompiler-to-stubs/src/org/jetbrains/kotlin/analysis/decompiler/stub}/typeAliasClsStubBuilding.kt (94%) delete mode 100644 compiler/psi/cls-psi-file-stub-builder/tests/org/jetbrains/kotlin/psi/stubs/file/builder/ClsStubBuilderTestGenerated.java diff --git a/compiler/psi/cls-psi-file-stub-builder/build.gradle.kts b/analysis/decompiled/decompiler-to-file-stubs/build.gradle.kts similarity index 89% rename from compiler/psi/cls-psi-file-stub-builder/build.gradle.kts rename to analysis/decompiled/decompiler-to-file-stubs/build.gradle.kts index 2350aa7e8d7..3a6fbddc951 100644 --- a/compiler/psi/cls-psi-file-stub-builder/build.gradle.kts +++ b/analysis/decompiled/decompiler-to-file-stubs/build.gradle.kts @@ -8,7 +8,7 @@ dependencies { api(project(":core:deserialization.common")) api(project(":core:deserialization.common.jvm")) api(project(":core:deserialization")) - implementation(project(":compiler:psi:cls-psi-stub-builder")) + implementation(project(":analysis:decompiled:decompiler-to-stubs")) implementation(project(":core:deserialization.common.jvm.impl")) implementation(project(":core:compiler.common.jvm")) diff --git a/compiler/psi/cls-psi-file-stub-builder/src/org/jetbrains/kotlin/psi/stubs/file/builder/ClsClassFinder.kt b/analysis/decompiled/decompiler-to-file-stubs/src/org/jetbrains/kotlin/analysis/decompiler/stub/file/ClsClassFinder.kt similarity index 97% rename from compiler/psi/cls-psi-file-stub-builder/src/org/jetbrains/kotlin/psi/stubs/file/builder/ClsClassFinder.kt rename to analysis/decompiled/decompiler-to-file-stubs/src/org/jetbrains/kotlin/analysis/decompiler/stub/file/ClsClassFinder.kt index 6d995a19482..3c9ee2463b5 100644 --- a/compiler/psi/cls-psi-file-stub-builder/src/org/jetbrains/kotlin/psi/stubs/file/builder/ClsClassFinder.kt +++ b/analysis/decompiled/decompiler-to-file-stubs/src/org/jetbrains/kotlin/analysis/decompiler/stub/file/ClsClassFinder.kt @@ -3,7 +3,7 @@ * 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.file.builder +package org.jetbrains.kotlin.analysis.decompiler.stub.file import com.intellij.openapi.diagnostic.Logger import com.intellij.openapi.vfs.VirtualFile diff --git a/compiler/psi/cls-psi-file-stub-builder/src/org/jetbrains/kotlin/psi/stubs/file/builder/ClsKotlinBinaryClassCache.kt b/analysis/decompiled/decompiler-to-file-stubs/src/org/jetbrains/kotlin/analysis/decompiler/stub/file/ClsKotlinBinaryClassCache.kt similarity index 94% rename from compiler/psi/cls-psi-file-stub-builder/src/org/jetbrains/kotlin/psi/stubs/file/builder/ClsKotlinBinaryClassCache.kt rename to analysis/decompiled/decompiler-to-file-stubs/src/org/jetbrains/kotlin/analysis/decompiler/stub/file/ClsKotlinBinaryClassCache.kt index f633bd143bc..bd7e0c3fa9f 100644 --- a/compiler/psi/cls-psi-file-stub-builder/src/org/jetbrains/kotlin/psi/stubs/file/builder/ClsKotlinBinaryClassCache.kt +++ b/analysis/decompiled/decompiler-to-file-stubs/src/org/jetbrains/kotlin/analysis/decompiler/stub/file/ClsKotlinBinaryClassCache.kt @@ -1,6 +1,9 @@ -// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. +/* + * 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.file.builder +package org.jetbrains.kotlin.analysis.decompiler.stub.file import com.intellij.ide.highlighter.JavaClassFileType import com.intellij.openapi.application.ApplicationManager diff --git a/compiler/psi/cls-psi-file-stub-builder/src/org/jetbrains/kotlin/psi/stubs/file/builder/DirectoryBasedClassFinder.kt b/analysis/decompiled/decompiler-to-file-stubs/src/org/jetbrains/kotlin/analysis/decompiler/stub/file/DirectoryBasedClassFinder.kt similarity index 97% rename from compiler/psi/cls-psi-file-stub-builder/src/org/jetbrains/kotlin/psi/stubs/file/builder/DirectoryBasedClassFinder.kt rename to analysis/decompiled/decompiler-to-file-stubs/src/org/jetbrains/kotlin/analysis/decompiler/stub/file/DirectoryBasedClassFinder.kt index 66e1a7d6759..028a883de4f 100644 --- a/compiler/psi/cls-psi-file-stub-builder/src/org/jetbrains/kotlin/psi/stubs/file/builder/DirectoryBasedClassFinder.kt +++ b/analysis/decompiled/decompiler-to-file-stubs/src/org/jetbrains/kotlin/analysis/decompiler/stub/file/DirectoryBasedClassFinder.kt @@ -3,7 +3,7 @@ * 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.file.builder +package org.jetbrains.kotlin.analysis.decompiler.stub.file import com.intellij.openapi.vfs.VirtualFile import org.jetbrains.kotlin.load.java.structure.JavaClass diff --git a/compiler/psi/cls-psi-file-stub-builder/src/org/jetbrains/kotlin/psi/stubs/file/builder/DirectoryBasedDataFinder.kt b/analysis/decompiled/decompiler-to-file-stubs/src/org/jetbrains/kotlin/analysis/decompiler/stub/file/DirectoryBasedDataFinder.kt similarity index 96% rename from compiler/psi/cls-psi-file-stub-builder/src/org/jetbrains/kotlin/psi/stubs/file/builder/DirectoryBasedDataFinder.kt rename to analysis/decompiled/decompiler-to-file-stubs/src/org/jetbrains/kotlin/analysis/decompiler/stub/file/DirectoryBasedDataFinder.kt index c63f4103b73..f4f697d5c82 100644 --- a/compiler/psi/cls-psi-file-stub-builder/src/org/jetbrains/kotlin/psi/stubs/file/builder/DirectoryBasedDataFinder.kt +++ b/analysis/decompiled/decompiler-to-file-stubs/src/org/jetbrains/kotlin/analysis/decompiler/stub/file/DirectoryBasedDataFinder.kt @@ -3,7 +3,7 @@ * 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.file.builder +package org.jetbrains.kotlin.analysis.decompiler.stub.file import com.intellij.openapi.diagnostic.Logger import org.jetbrains.kotlin.load.kotlin.KotlinJvmBinarySourceElement diff --git a/compiler/psi/cls-psi-file-stub-builder/src/org/jetbrains/kotlin/psi/stubs/file/builder/FileAttributeService.kt b/analysis/decompiled/decompiler-to-file-stubs/src/org/jetbrains/kotlin/analysis/decompiler/stub/file/FileAttributeService.kt similarity index 95% rename from compiler/psi/cls-psi-file-stub-builder/src/org/jetbrains/kotlin/psi/stubs/file/builder/FileAttributeService.kt rename to analysis/decompiled/decompiler-to-file-stubs/src/org/jetbrains/kotlin/analysis/decompiler/stub/file/FileAttributeService.kt index 9dc407474fc..4b25262557e 100644 --- a/compiler/psi/cls-psi-file-stub-builder/src/org/jetbrains/kotlin/psi/stubs/file/builder/FileAttributeService.kt +++ b/analysis/decompiled/decompiler-to-file-stubs/src/org/jetbrains/kotlin/analysis/decompiler/stub/file/FileAttributeService.kt @@ -3,7 +3,7 @@ * 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.file.builder +package org.jetbrains.kotlin.analysis.decompiler.stub.file import com.intellij.openapi.vfs.VirtualFile import java.io.DataInput diff --git a/compiler/psi/cls-psi-file-stub-builder/src/org/jetbrains/kotlin/psi/stubs/file/builder/KotlinClsStubBuilder.kt b/analysis/decompiled/decompiler-to-file-stubs/src/org/jetbrains/kotlin/analysis/decompiler/stub/file/KotlinClsStubBuilder.kt similarity index 98% rename from compiler/psi/cls-psi-file-stub-builder/src/org/jetbrains/kotlin/psi/stubs/file/builder/KotlinClsStubBuilder.kt rename to analysis/decompiled/decompiler-to-file-stubs/src/org/jetbrains/kotlin/analysis/decompiler/stub/file/KotlinClsStubBuilder.kt index e3c71b61c7e..df5f884f78b 100644 --- a/compiler/psi/cls-psi-file-stub-builder/src/org/jetbrains/kotlin/psi/stubs/file/builder/KotlinClsStubBuilder.kt +++ b/analysis/decompiled/decompiler-to-file-stubs/src/org/jetbrains/kotlin/analysis/decompiler/stub/file/KotlinClsStubBuilder.kt @@ -3,7 +3,7 @@ * 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.file.builder +package org.jetbrains.kotlin.analysis.decompiler.stub.file import com.intellij.openapi.diagnostic.Logger import com.intellij.openapi.vfs.VirtualFile @@ -12,6 +12,7 @@ import com.intellij.psi.impl.compiled.ClassFileStubBuilder import com.intellij.psi.stubs.PsiFileStub import com.intellij.util.indexing.FileContent import org.jetbrains.kotlin.SpecialJvmAnnotations +import org.jetbrains.kotlin.analysis.decompiler.stub.* import org.jetbrains.kotlin.descriptors.SourceElement import org.jetbrains.kotlin.deserialization.common.jvm.impl.VirtualFileKotlinClass import org.jetbrains.kotlin.load.kotlin.* @@ -26,7 +27,6 @@ import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.psi.stubs.KotlinStubVersions -import org.jetbrains.kotlin.psi.stubs.builder.* import org.jetbrains.kotlin.resolve.constants.ClassLiteralValue import org.jetbrains.kotlin.resolve.constants.ConstantValue import org.jetbrains.kotlin.resolve.constants.KClassValue diff --git a/compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/AnnotatedFlexibleTypes/AnnotatedFlexibleTypes.kt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/AnnotatedFlexibleTypes/AnnotatedFlexibleTypes.kt similarity index 100% rename from compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/AnnotatedFlexibleTypes/AnnotatedFlexibleTypes.kt rename to analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/AnnotatedFlexibleTypes/AnnotatedFlexibleTypes.kt diff --git a/compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/AnnotatedFlexibleTypes/AnnotatedFlexibleTypes.txt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/AnnotatedFlexibleTypes/AnnotatedFlexibleTypes.txt similarity index 100% rename from compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/AnnotatedFlexibleTypes/AnnotatedFlexibleTypes.txt rename to analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/AnnotatedFlexibleTypes/AnnotatedFlexibleTypes.txt diff --git a/compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/AnnotatedFlexibleTypes/d/JavaClass.java b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/AnnotatedFlexibleTypes/d/JavaClass.java similarity index 100% rename from compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/AnnotatedFlexibleTypes/d/JavaClass.java rename to analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/AnnotatedFlexibleTypes/d/JavaClass.java diff --git a/compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/AnnotatedParameterInEnumConstructor/AnnotatedParameterInEnumConstructor.kt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/AnnotatedParameterInEnumConstructor/AnnotatedParameterInEnumConstructor.kt similarity index 100% rename from compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/AnnotatedParameterInEnumConstructor/AnnotatedParameterInEnumConstructor.kt rename to analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/AnnotatedParameterInEnumConstructor/AnnotatedParameterInEnumConstructor.kt diff --git a/compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/AnnotatedParameterInEnumConstructor/AnnotatedParameterInEnumConstructor.txt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/AnnotatedParameterInEnumConstructor/AnnotatedParameterInEnumConstructor.txt similarity index 100% rename from compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/AnnotatedParameterInEnumConstructor/AnnotatedParameterInEnumConstructor.txt rename to analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/AnnotatedParameterInEnumConstructor/AnnotatedParameterInEnumConstructor.txt diff --git a/compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/AnnotatedParameterInInnerClassConstructor/AnnotatedParameterInInnerClassConstructor.kt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/AnnotatedParameterInInnerClassConstructor/AnnotatedParameterInInnerClassConstructor.kt similarity index 100% rename from compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/AnnotatedParameterInInnerClassConstructor/AnnotatedParameterInInnerClassConstructor.kt rename to analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/AnnotatedParameterInInnerClassConstructor/AnnotatedParameterInInnerClassConstructor.kt diff --git a/compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/AnnotatedParameterInInnerClassConstructor/AnnotatedParameterInInnerClassConstructor.txt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/AnnotatedParameterInInnerClassConstructor/AnnotatedParameterInInnerClassConstructor.txt similarity index 100% rename from compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/AnnotatedParameterInInnerClassConstructor/AnnotatedParameterInInnerClassConstructor.txt rename to analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/AnnotatedParameterInInnerClassConstructor/AnnotatedParameterInInnerClassConstructor.txt diff --git a/compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/AnnotationClass/AnnotationClass.kt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/AnnotationClass/AnnotationClass.kt similarity index 100% rename from compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/AnnotationClass/AnnotationClass.kt rename to analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/AnnotationClass/AnnotationClass.kt diff --git a/compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/AnnotationClass/AnnotationClass.txt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/AnnotationClass/AnnotationClass.txt similarity index 100% rename from compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/AnnotationClass/AnnotationClass.txt rename to analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/AnnotationClass/AnnotationClass.txt diff --git a/compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/AnnotationValues/AnnotationValues.kt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/AnnotationValues/AnnotationValues.kt similarity index 100% rename from compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/AnnotationValues/AnnotationValues.kt rename to analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/AnnotationValues/AnnotationValues.kt diff --git a/compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/AnnotationValues/AnnotationValues.txt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/AnnotationValues/AnnotationValues.txt similarity index 100% rename from compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/AnnotationValues/AnnotationValues.txt rename to analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/AnnotationValues/AnnotationValues.txt diff --git a/compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/Annotations/Annotations.kt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/Annotations/Annotations.kt similarity index 100% rename from compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/Annotations/Annotations.kt rename to analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/Annotations/Annotations.kt diff --git a/compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/Annotations/Annotations.txt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/Annotations/Annotations.txt similarity index 100% rename from compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/Annotations/Annotations.txt rename to analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/Annotations/Annotations.txt diff --git a/compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/AnnotationsOnNullableTypes/AnnotationsOnNullableTypes.kt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/AnnotationsOnNullableTypes/AnnotationsOnNullableTypes.kt similarity index 100% rename from compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/AnnotationsOnNullableTypes/AnnotationsOnNullableTypes.kt rename to analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/AnnotationsOnNullableTypes/AnnotationsOnNullableTypes.kt diff --git a/compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/AnnotationsOnNullableTypes/AnnotationsOnNullableTypes.txt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/AnnotationsOnNullableTypes/AnnotationsOnNullableTypes.txt similarity index 100% rename from compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/AnnotationsOnNullableTypes/AnnotationsOnNullableTypes.txt rename to analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/AnnotationsOnNullableTypes/AnnotationsOnNullableTypes.txt diff --git a/compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/AnnotationsOnParenthesizedTypes/AnnotationsOnParenthesizedTypes.kt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/AnnotationsOnParenthesizedTypes/AnnotationsOnParenthesizedTypes.kt similarity index 100% rename from compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/AnnotationsOnParenthesizedTypes/AnnotationsOnParenthesizedTypes.kt rename to analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/AnnotationsOnParenthesizedTypes/AnnotationsOnParenthesizedTypes.kt diff --git a/compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/AnnotationsOnParenthesizedTypes/AnnotationsOnParenthesizedTypes.txt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/AnnotationsOnParenthesizedTypes/AnnotationsOnParenthesizedTypes.txt similarity index 100% rename from compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/AnnotationsOnParenthesizedTypes/AnnotationsOnParenthesizedTypes.txt rename to analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/AnnotationsOnParenthesizedTypes/AnnotationsOnParenthesizedTypes.txt diff --git a/compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/AnonymousReturnWithGenericType/AnonymousReturnWithGenericType.kt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/AnonymousReturnWithGenericType/AnonymousReturnWithGenericType.kt similarity index 100% rename from compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/AnonymousReturnWithGenericType/AnonymousReturnWithGenericType.kt rename to analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/AnonymousReturnWithGenericType/AnonymousReturnWithGenericType.kt diff --git a/compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/AnonymousReturnWithGenericType/AnonymousReturnWithGenericType.txt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/AnonymousReturnWithGenericType/AnonymousReturnWithGenericType.txt similarity index 100% rename from compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/AnonymousReturnWithGenericType/AnonymousReturnWithGenericType.txt rename to analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/AnonymousReturnWithGenericType/AnonymousReturnWithGenericType.txt diff --git a/compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/ClassMembers/ClassMembers.kt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/ClassMembers/ClassMembers.kt similarity index 100% rename from compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/ClassMembers/ClassMembers.kt rename to analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/ClassMembers/ClassMembers.kt diff --git a/compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/ClassMembers/ClassMembers.txt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/ClassMembers/ClassMembers.txt similarity index 100% rename from compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/ClassMembers/ClassMembers.txt rename to analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/ClassMembers/ClassMembers.txt diff --git a/compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/ClassObject/ClassObject.kt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/ClassObject/ClassObject.kt similarity index 100% rename from compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/ClassObject/ClassObject.kt rename to analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/ClassObject/ClassObject.kt diff --git a/compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/ClassObject/ClassObject.txt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/ClassObject/ClassObject.txt similarity index 100% rename from compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/ClassObject/ClassObject.txt rename to analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/ClassObject/ClassObject.txt diff --git a/compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/Const/Const.kt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/Const/Const.kt similarity index 100% rename from compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/Const/Const.kt rename to analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/Const/Const.kt diff --git a/compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/Const/Const.txt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/Const/Const.txt similarity index 100% rename from compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/Const/Const.txt rename to analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/Const/Const.txt diff --git a/compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/Contracts/Contracts.kt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/Contracts/Contracts.kt similarity index 100% rename from compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/Contracts/Contracts.kt rename to analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/Contracts/Contracts.kt diff --git a/compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/Contracts/Contracts.txt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/Contracts/Contracts.txt similarity index 100% rename from compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/Contracts/Contracts.txt rename to analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/Contracts/Contracts.txt diff --git a/compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/DataClass/DataClass.kt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/DataClass/DataClass.kt similarity index 100% rename from compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/DataClass/DataClass.kt rename to analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/DataClass/DataClass.kt diff --git a/compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/DataClass/DataClass.txt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/DataClass/DataClass.txt similarity index 100% rename from compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/DataClass/DataClass.txt rename to analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/DataClass/DataClass.txt diff --git a/compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/Delegation/Delegation.kt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/Delegation/Delegation.kt similarity index 100% rename from compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/Delegation/Delegation.kt rename to analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/Delegation/Delegation.kt diff --git a/compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/Delegation/Delegation.txt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/Delegation/Delegation.txt similarity index 100% rename from compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/Delegation/Delegation.txt rename to analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/Delegation/Delegation.txt diff --git a/compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/DependencyOnNestedClasses/Dependency.kt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/DependencyOnNestedClasses/Dependency.kt similarity index 100% rename from compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/DependencyOnNestedClasses/Dependency.kt rename to analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/DependencyOnNestedClasses/Dependency.kt diff --git a/compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/DependencyOnNestedClasses/DependencyOnNestedClasses.kt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/DependencyOnNestedClasses/DependencyOnNestedClasses.kt similarity index 100% rename from compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/DependencyOnNestedClasses/DependencyOnNestedClasses.kt rename to analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/DependencyOnNestedClasses/DependencyOnNestedClasses.kt diff --git a/compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/DependencyOnNestedClasses/DependencyOnNestedClasses.txt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/DependencyOnNestedClasses/DependencyOnNestedClasses.txt similarity index 100% rename from compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/DependencyOnNestedClasses/DependencyOnNestedClasses.txt rename to analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/DependencyOnNestedClasses/DependencyOnNestedClasses.txt diff --git a/compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/Enum/Enum.kt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/Enum/Enum.kt similarity index 100% rename from compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/Enum/Enum.kt rename to analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/Enum/Enum.kt diff --git a/compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/Enum/Enum.txt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/Enum/Enum.txt similarity index 100% rename from compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/Enum/Enum.txt rename to analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/Enum/Enum.txt diff --git a/compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/FlexibleTypes/FlexibleTypes.kt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/FlexibleTypes/FlexibleTypes.kt similarity index 100% rename from compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/FlexibleTypes/FlexibleTypes.kt rename to analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/FlexibleTypes/FlexibleTypes.kt diff --git a/compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/FlexibleTypes/FlexibleTypes.txt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/FlexibleTypes/FlexibleTypes.txt similarity index 100% rename from compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/FlexibleTypes/FlexibleTypes.txt rename to analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/FlexibleTypes/FlexibleTypes.txt diff --git a/compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/FlexibleTypes/ft.kt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/FlexibleTypes/ft.kt similarity index 100% rename from compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/FlexibleTypes/ft.kt rename to analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/FlexibleTypes/ft.kt diff --git a/compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/FunInterfaceDeclaration/FunInterfaceDeclaration.kt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/FunInterfaceDeclaration/FunInterfaceDeclaration.kt similarity index 100% rename from compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/FunInterfaceDeclaration/FunInterfaceDeclaration.kt rename to analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/FunInterfaceDeclaration/FunInterfaceDeclaration.kt diff --git a/compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/FunInterfaceDeclaration/FunInterfaceDeclaration.txt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/FunInterfaceDeclaration/FunInterfaceDeclaration.txt similarity index 100% rename from compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/FunInterfaceDeclaration/FunInterfaceDeclaration.txt rename to analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/FunInterfaceDeclaration/FunInterfaceDeclaration.txt diff --git a/compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/InheritingClasses/InheritingClasses.kt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/InheritingClasses/InheritingClasses.kt similarity index 100% rename from compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/InheritingClasses/InheritingClasses.kt rename to analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/InheritingClasses/InheritingClasses.kt diff --git a/compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/InheritingClasses/InheritingClasses.txt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/InheritingClasses/InheritingClasses.txt similarity index 100% rename from compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/InheritingClasses/InheritingClasses.txt rename to analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/InheritingClasses/InheritingClasses.txt diff --git a/compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/InnerClassEnumEntry/InnerClassEnumEntry.kt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/InnerClassEnumEntry/InnerClassEnumEntry.kt similarity index 100% rename from compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/InnerClassEnumEntry/InnerClassEnumEntry.kt rename to analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/InnerClassEnumEntry/InnerClassEnumEntry.kt diff --git a/compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/InnerClassEnumEntry/InnerClassEnumEntry.txt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/InnerClassEnumEntry/InnerClassEnumEntry.txt similarity index 100% rename from compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/InnerClassEnumEntry/InnerClassEnumEntry.txt rename to analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/InnerClassEnumEntry/InnerClassEnumEntry.txt diff --git a/compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/InnerTypes/InnerTypes.kt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/InnerTypes/InnerTypes.kt similarity index 100% rename from compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/InnerTypes/InnerTypes.kt rename to analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/InnerTypes/InnerTypes.kt diff --git a/compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/InnerTypes/InnerTypes.txt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/InnerTypes/InnerTypes.txt similarity index 100% rename from compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/InnerTypes/InnerTypes.txt rename to analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/InnerTypes/InnerTypes.txt diff --git a/compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/LocalClass/LocalClass.kt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/LocalClass/LocalClass.kt similarity index 100% rename from compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/LocalClass/LocalClass.kt rename to analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/LocalClass/LocalClass.kt diff --git a/compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/LocalClass/LocalClass.txt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/LocalClass/LocalClass.txt similarity index 100% rename from compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/LocalClass/LocalClass.txt rename to analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/LocalClass/LocalClass.txt diff --git a/compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/Modifiers/Modifiers.kt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/Modifiers/Modifiers.kt similarity index 100% rename from compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/Modifiers/Modifiers.kt rename to analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/Modifiers/Modifiers.kt diff --git a/compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/Modifiers/Modifiers.txt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/Modifiers/Modifiers.txt similarity index 100% rename from compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/Modifiers/Modifiers.txt rename to analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/Modifiers/Modifiers.txt diff --git a/compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/MultifileClass/MultifileClass.kt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/MultifileClass/MultifileClass.kt similarity index 100% rename from compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/MultifileClass/MultifileClass.kt rename to analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/MultifileClass/MultifileClass.kt diff --git a/compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/MultifileClass/MultifileClass.txt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/MultifileClass/MultifileClass.txt similarity index 100% rename from compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/MultifileClass/MultifileClass.txt rename to analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/MultifileClass/MultifileClass.txt diff --git a/compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/MultifileClass/SecondPart.kt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/MultifileClass/SecondPart.kt similarity index 100% rename from compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/MultifileClass/SecondPart.kt rename to analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/MultifileClass/SecondPart.kt diff --git a/compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/NamedCompanionObject/NamedCompanionObject.kt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/NamedCompanionObject/NamedCompanionObject.kt similarity index 100% rename from compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/NamedCompanionObject/NamedCompanionObject.kt rename to analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/NamedCompanionObject/NamedCompanionObject.kt diff --git a/compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/NamedCompanionObject/NamedCompanionObject.txt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/NamedCompanionObject/NamedCompanionObject.txt similarity index 100% rename from compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/NamedCompanionObject/NamedCompanionObject.txt rename to analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/NamedCompanionObject/NamedCompanionObject.txt diff --git a/compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/NestedClasses/NestedClasses.kt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/NestedClasses/NestedClasses.kt similarity index 100% rename from compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/NestedClasses/NestedClasses.kt rename to analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/NestedClasses/NestedClasses.kt diff --git a/compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/NestedClasses/NestedClasses.txt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/NestedClasses/NestedClasses.txt similarity index 100% rename from compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/NestedClasses/NestedClasses.txt rename to analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/NestedClasses/NestedClasses.txt diff --git a/compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/Objects/Objects.kt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/Objects/Objects.kt similarity index 100% rename from compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/Objects/Objects.kt rename to analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/Objects/Objects.kt diff --git a/compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/Objects/Objects.txt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/Objects/Objects.txt similarity index 100% rename from compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/Objects/Objects.txt rename to analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/Objects/Objects.txt diff --git a/compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/PrivateConstField/PrivateConstField.kt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/PrivateConstField/PrivateConstField.kt similarity index 100% rename from compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/PrivateConstField/PrivateConstField.kt rename to analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/PrivateConstField/PrivateConstField.kt diff --git a/compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/PrivateConstField/PrivateConstField.txt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/PrivateConstField/PrivateConstField.txt similarity index 100% rename from compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/PrivateConstField/PrivateConstField.txt rename to analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/PrivateConstField/PrivateConstField.txt diff --git a/compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/PrivateToThis/PrivateToThis.kt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/PrivateToThis/PrivateToThis.kt similarity index 100% rename from compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/PrivateToThis/PrivateToThis.kt rename to analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/PrivateToThis/PrivateToThis.kt diff --git a/compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/PrivateToThis/PrivateToThis.txt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/PrivateToThis/PrivateToThis.txt similarity index 100% rename from compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/PrivateToThis/PrivateToThis.txt rename to analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/PrivateToThis/PrivateToThis.txt diff --git a/compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/Sealed/Sealed.kt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/Sealed/Sealed.kt similarity index 100% rename from compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/Sealed/Sealed.kt rename to analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/Sealed/Sealed.kt diff --git a/compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/Sealed/Sealed.txt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/Sealed/Sealed.txt similarity index 100% rename from compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/Sealed/Sealed.txt rename to analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/Sealed/Sealed.txt diff --git a/compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/SecondaryConstructors/SecondaryConstructors.kt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/SecondaryConstructors/SecondaryConstructors.kt similarity index 100% rename from compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/SecondaryConstructors/SecondaryConstructors.kt rename to analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/SecondaryConstructors/SecondaryConstructors.kt diff --git a/compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/SecondaryConstructors/SecondaryConstructors.txt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/SecondaryConstructors/SecondaryConstructors.txt similarity index 100% rename from compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/SecondaryConstructors/SecondaryConstructors.txt rename to analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/SecondaryConstructors/SecondaryConstructors.txt diff --git a/compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/SuspendLambda/SuspendLambda.kt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/SuspendLambda/SuspendLambda.kt similarity index 100% rename from compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/SuspendLambda/SuspendLambda.kt rename to analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/SuspendLambda/SuspendLambda.kt diff --git a/compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/SuspendLambda/SuspendLambda.txt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/SuspendLambda/SuspendLambda.txt similarity index 100% rename from compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/SuspendLambda/SuspendLambda.txt rename to analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/SuspendLambda/SuspendLambda.txt diff --git a/compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/TopJvmPackageName/TopJvmPackageName.kt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/TopJvmPackageName/TopJvmPackageName.kt similarity index 100% rename from compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/TopJvmPackageName/TopJvmPackageName.kt rename to analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/TopJvmPackageName/TopJvmPackageName.kt diff --git a/compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/TopJvmPackageName/TopJvmPackageName.txt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/TopJvmPackageName/TopJvmPackageName.txt similarity index 100% rename from compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/TopJvmPackageName/TopJvmPackageName.txt rename to analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/TopJvmPackageName/TopJvmPackageName.txt diff --git a/compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/TopLevelMembersAnnotatedKt/TopLevelMembersAnnotatedKt.txt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/TopLevelMembersAnnotatedKt/TopLevelMembersAnnotatedKt.txt similarity index 100% rename from compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/TopLevelMembersAnnotatedKt/TopLevelMembersAnnotatedKt.txt rename to analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/TopLevelMembersAnnotatedKt/TopLevelMembersAnnotatedKt.txt diff --git a/compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/TopLevelMembersAnnotatedKt/annotations.kt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/TopLevelMembersAnnotatedKt/annotations.kt similarity index 100% rename from compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/TopLevelMembersAnnotatedKt/annotations.kt rename to analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/TopLevelMembersAnnotatedKt/annotations.kt diff --git a/compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/TopLevelMembersAnnotatedKt/topLevelMembersAnnotated.kt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/TopLevelMembersAnnotatedKt/topLevelMembersAnnotated.kt similarity index 100% rename from compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/TopLevelMembersAnnotatedKt/topLevelMembersAnnotated.kt rename to analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/TopLevelMembersAnnotatedKt/topLevelMembersAnnotated.kt diff --git a/compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/TopLevelMembersKt/TopLevelMembers.kt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/TopLevelMembersKt/TopLevelMembers.kt similarity index 100% rename from compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/TopLevelMembersKt/TopLevelMembers.kt rename to analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/TopLevelMembersKt/TopLevelMembers.kt diff --git a/compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/TopLevelMembersKt/TopLevelMembersKt.txt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/TopLevelMembersKt/TopLevelMembersKt.txt similarity index 100% rename from compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/TopLevelMembersKt/TopLevelMembersKt.txt rename to analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/TopLevelMembersKt/TopLevelMembersKt.txt diff --git a/compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/TypeAliases/Dependency.kt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/TypeAliases/Dependency.kt similarity index 100% rename from compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/TypeAliases/Dependency.kt rename to analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/TypeAliases/Dependency.kt diff --git a/compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/TypeAliases/TypeAliases.kt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/TypeAliases/TypeAliases.kt similarity index 100% rename from compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/TypeAliases/TypeAliases.kt rename to analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/TypeAliases/TypeAliases.kt diff --git a/compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/TypeAliases/TypeAliases.txt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/TypeAliases/TypeAliases.txt similarity index 100% rename from compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/TypeAliases/TypeAliases.txt rename to analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/TypeAliases/TypeAliases.txt diff --git a/compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/TypeBoundsAndDelegationSpecifiers/TypeBoundsAndDelegationSpecifiers.kt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/TypeBoundsAndDelegationSpecifiers/TypeBoundsAndDelegationSpecifiers.kt similarity index 100% rename from compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/TypeBoundsAndDelegationSpecifiers/TypeBoundsAndDelegationSpecifiers.kt rename to analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/TypeBoundsAndDelegationSpecifiers/TypeBoundsAndDelegationSpecifiers.kt diff --git a/compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/TypeBoundsAndDelegationSpecifiers/TypeBoundsAndDelegationSpecifiers.txt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/TypeBoundsAndDelegationSpecifiers/TypeBoundsAndDelegationSpecifiers.txt similarity index 100% rename from compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/TypeBoundsAndDelegationSpecifiers/TypeBoundsAndDelegationSpecifiers.txt rename to analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/TypeBoundsAndDelegationSpecifiers/TypeBoundsAndDelegationSpecifiers.txt diff --git a/compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/TypeModifiers/TypeModifiers.kt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/TypeModifiers/TypeModifiers.kt similarity index 100% rename from compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/TypeModifiers/TypeModifiers.kt rename to analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/TypeModifiers/TypeModifiers.kt diff --git a/compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/TypeModifiers/TypeModifiers.txt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/TypeModifiers/TypeModifiers.txt similarity index 100% rename from compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/TypeModifiers/TypeModifiers.txt rename to analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/TypeModifiers/TypeModifiers.txt diff --git a/compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/TypeParams/TypeParams.kt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/TypeParams/TypeParams.kt similarity index 100% rename from compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/TypeParams/TypeParams.kt rename to analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/TypeParams/TypeParams.kt diff --git a/compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/TypeParams/TypeParams.txt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/TypeParams/TypeParams.txt similarity index 100% rename from compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/TypeParams/TypeParams.txt rename to analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/TypeParams/TypeParams.txt diff --git a/compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/Types/Types.kt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/Types/Types.kt similarity index 100% rename from compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/Types/Types.kt rename to analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/Types/Types.kt diff --git a/compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/Types/Types.txt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/Types/Types.txt similarity index 100% rename from compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/Types/Types.txt rename to analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/Types/Types.txt diff --git a/compiler/psi/cls-psi-file-stub-builder/tests/org/jetbrains/kotlin/psi/stubs/file/builder/AbstractClsStubBuilderTest.kt b/analysis/decompiled/decompiler-to-file-stubs/tests/org/jetbrains/kotlin/analysis/decompiler/stub/files/AbstractClsStubBuilderTest.kt similarity index 93% rename from compiler/psi/cls-psi-file-stub-builder/tests/org/jetbrains/kotlin/psi/stubs/file/builder/AbstractClsStubBuilderTest.kt rename to analysis/decompiled/decompiler-to-file-stubs/tests/org/jetbrains/kotlin/analysis/decompiler/stub/files/AbstractClsStubBuilderTest.kt index 8a5533a464a..1249a3f215e 100644 --- a/compiler/psi/cls-psi-file-stub-builder/tests/org/jetbrains/kotlin/psi/stubs/file/builder/AbstractClsStubBuilderTest.kt +++ b/analysis/decompiled/decompiler-to-file-stubs/tests/org/jetbrains/kotlin/analysis/decompiler/stub/files/AbstractClsStubBuilderTest.kt @@ -3,7 +3,7 @@ * 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.file.builder +package org.jetbrains.kotlin.analysis.decompiler.stub.files import com.intellij.core.CoreApplicationEnvironment import com.intellij.openapi.vfs.VfsUtilCore @@ -13,6 +13,10 @@ import com.intellij.psi.PsiElement import com.intellij.psi.impl.DebugUtil import com.intellij.psi.stubs.StubElement import com.intellij.util.indexing.FileContentImpl +import org.jetbrains.kotlin.analysis.decompiler.stub.file.CachedAttributeData +import org.jetbrains.kotlin.analysis.decompiler.stub.file.ClsKotlinBinaryClassCache +import org.jetbrains.kotlin.analysis.decompiler.stub.file.FileAttributeService +import org.jetbrains.kotlin.analysis.decompiler.stub.file.KotlinClsStubBuilder import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment import org.jetbrains.kotlin.name.SpecialNames import org.jetbrains.kotlin.psi.stubs.impl.STUB_TO_STRING_PREFIX diff --git a/analysis/decompiled/decompiler-to-file-stubs/tests/org/jetbrains/kotlin/analysis/decompiler/stub/files/ClsStubBuilderTestGenerated.java b/analysis/decompiled/decompiler-to-file-stubs/tests/org/jetbrains/kotlin/analysis/decompiler/stub/files/ClsStubBuilderTestGenerated.java new file mode 100644 index 00000000000..64d70d257f3 --- /dev/null +++ b/analysis/decompiled/decompiler-to-file-stubs/tests/org/jetbrains/kotlin/analysis/decompiler/stub/files/ClsStubBuilderTestGenerated.java @@ -0,0 +1,272 @@ +/* + * 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.analysis.decompiler.stub.files; + +import com.intellij.testFramework.TestDataPath; +import org.jetbrains.kotlin.test.util.KtTestUtil; +import org.jetbrains.kotlin.test.TestMetadata; +import org.junit.jupiter.api.Nested; +import org.junit.jupiter.api.Test; + +import java.io.File; +import java.util.regex.Pattern; + +/** This class is generated by {@link GenerateNewCompilerTests.kt}. DO NOT MODIFY MANUALLY */ +@SuppressWarnings("all") +@TestMetadata("analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder") +@TestDataPath("$PROJECT_ROOT") +public class ClsStubBuilderTestGenerated extends AbstractClsStubBuilderTest { + @Test + public void testAllFilesPresentInClsFileStubBuilder() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder"), Pattern.compile("^([^\\.]+)$"), null, false); + } + + @Test + @TestMetadata("AnnotatedFlexibleTypes") + public void testAnnotatedFlexibleTypes() throws Exception { + runTest("analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/AnnotatedFlexibleTypes/"); + } + + @Test + @TestMetadata("AnnotatedParameterInEnumConstructor") + public void testAnnotatedParameterInEnumConstructor() throws Exception { + runTest("analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/AnnotatedParameterInEnumConstructor/"); + } + + @Test + @TestMetadata("AnnotatedParameterInInnerClassConstructor") + public void testAnnotatedParameterInInnerClassConstructor() throws Exception { + runTest("analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/AnnotatedParameterInInnerClassConstructor/"); + } + + @Test + @TestMetadata("AnnotationClass") + public void testAnnotationClass() throws Exception { + runTest("analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/AnnotationClass/"); + } + + @Test + @TestMetadata("AnnotationValues") + public void testAnnotationValues() throws Exception { + runTest("analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/AnnotationValues/"); + } + + @Test + @TestMetadata("Annotations") + public void testAnnotations() throws Exception { + runTest("analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/Annotations/"); + } + + @Test + @TestMetadata("AnnotationsOnNullableTypes") + public void testAnnotationsOnNullableTypes() throws Exception { + runTest("analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/AnnotationsOnNullableTypes/"); + } + + @Test + @TestMetadata("AnnotationsOnParenthesizedTypes") + public void testAnnotationsOnParenthesizedTypes() throws Exception { + runTest("analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/AnnotationsOnParenthesizedTypes/"); + } + + @Test + @TestMetadata("AnonymousReturnWithGenericType") + public void testAnonymousReturnWithGenericType() throws Exception { + runTest("analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/AnonymousReturnWithGenericType/"); + } + + @Test + @TestMetadata("ClassMembers") + public void testClassMembers() throws Exception { + runTest("analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/ClassMembers/"); + } + + @Test + @TestMetadata("ClassObject") + public void testClassObject() throws Exception { + runTest("analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/ClassObject/"); + } + + @Test + @TestMetadata("Const") + public void testConst() throws Exception { + runTest("analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/Const/"); + } + + @Test + @TestMetadata("Contracts") + public void testContracts() throws Exception { + runTest("analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/Contracts/"); + } + + @Test + @TestMetadata("DataClass") + public void testDataClass() throws Exception { + runTest("analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/DataClass/"); + } + + @Test + @TestMetadata("Delegation") + public void testDelegation() throws Exception { + runTest("analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/Delegation/"); + } + + @Test + @TestMetadata("DependencyOnNestedClasses") + public void testDependencyOnNestedClasses() throws Exception { + runTest("analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/DependencyOnNestedClasses/"); + } + + @Test + @TestMetadata("Enum") + public void testEnum() throws Exception { + runTest("analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/Enum/"); + } + + @Test + @TestMetadata("FlexibleTypes") + public void testFlexibleTypes() throws Exception { + runTest("analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/FlexibleTypes/"); + } + + @Test + @TestMetadata("FunInterfaceDeclaration") + public void testFunInterfaceDeclaration() throws Exception { + runTest("analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/FunInterfaceDeclaration/"); + } + + @Test + @TestMetadata("InheritingClasses") + public void testInheritingClasses() throws Exception { + runTest("analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/InheritingClasses/"); + } + + @Test + @TestMetadata("InnerClassEnumEntry") + public void testInnerClassEnumEntry() throws Exception { + runTest("analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/InnerClassEnumEntry/"); + } + + @Test + @TestMetadata("InnerTypes") + public void testInnerTypes() throws Exception { + runTest("analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/InnerTypes/"); + } + + @Test + @TestMetadata("LocalClass") + public void testLocalClass() throws Exception { + runTest("analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/LocalClass/"); + } + + @Test + @TestMetadata("Modifiers") + public void testModifiers() throws Exception { + runTest("analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/Modifiers/"); + } + + @Test + @TestMetadata("MultifileClass") + public void testMultifileClass() throws Exception { + runTest("analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/MultifileClass/"); + } + + @Test + @TestMetadata("NamedCompanionObject") + public void testNamedCompanionObject() throws Exception { + runTest("analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/NamedCompanionObject/"); + } + + @Test + @TestMetadata("NestedClasses") + public void testNestedClasses() throws Exception { + runTest("analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/NestedClasses/"); + } + + @Test + @TestMetadata("Objects") + public void testObjects() throws Exception { + runTest("analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/Objects/"); + } + + @Test + @TestMetadata("PrivateConstField") + public void testPrivateConstField() throws Exception { + runTest("analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/PrivateConstField/"); + } + + @Test + @TestMetadata("PrivateToThis") + public void testPrivateToThis() throws Exception { + runTest("analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/PrivateToThis/"); + } + + @Test + @TestMetadata("Sealed") + public void testSealed() throws Exception { + runTest("analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/Sealed/"); + } + + @Test + @TestMetadata("SecondaryConstructors") + public void testSecondaryConstructors() throws Exception { + runTest("analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/SecondaryConstructors/"); + } + + @Test + @TestMetadata("SuspendLambda") + public void testSuspendLambda() throws Exception { + runTest("analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/SuspendLambda/"); + } + + @Test + @TestMetadata("TopJvmPackageName") + public void testTopJvmPackageName() throws Exception { + runTest("analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/TopJvmPackageName/"); + } + + @Test + @TestMetadata("TopLevelMembersAnnotatedKt") + public void testTopLevelMembersAnnotatedKt() throws Exception { + runTest("analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/TopLevelMembersAnnotatedKt/"); + } + + @Test + @TestMetadata("TopLevelMembersKt") + public void testTopLevelMembersKt() throws Exception { + runTest("analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/TopLevelMembersKt/"); + } + + @Test + @TestMetadata("TypeAliases") + public void testTypeAliases() throws Exception { + runTest("analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/TypeAliases/"); + } + + @Test + @TestMetadata("TypeBoundsAndDelegationSpecifiers") + public void testTypeBoundsAndDelegationSpecifiers() throws Exception { + runTest("analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/TypeBoundsAndDelegationSpecifiers/"); + } + + @Test + @TestMetadata("TypeModifiers") + public void testTypeModifiers() throws Exception { + runTest("analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/TypeModifiers/"); + } + + @Test + @TestMetadata("TypeParams") + public void testTypeParams() throws Exception { + runTest("analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/TypeParams/"); + } + + @Test + @TestMetadata("Types") + public void testTypes() throws Exception { + runTest("analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/Types/"); + } +} diff --git a/analysis/decompiled/decompiler-to-psi/build.gradle.kts b/analysis/decompiled/decompiler-to-psi/build.gradle.kts index 05187cb05b1..33e40eb5b7f 100644 --- a/analysis/decompiled/decompiler-to-psi/build.gradle.kts +++ b/analysis/decompiled/decompiler-to-psi/build.gradle.kts @@ -8,8 +8,8 @@ dependencies { implementation(project(":compiler:frontend.java")) implementation(project(":core:compiler.common")) implementation(project(":compiler:light-classes")) - implementation(project(":compiler:psi:cls-psi-stub-builder")) - implementation(project(":compiler:psi:cls-psi-file-stub-builder")) + implementation(project(":analysis:decompiled:decompiler-to-stubs")) + implementation(project(":analysis:decompiled:decompiler-to-file-stubs")) implementation(intellijCore()) } diff --git a/analysis/decompiled/decompiler-to-psi/src/org/jetbrains/kotlin/analysis/decompiler/psi/DeserializerForClassfileDecompiler.kt b/analysis/decompiled/decompiler-to-psi/src/org/jetbrains/kotlin/analysis/decompiler/psi/DeserializerForClassfileDecompiler.kt index 2c3078b8fb7..1fbdd92962a 100644 --- a/analysis/decompiled/decompiler-to-psi/src/org/jetbrains/kotlin/analysis/decompiler/psi/DeserializerForClassfileDecompiler.kt +++ b/analysis/decompiled/decompiler-to-psi/src/org/jetbrains/kotlin/analysis/decompiler/psi/DeserializerForClassfileDecompiler.kt @@ -7,19 +7,22 @@ package org.jetbrains.kotlin.analysis.decompiler.psi import com.intellij.openapi.diagnostic.Logger import com.intellij.openapi.vfs.VirtualFile +import org.jetbrains.kotlin.analysis.decompiler.stub.file.ClsKotlinBinaryClassCache +import org.jetbrains.kotlin.analysis.decompiler.stub.file.DirectoryBasedClassFinder +import org.jetbrains.kotlin.analysis.decompiler.stub.file.DirectoryBasedDataFinder import org.jetbrains.kotlin.builtins.DefaultBuiltIns import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.contracts.ContractDeserializerImpl import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import org.jetbrains.kotlin.descriptors.NotFoundClasses import org.jetbrains.kotlin.incremental.components.LookupTracker -import org.jetbrains.kotlin.load.kotlin.* +import org.jetbrains.kotlin.load.kotlin.BinaryClassAnnotationAndConstantLoaderImpl +import org.jetbrains.kotlin.load.kotlin.JavaFlexibleTypeDeserializer +import org.jetbrains.kotlin.load.kotlin.JvmPackagePartSource +import org.jetbrains.kotlin.load.kotlin.findKotlinClass import org.jetbrains.kotlin.metadata.jvm.deserialization.JvmProtoBufUtil import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.FqName -import org.jetbrains.kotlin.psi.stubs.file.builder.ClsKotlinBinaryClassCache -import org.jetbrains.kotlin.psi.stubs.file.builder.DirectoryBasedClassFinder -import org.jetbrains.kotlin.psi.stubs.file.builder.DirectoryBasedDataFinder import org.jetbrains.kotlin.resolve.sam.SamConversionResolverImpl import org.jetbrains.kotlin.serialization.deserialization.DeserializationComponents import org.jetbrains.kotlin.serialization.deserialization.DeserializationConfiguration diff --git a/analysis/decompiled/decompiler-to-psi/src/org/jetbrains/kotlin/analysis/decompiler/psi/KotlinClassFileDecompiler.kt b/analysis/decompiled/decompiler-to-psi/src/org/jetbrains/kotlin/analysis/decompiler/psi/KotlinClassFileDecompiler.kt index 5c1a9f992ef..1502e86363d 100644 --- a/analysis/decompiled/decompiler-to-psi/src/org/jetbrains/kotlin/analysis/decompiler/psi/KotlinClassFileDecompiler.kt +++ b/analysis/decompiled/decompiler-to-psi/src/org/jetbrains/kotlin/analysis/decompiler/psi/KotlinClassFileDecompiler.kt @@ -9,9 +9,9 @@ import com.intellij.openapi.vfs.VirtualFile import com.intellij.psi.PsiManager import com.intellij.psi.compiled.ClassFileDecompilers import org.jetbrains.kotlin.analysis.decompiler.psi.file.KtClsFile -import org.jetbrains.kotlin.psi.stubs.file.builder.ClsClassFinder.isKotlinInternalCompiledFile -import org.jetbrains.kotlin.psi.stubs.file.builder.ClsKotlinBinaryClassCache -import org.jetbrains.kotlin.psi.stubs.file.builder.KotlinClsStubBuilder +import org.jetbrains.kotlin.analysis.decompiler.stub.file.ClsClassFinder.isKotlinInternalCompiledFile +import org.jetbrains.kotlin.analysis.decompiler.stub.file.ClsKotlinBinaryClassCache +import org.jetbrains.kotlin.analysis.decompiler.stub.file.KotlinClsStubBuilder class KotlinClassFileDecompiler : ClassFileDecompilers.Full() { private val stubBuilder = KotlinClsStubBuilder() diff --git a/analysis/decompiled/decompiler-to-psi/src/org/jetbrains/kotlin/analysis/decompiler/psi/ResolverForDecompiler.kt b/analysis/decompiled/decompiler-to-psi/src/org/jetbrains/kotlin/analysis/decompiler/psi/ResolverForDecompiler.kt index 1ff912d8a39..d961bc9dc76 100644 --- a/analysis/decompiled/decompiler-to-psi/src/org/jetbrains/kotlin/analysis/decompiler/psi/ResolverForDecompiler.kt +++ b/analysis/decompiled/decompiler-to-psi/src/org/jetbrains/kotlin/analysis/decompiler/psi/ResolverForDecompiler.kt @@ -2,10 +2,10 @@ package org.jetbrains.kotlin.analysis.decompiler.psi -import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import org.jetbrains.kotlin.name.ClassId +import org.jetbrains.kotlin.name.FqName interface ResolverForDecompiler { fun resolveTopLevelClass(classId: ClassId): ClassDescriptor? diff --git a/analysis/decompiled/decompiler-to-psi/src/org/jetbrains/kotlin/analysis/decompiler/psi/text/buildDecompiledTextForClassFile.kt b/analysis/decompiled/decompiler-to-psi/src/org/jetbrains/kotlin/analysis/decompiler/psi/text/buildDecompiledTextForClassFile.kt index e3fb82ea371..9239f706ebb 100644 --- a/analysis/decompiled/decompiler-to-psi/src/org/jetbrains/kotlin/analysis/decompiler/psi/text/buildDecompiledTextForClassFile.kt +++ b/analysis/decompiled/decompiler-to-psi/src/org/jetbrains/kotlin/analysis/decompiler/psi/text/buildDecompiledTextForClassFile.kt @@ -8,12 +8,12 @@ package org.jetbrains.kotlin.analysis.decompiler.psi.text import com.intellij.openapi.vfs.VirtualFile import org.jetbrains.kotlin.analysis.decompiler.psi.DeserializerForClassfileDecompiler import org.jetbrains.kotlin.analysis.decompiler.psi.ResolverForDecompiler +import org.jetbrains.kotlin.analysis.decompiler.stub.file.ClsClassFinder.findMultifileClassParts +import org.jetbrains.kotlin.analysis.decompiler.stub.file.ClsKotlinBinaryClassCache import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import org.jetbrains.kotlin.load.kotlin.header.KotlinClassHeader import org.jetbrains.kotlin.metadata.jvm.deserialization.JvmMetadataVersion import org.jetbrains.kotlin.name.FqName -import org.jetbrains.kotlin.psi.stubs.file.builder.ClsClassFinder.findMultifileClassParts -import org.jetbrains.kotlin.psi.stubs.file.builder.ClsKotlinBinaryClassCache import org.jetbrains.kotlin.renderer.DescriptorRenderer import org.jetbrains.kotlin.types.asFlexibleType import org.jetbrains.kotlin.types.isFlexible diff --git a/compiler/psi/cls-psi-stub-builder/build.gradle.kts b/analysis/decompiled/decompiler-to-stubs/build.gradle.kts similarity index 100% rename from compiler/psi/cls-psi-stub-builder/build.gradle.kts rename to analysis/decompiled/decompiler-to-stubs/build.gradle.kts diff --git a/compiler/psi/cls-psi-stub-builder/src/org/jetbrains/kotlin/psi/stubs/builder/CallableClsStubBuilder.kt b/analysis/decompiled/decompiler-to-stubs/src/org/jetbrains/kotlin/analysis/decompiler/stub/CallableClsStubBuilder.kt similarity index 99% rename from compiler/psi/cls-psi-stub-builder/src/org/jetbrains/kotlin/psi/stubs/builder/CallableClsStubBuilder.kt rename to analysis/decompiled/decompiler-to-stubs/src/org/jetbrains/kotlin/analysis/decompiler/stub/CallableClsStubBuilder.kt index 021221504fb..d59b623d251 100644 --- a/compiler/psi/cls-psi-stub-builder/src/org/jetbrains/kotlin/psi/stubs/builder/CallableClsStubBuilder.kt +++ b/analysis/decompiled/decompiler-to-stubs/src/org/jetbrains/kotlin/analysis/decompiler/stub/CallableClsStubBuilder.kt @@ -1,9 +1,10 @@ // Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. -package org.jetbrains.kotlin.psi.stubs.builder +package org.jetbrains.kotlin.analysis.decompiler.stub import com.intellij.psi.PsiElement import com.intellij.psi.stubs.StubElement +import org.jetbrains.kotlin.analysis.decompiler.stub.flags.* import org.jetbrains.kotlin.descriptors.annotations.AnnotationUseSiteTarget import org.jetbrains.kotlin.metadata.ProtoBuf import org.jetbrains.kotlin.metadata.ProtoBuf.MemberKind @@ -13,7 +14,6 @@ import org.jetbrains.kotlin.metadata.deserialization.hasReceiver import org.jetbrains.kotlin.metadata.deserialization.receiverType import org.jetbrains.kotlin.metadata.deserialization.returnType import org.jetbrains.kotlin.name.Name -import org.jetbrains.kotlin.psi.stubs.builder.flags.* import org.jetbrains.kotlin.psi.stubs.elements.KtStubElementTypes import org.jetbrains.kotlin.psi.stubs.impl.KotlinFunctionStubImpl import org.jetbrains.kotlin.psi.stubs.impl.KotlinPlaceHolderStubImpl diff --git a/compiler/psi/cls-psi-stub-builder/src/org/jetbrains/kotlin/psi/stubs/builder/ClassClsStubBuilder.kt b/analysis/decompiled/decompiler-to-stubs/src/org/jetbrains/kotlin/analysis/decompiler/stub/ClassClsStubBuilder.kt similarity index 99% rename from compiler/psi/cls-psi-stub-builder/src/org/jetbrains/kotlin/psi/stubs/builder/ClassClsStubBuilder.kt rename to analysis/decompiled/decompiler-to-stubs/src/org/jetbrains/kotlin/analysis/decompiler/stub/ClassClsStubBuilder.kt index 5c7f9fadfe7..3986c98b972 100644 --- a/compiler/psi/cls-psi-stub-builder/src/org/jetbrains/kotlin/psi/stubs/builder/ClassClsStubBuilder.kt +++ b/analysis/decompiled/decompiler-to-stubs/src/org/jetbrains/kotlin/analysis/decompiler/stub/ClassClsStubBuilder.kt @@ -1,10 +1,11 @@ // Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. -package org.jetbrains.kotlin.psi.stubs.builder +package org.jetbrains.kotlin.analysis.decompiler.stub import com.intellij.openapi.diagnostic.Logger import com.intellij.psi.PsiElement import com.intellij.psi.stubs.StubElement +import org.jetbrains.kotlin.analysis.decompiler.stub.flags.* import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.builtins.isNumberedFunctionClassFqName import org.jetbrains.kotlin.descriptors.SourceElement @@ -19,7 +20,6 @@ import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.psi.KtClassBody import org.jetbrains.kotlin.psi.KtSuperTypeEntry import org.jetbrains.kotlin.psi.KtSuperTypeList -import org.jetbrains.kotlin.psi.stubs.builder.flags.* import org.jetbrains.kotlin.psi.stubs.elements.KtClassElementType import org.jetbrains.kotlin.psi.stubs.elements.KtStubElementTypes import org.jetbrains.kotlin.psi.stubs.impl.KotlinClassStubImpl diff --git a/compiler/psi/cls-psi-stub-builder/src/org/jetbrains/kotlin/psi/stubs/builder/ClsStubBuilderContext.kt b/analysis/decompiled/decompiler-to-stubs/src/org/jetbrains/kotlin/analysis/decompiler/stub/ClsStubBuilderContext.kt similarity index 88% rename from compiler/psi/cls-psi-stub-builder/src/org/jetbrains/kotlin/psi/stubs/builder/ClsStubBuilderContext.kt rename to analysis/decompiled/decompiler-to-stubs/src/org/jetbrains/kotlin/analysis/decompiler/stub/ClsStubBuilderContext.kt index af61011422d..32ccb2b4848 100644 --- a/compiler/psi/cls-psi-stub-builder/src/org/jetbrains/kotlin/psi/stubs/builder/ClsStubBuilderContext.kt +++ b/analysis/decompiled/decompiler-to-stubs/src/org/jetbrains/kotlin/analysis/decompiler/stub/ClsStubBuilderContext.kt @@ -1,6 +1,6 @@ // Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. -package org.jetbrains.kotlin.psi.stubs.builder +package org.jetbrains.kotlin.analysis.decompiler.stub import com.intellij.openapi.vfs.VirtualFile import org.jetbrains.kotlin.descriptors.annotations.AnnotationUseSiteTarget @@ -10,7 +10,10 @@ import org.jetbrains.kotlin.metadata.deserialization.TypeTable import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.Name -import org.jetbrains.kotlin.serialization.deserialization.* +import org.jetbrains.kotlin.serialization.deserialization.AnnotationLoader +import org.jetbrains.kotlin.serialization.deserialization.ClassDataFinder +import org.jetbrains.kotlin.serialization.deserialization.ProtoContainer +import org.jetbrains.kotlin.serialization.deserialization.getName data class ClassIdWithTarget(val classId: ClassId, val target: AnnotationUseSiteTarget?) diff --git a/compiler/psi/cls-psi-stub-builder/src/org/jetbrains/kotlin/psi/stubs/builder/TypeClsStubBuilder.kt b/analysis/decompiled/decompiler-to-stubs/src/org/jetbrains/kotlin/analysis/decompiler/stub/TypeClsStubBuilder.kt similarity index 99% rename from compiler/psi/cls-psi-stub-builder/src/org/jetbrains/kotlin/psi/stubs/builder/TypeClsStubBuilder.kt rename to analysis/decompiled/decompiler-to-stubs/src/org/jetbrains/kotlin/analysis/decompiler/stub/TypeClsStubBuilder.kt index 97da5b14908..d2f4ff65e33 100644 --- a/compiler/psi/cls-psi-stub-builder/src/org/jetbrains/kotlin/psi/stubs/builder/TypeClsStubBuilder.kt +++ b/analysis/decompiled/decompiler-to-stubs/src/org/jetbrains/kotlin/analysis/decompiler/stub/TypeClsStubBuilder.kt @@ -1,6 +1,6 @@ // Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. -package org.jetbrains.kotlin.psi.stubs.builder +package org.jetbrains.kotlin.analysis.decompiler.stub import com.intellij.psi.PsiElement import com.intellij.psi.stubs.StubElement @@ -26,7 +26,6 @@ import org.jetbrains.kotlin.serialization.deserialization.ProtoContainer import org.jetbrains.kotlin.serialization.deserialization.getClassId import org.jetbrains.kotlin.serialization.deserialization.getName import org.jetbrains.kotlin.utils.doNothing -import java.util.* // TODO: see DescriptorRendererOptions.excludedTypeAnnotationClasses for decompiler private val ANNOTATIONS_NOT_LOADED_FOR_TYPES = setOf(StandardNames.FqNames.parameterName) diff --git a/compiler/psi/cls-psi-stub-builder/src/org/jetbrains/kotlin/psi/stubs/builder/clsStubBuilding.kt b/analysis/decompiled/decompiler-to-stubs/src/org/jetbrains/kotlin/analysis/decompiler/stub/clsStubBuilding.kt similarity index 98% rename from compiler/psi/cls-psi-stub-builder/src/org/jetbrains/kotlin/psi/stubs/builder/clsStubBuilding.kt rename to analysis/decompiled/decompiler-to-stubs/src/org/jetbrains/kotlin/analysis/decompiler/stub/clsStubBuilding.kt index 01a976e8610..716c0f03c8c 100644 --- a/compiler/psi/cls-psi-stub-builder/src/org/jetbrains/kotlin/psi/stubs/builder/clsStubBuilding.kt +++ b/analysis/decompiled/decompiler-to-stubs/src/org/jetbrains/kotlin/analysis/decompiler/stub/clsStubBuilding.kt @@ -1,13 +1,13 @@ // Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. -package org.jetbrains.kotlin.psi.stubs.builder +package org.jetbrains.kotlin.analysis.decompiler.stub import com.intellij.psi.PsiElement import com.intellij.psi.stubs.StubElement import com.intellij.util.io.StringRef +import org.jetbrains.kotlin.analysis.decompiler.stub.flags.FlagsToModifiers import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.descriptors.SourceElement -import org.jetbrains.kotlin.psi.stubs.builder.flags.FlagsToModifiers import org.jetbrains.kotlin.lexer.KtModifierKeywordToken import org.jetbrains.kotlin.load.kotlin.JvmPackagePartSource import org.jetbrains.kotlin.load.kotlin.KotlinJvmBinaryClass diff --git a/compiler/psi/cls-psi-stub-builder/src/org/jetbrains/kotlin/psi/stubs/builder/flags/flags.kt b/analysis/decompiled/decompiler-to-stubs/src/org/jetbrains/kotlin/analysis/decompiler/stub/flags/flags.kt similarity index 97% rename from compiler/psi/cls-psi-stub-builder/src/org/jetbrains/kotlin/psi/stubs/builder/flags/flags.kt rename to analysis/decompiled/decompiler-to-stubs/src/org/jetbrains/kotlin/analysis/decompiler/stub/flags/flags.kt index 56ed427ded5..20bbf3ee6d4 100644 --- a/compiler/psi/cls-psi-stub-builder/src/org/jetbrains/kotlin/psi/stubs/builder/flags/flags.kt +++ b/analysis/decompiled/decompiler-to-stubs/src/org/jetbrains/kotlin/analysis/decompiler/stub/flags/flags.kt @@ -1,9 +1,8 @@ // Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. -package org.jetbrains.kotlin.psi.stubs.builder.flags +package org.jetbrains.kotlin.analysis.decompiler.stub.flags import org.jetbrains.kotlin.lexer.KtModifierKeywordToken -import org.jetbrains.kotlin.lexer.KtToken import org.jetbrains.kotlin.lexer.KtTokens import org.jetbrains.kotlin.metadata.ProtoBuf import org.jetbrains.kotlin.metadata.deserialization.Flags diff --git a/compiler/psi/cls-psi-stub-builder/src/org/jetbrains/kotlin/psi/stubs/builder/typeAliasClsStubBuilding.kt b/analysis/decompiled/decompiler-to-stubs/src/org/jetbrains/kotlin/analysis/decompiler/stub/typeAliasClsStubBuilding.kt similarity index 94% rename from compiler/psi/cls-psi-stub-builder/src/org/jetbrains/kotlin/psi/stubs/builder/typeAliasClsStubBuilding.kt rename to analysis/decompiled/decompiler-to-stubs/src/org/jetbrains/kotlin/analysis/decompiler/stub/typeAliasClsStubBuilding.kt index 84d8b6b02b1..84ee3bfdec2 100644 --- a/compiler/psi/cls-psi-stub-builder/src/org/jetbrains/kotlin/psi/stubs/builder/typeAliasClsStubBuilding.kt +++ b/analysis/decompiled/decompiler-to-stubs/src/org/jetbrains/kotlin/analysis/decompiler/stub/typeAliasClsStubBuilding.kt @@ -1,10 +1,10 @@ // Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. -package org.jetbrains.kotlin.psi.stubs.builder +package org.jetbrains.kotlin.analysis.decompiler.stub import com.intellij.psi.PsiElement import com.intellij.psi.stubs.StubElement -import org.jetbrains.kotlin.psi.stubs.builder.flags.VISIBILITY +import org.jetbrains.kotlin.analysis.decompiler.stub.flags.VISIBILITY import org.jetbrains.kotlin.metadata.ProtoBuf import org.jetbrains.kotlin.metadata.deserialization.Flags import org.jetbrains.kotlin.metadata.deserialization.underlyingType diff --git a/compiler/psi/cls-psi-file-stub-builder/tests/org/jetbrains/kotlin/psi/stubs/file/builder/ClsStubBuilderTestGenerated.java b/compiler/psi/cls-psi-file-stub-builder/tests/org/jetbrains/kotlin/psi/stubs/file/builder/ClsStubBuilderTestGenerated.java deleted file mode 100644 index d9891004bdd..00000000000 --- a/compiler/psi/cls-psi-file-stub-builder/tests/org/jetbrains/kotlin/psi/stubs/file/builder/ClsStubBuilderTestGenerated.java +++ /dev/null @@ -1,236 +0,0 @@ -/* - * 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.file.builder; - -import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.KotlinTestUtils; -import org.jetbrains.kotlin.test.util.KtTestUtil; -import org.jetbrains.kotlin.test.TestMetadata; -import org.junit.runner.RunWith; - -import java.io.File; -import java.util.regex.Pattern; - -/** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ -@SuppressWarnings("all") -@TestMetadata("compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder") -@TestDataPath("$PROJECT_ROOT") -@RunWith(JUnit3RunnerWithInners.class) -public class ClsStubBuilderTestGenerated extends AbstractClsStubBuilderTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); - } - - public void testAllFilesPresentInClsFileStubBuilder() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder"), Pattern.compile("^([^\\.]+)$"), null, false); - } - - @TestMetadata("AnnotatedFlexibleTypes") - public void testAnnotatedFlexibleTypes() throws Exception { - runTest("compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/AnnotatedFlexibleTypes/"); - } - - @TestMetadata("AnnotatedParameterInEnumConstructor") - public void testAnnotatedParameterInEnumConstructor() throws Exception { - runTest("compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/AnnotatedParameterInEnumConstructor/"); - } - - @TestMetadata("AnnotatedParameterInInnerClassConstructor") - public void testAnnotatedParameterInInnerClassConstructor() throws Exception { - runTest("compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/AnnotatedParameterInInnerClassConstructor/"); - } - - @TestMetadata("AnnotationClass") - public void testAnnotationClass() throws Exception { - runTest("compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/AnnotationClass/"); - } - - @TestMetadata("AnnotationValues") - public void testAnnotationValues() throws Exception { - runTest("compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/AnnotationValues/"); - } - - @TestMetadata("Annotations") - public void testAnnotations() throws Exception { - runTest("compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/Annotations/"); - } - - @TestMetadata("AnnotationsOnNullableTypes") - public void testAnnotationsOnNullableTypes() throws Exception { - runTest("compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/AnnotationsOnNullableTypes/"); - } - - @TestMetadata("AnnotationsOnParenthesizedTypes") - public void testAnnotationsOnParenthesizedTypes() throws Exception { - runTest("compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/AnnotationsOnParenthesizedTypes/"); - } - - @TestMetadata("AnonymousReturnWithGenericType") - public void testAnonymousReturnWithGenericType() throws Exception { - runTest("compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/AnonymousReturnWithGenericType/"); - } - - @TestMetadata("ClassMembers") - public void testClassMembers() throws Exception { - runTest("compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/ClassMembers/"); - } - - @TestMetadata("ClassObject") - public void testClassObject() throws Exception { - runTest("compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/ClassObject/"); - } - - @TestMetadata("Const") - public void testConst() throws Exception { - runTest("compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/Const/"); - } - - @TestMetadata("Contracts") - public void testContracts() throws Exception { - runTest("compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/Contracts/"); - } - - @TestMetadata("DataClass") - public void testDataClass() throws Exception { - runTest("compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/DataClass/"); - } - - @TestMetadata("Delegation") - public void testDelegation() throws Exception { - runTest("compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/Delegation/"); - } - - @TestMetadata("DependencyOnNestedClasses") - public void testDependencyOnNestedClasses() throws Exception { - runTest("compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/DependencyOnNestedClasses/"); - } - - @TestMetadata("Enum") - public void testEnum() throws Exception { - runTest("compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/Enum/"); - } - - @TestMetadata("FlexibleTypes") - public void testFlexibleTypes() throws Exception { - runTest("compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/FlexibleTypes/"); - } - - @TestMetadata("FunInterfaceDeclaration") - public void testFunInterfaceDeclaration() throws Exception { - runTest("compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/FunInterfaceDeclaration/"); - } - - @TestMetadata("InheritingClasses") - public void testInheritingClasses() throws Exception { - runTest("compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/InheritingClasses/"); - } - - @TestMetadata("InnerClassEnumEntry") - public void testInnerClassEnumEntry() throws Exception { - runTest("compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/InnerClassEnumEntry/"); - } - - @TestMetadata("InnerTypes") - public void testInnerTypes() throws Exception { - runTest("compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/InnerTypes/"); - } - - @TestMetadata("LocalClass") - public void testLocalClass() throws Exception { - runTest("compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/LocalClass/"); - } - - @TestMetadata("Modifiers") - public void testModifiers() throws Exception { - runTest("compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/Modifiers/"); - } - - @TestMetadata("MultifileClass") - public void testMultifileClass() throws Exception { - runTest("compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/MultifileClass/"); - } - - @TestMetadata("NamedCompanionObject") - public void testNamedCompanionObject() throws Exception { - runTest("compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/NamedCompanionObject/"); - } - - @TestMetadata("NestedClasses") - public void testNestedClasses() throws Exception { - runTest("compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/NestedClasses/"); - } - - @TestMetadata("Objects") - public void testObjects() throws Exception { - runTest("compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/Objects/"); - } - - @TestMetadata("PrivateConstField") - public void testPrivateConstField() throws Exception { - runTest("compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/PrivateConstField/"); - } - - @TestMetadata("PrivateToThis") - public void testPrivateToThis() throws Exception { - runTest("compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/PrivateToThis/"); - } - - @TestMetadata("Sealed") - public void testSealed() throws Exception { - runTest("compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/Sealed/"); - } - - @TestMetadata("SecondaryConstructors") - public void testSecondaryConstructors() throws Exception { - runTest("compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/SecondaryConstructors/"); - } - - @TestMetadata("SuspendLambda") - public void testSuspendLambda() throws Exception { - runTest("compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/SuspendLambda/"); - } - - @TestMetadata("TopJvmPackageName") - public void testTopJvmPackageName() throws Exception { - runTest("compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/TopJvmPackageName/"); - } - - @TestMetadata("TopLevelMembersAnnotatedKt") - public void testTopLevelMembersAnnotatedKt() throws Exception { - runTest("compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/TopLevelMembersAnnotatedKt/"); - } - - @TestMetadata("TopLevelMembersKt") - public void testTopLevelMembersKt() throws Exception { - runTest("compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/TopLevelMembersKt/"); - } - - @TestMetadata("TypeAliases") - public void testTypeAliases() throws Exception { - runTest("compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/TypeAliases/"); - } - - @TestMetadata("TypeBoundsAndDelegationSpecifiers") - public void testTypeBoundsAndDelegationSpecifiers() throws Exception { - runTest("compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/TypeBoundsAndDelegationSpecifiers/"); - } - - @TestMetadata("TypeModifiers") - public void testTypeModifiers() throws Exception { - runTest("compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/TypeModifiers/"); - } - - @TestMetadata("TypeParams") - public void testTypeParams() throws Exception { - runTest("compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/TypeParams/"); - } - - @TestMetadata("Types") - public void testTypes() throws Exception { - runTest("compiler/psi/cls-psi-file-stub-builder/testData/clsFileStubBuilder/Types/"); - } -} diff --git a/generators/analysis-api-generator/build.gradle.kts b/generators/analysis-api-generator/build.gradle.kts index c9d2cf68f2a..67670701de3 100644 --- a/generators/analysis-api-generator/build.gradle.kts +++ b/generators/analysis-api-generator/build.gradle.kts @@ -17,6 +17,7 @@ dependencies { testApi(projectTests("::analysis:low-level-api-fir")) testApi(projectTests(":analysis:analysis-api-fir")) testApi(projectTests(":analysis:analysis-api-fe10")) + testApi(projectTests(":analysis:decompiled:decompiler-to-file-stubs")) testApi(intellijCore()) testApiJUnit5() } diff --git a/generators/build.gradle.kts b/generators/build.gradle.kts index f28293a2488..26f2bb8b4b3 100644 --- a/generators/build.gradle.kts +++ b/generators/build.gradle.kts @@ -76,7 +76,6 @@ dependencies { testImplementation(projectTests(":compiler:test-infrastructure")) testImplementation(projectTests(":compiler:tests-common-new")) testImplementation(projectTests(":js:js.tests")) - testImplementation(projectTests(":compiler:psi:cls-psi-file-stub-builder")) testApiJUnit5() if (Ide.IJ()) { diff --git a/settings.gradle b/settings.gradle index 5bf2dcc31a0..5a1f5093ca8 100644 --- a/settings.gradle +++ b/settings.gradle @@ -112,6 +112,7 @@ include ":benchmarks", ":compiler:resolution.common.jvm", ":compiler:resolution", ":compiler:serialization", + ":compiler:psi", ":compiler:visualizer", ":compiler:visualizer:common", ":compiler:visualizer:render-fir", @@ -292,10 +293,6 @@ include ":benchmarks", ":kotlin-serialization-unshaded", ":wasm:wasm.ir" -include ":compiler:psi", - ":compiler:psi:cls-psi-stub-builder", - ":compiler:psi:cls-psi-file-stub-builder" - include ":kotlinx-atomicfu-compiler-plugin", ":kotlinx-atomicfu-runtime", @@ -500,6 +497,8 @@ include ":generators:analysis-api-generator", ":analysis:project-structure", ":analysis:analysis-api-fe10", ":analysis:decompiled:decompiler-to-psi", + ":analysis:decompiled:decompiler-to-stubs", + ":analysis:decompiled:decompiler-to-file-stubs", ":analysis:decompiled:light-classes-for-decompiled", ":analysis:decompiled:light-classes-for-decompiled-fe10"