From 742c3de112c6b16a298df17fe4552f16e601c389 Mon Sep 17 00:00:00 2001 From: Dmitrii Gridin Date: Thu, 22 Dec 2022 13:36:16 +0100 Subject: [PATCH] [LC] rename lightClasses/lightClasses to lightClasses/lightClassByFqName --- .../AnnotatedParameterInEnumConstructor.java | 0 .../AnnotatedParameterInEnumConstructor.kt | 0 .../AnnotatedParameterInInnerClassConstructor.java | 0 .../AnnotatedParameterInInnerClassConstructor.kt | 0 .../AnnotatedPropertyWithSites.fir.java | 0 .../AnnotatedPropertyWithSites.java | 0 .../AnnotatedPropertyWithSites.kt | 0 .../AnnotationClass.fir.java | 0 .../AnnotationClass.java | 0 .../AnnotationClass.kt | 0 .../AnnotationJavaRepeatable.java | 0 .../AnnotationJavaRepeatable.kt | 0 .../AnnotationJvmRepeatable.java | 0 .../AnnotationJvmRepeatable.kt | 0 .../AnnotationKotlinAndJavaRepeatable.java | 0 .../AnnotationKotlinAndJavaRepeatable.kt | 0 .../AnnotationKotlinAndJvmRepeatable.java | 0 .../AnnotationKotlinAndJvmRepeatable.kt | 0 .../AnnotationRepeatable.java | 0 .../AnnotationRepeatable.kt | 0 .../Constructors.java | 0 .../{lightClasses => lightClassByFqName}/Constructors.kt | 0 .../DataClassWithCustomImplementedMembers.fir.java | 0 .../DataClassWithCustomImplementedMembers.java | 0 .../DataClassWithCustomImplementedMembers.kt | 0 .../DelegatedNested.fir.java | 0 .../DelegatedNested.java | 0 .../DelegatedNested.kt | 0 .../Delegation.fir.java | 0 .../{lightClasses => lightClassByFqName}/Delegation.java | 0 .../{lightClasses => lightClassByFqName}/Delegation.kt | 0 .../DeprecatedEnumEntry.java | 0 .../DeprecatedEnumEntry.kt | 0 .../DeprecatedNotHiddenInClass.java | 0 .../DeprecatedNotHiddenInClass.kt | 0 .../DollarsInName.java | 0 .../{lightClasses => lightClassByFqName}/DollarsInName.kt | 0 .../DollarsInNameNoPackage.java | 0 .../DollarsInNameNoPackage.kt | 0 .../{lightClasses => lightClassByFqName}/EnumClass.java | 0 .../{lightClasses => lightClassByFqName}/EnumClass.kt | 0 .../EnumClassWithEnumEntries.java | 0 .../EnumClassWithEnumEntries.kt | 0 .../EnumEntry.compiled.java | 0 .../EnumEntry.fir.java | 0 .../{lightClasses => lightClassByFqName}/EnumEntry.java | 0 .../{lightClasses => lightClassByFqName}/EnumEntry.kt | 0 .../EnumEntry.lib.java | 0 .../ExtendingInterfaceWithDefaultImpls.fir.java | 0 .../ExtendingInterfaceWithDefaultImpls.java | 0 .../ExtendingInterfaceWithDefaultImpls.kt | 0 .../HiddenDeprecated.java | 0 .../HiddenDeprecated.kt | 0 .../HiddenDeprecatedInClass.java | 0 .../HiddenDeprecatedInClass.kt | 0 .../InheritingInterfaceDefaultImpls.compiled.java | 0 .../InheritingInterfaceDefaultImpls.fir.java | 0 .../InheritingInterfaceDefaultImpls.java | 0 .../InheritingInterfaceDefaultImpls.kt | 0 .../InheritingInterfaceDefaultImpls.lib.java | 0 .../InlineReified.java | 0 .../{lightClasses => lightClassByFqName}/InlineReified.kt | 0 .../{lightClasses => lightClassByFqName}/JavaBetween.java | 0 .../{lightClasses => lightClassByFqName}/JavaBetween.kt | 0 .../JvmNameOnMember.java | 0 .../JvmNameOnMember.kt | 0 .../{lightClasses => lightClassByFqName}/JvmStatic.java | 0 .../{lightClasses => lightClassByFqName}/JvmStatic.kt | 0 .../LocalFunctions.java | 0 .../LocalFunctions.kt | 0 .../LocalFunctions.lib.java | 0 .../NestedObjects.java | 0 .../{lightClasses => lightClassByFqName}/NestedObjects.kt | 0 .../NonDataClassWithComponentFunctions.fir.java | 0 .../NonDataClassWithComponentFunctions.java | 0 .../NonDataClassWithComponentFunctions.kt | 0 .../OnlySecondaryConstructors.java | 0 .../OnlySecondaryConstructors.kt | 0 .../PublishedApi.java | 0 .../{lightClasses => lightClassByFqName}/PublishedApi.kt | 0 .../SpecialAnnotationsOnAnnotationClass.java | 0 .../SpecialAnnotationsOnAnnotationClass.kt | 0 .../StubOrderForOverloads.java | 0 .../StubOrderForOverloads.kt | 0 .../TypePararametersInClass.java | 0 .../TypePararametersInClass.kt | 0 .../{lightClasses => lightClassByFqName}/VarArgs.java | 0 .../{lightClasses => lightClassByFqName}/VarArgs.kt | 0 .../compilationErrors/ActualClass.java | 0 .../compilationErrors/ActualClass.kt | 0 .../compilationErrors/ActualTypeAlias.java | 0 .../compilationErrors/ActualTypeAlias.kt | 0 .../ActualTypeAliasCustomJvmPackageName.fir.java | 0 .../ActualTypeAliasCustomJvmPackageName.java | 0 .../ActualTypeAliasCustomJvmPackageName.kt | 0 .../compilationErrors/AllInlineOnly.java | 0 .../compilationErrors/AllInlineOnly.kt | 0 .../compilationErrors/AnnotationModifiers.fir.java | 0 .../compilationErrors/AnnotationModifiers.java | 0 .../compilationErrors/AnnotationModifiers.kt | 0 .../compilationErrors/EnumNameOverride.java | 0 .../compilationErrors/EnumNameOverride.kt | 0 .../compilationErrors/ExpectClass.java | 0 .../compilationErrors/ExpectClass.kt | 0 .../compilationErrors/ExpectObject.java | 0 .../compilationErrors/ExpectObject.kt | 0 .../compilationErrors/ExpectedNestedClass.java | 0 .../compilationErrors/ExpectedNestedClass.kt | 0 .../compilationErrors/ExpectedNestedClassInObject.java | 0 .../compilationErrors/ExpectedNestedClassInObject.kt | 0 .../compilationErrors/FunctionWithoutName.fir.java | 0 .../compilationErrors/FunctionWithoutName.java | 0 .../compilationErrors/FunctionWithoutName.kt | 0 .../compilationErrors/JvmPackageName.fir.java | 0 .../compilationErrors/JvmPackageName.java | 0 .../compilationErrors/JvmPackageName.kt | 0 .../compilationErrors/LocalInAnnotation.java | 0 .../compilationErrors/LocalInAnnotation.kt | 0 .../compilationErrors/PrivateInTrait.fir.java | 0 .../compilationErrors/PrivateInTrait.java | 0 .../compilationErrors/PrivateInTrait.kt | 0 .../compilationErrors/PropertyWithoutName.java | 0 .../compilationErrors/PropertyWithoutName.kt | 0 .../compilationErrors/RepetableAnnotations.java | 0 .../compilationErrors/RepetableAnnotations.kt | 0 .../compilationErrors/SameName.java | 0 .../compilationErrors/SameName.kt | 0 .../compilationErrors/TopLevelDestructuring.java | 0 .../compilationErrors/TopLevelDestructuring.kt | 0 .../compilationErrors/TraitClassObjectField.java | 0 .../compilationErrors/TraitClassObjectField.kt | 0 .../compilationErrors/TwoOverrides.fir.java | 0 .../compilationErrors/TwoOverrides.java | 0 .../compilationErrors/TwoOverrides.kt | 0 .../compilationErrors/WrongAnnotations.fir.java | 0 .../compilationErrors/WrongAnnotations.java | 0 .../compilationErrors/WrongAnnotations.kt | 0 .../delegation/Function.fir.java | 0 .../delegation/Function.java | 0 .../delegation/Function.kt | 0 .../delegation/Property.fir.java | 0 .../delegation/Property.java | 0 .../delegation/Property.kt | 0 .../delegation/WithPlatformTypes.NoCompile.java | 0 .../delegation/WithPlatformTypes.NoCompile.kt | 0 .../facades/AllPrivate.java | 0 .../facades/AllPrivate.kt | 0 .../facades/EmptyFile.NoCompile.java | 0 .../facades/EmptyFile.NoCompile.kt | 0 .../facades/MultiFile.java | 0 .../facades/MultiFile.kt | 0 .../facades/SingleFile.java | 0 .../facades/SingleFile.kt | 0 .../facades/SingleJvmClassName.java | 0 .../facades/SingleJvmClassName.kt | 0 .../ideRegression/AllOpenAnnotatedClasses.fir.java | 0 .../ideRegression/AllOpenAnnotatedClasses.java | 0 .../ideRegression/AllOpenAnnotatedClasses.kt | 0 .../ImplementingCharSequenceAndNumber.fir.java | 0 .../ideRegression/ImplementingCharSequenceAndNumber.java | 0 .../ideRegression/ImplementingCharSequenceAndNumber.kt | 0 .../ideRegression/ImplementingMap.fir.java | 0 .../ideRegression/ImplementingMap.java | 0 .../ideRegression/ImplementingMap.kt | 0 .../ideRegression/ImplementingMutableSet.fir.java | 0 .../ideRegression/ImplementingMutableSet.java | 0 .../ideRegression/ImplementingMutableSet.kt | 0 .../InheritingInterfaceDefaultImpls.fir.java | 0 .../ideRegression/InheritingInterfaceDefaultImpls.java | 0 .../ideRegression/InheritingInterfaceDefaultImpls.kt | 0 .../InheritingInterfaceDefaultImpls.lib.java | 0 .../ideRegression/OverridingFinalInternal.extra.kt | 0 .../ideRegression/OverridingFinalInternal.fir.java | 0 .../ideRegression/OverridingFinalInternal.java | 0 .../ideRegression/OverridingFinalInternal.kt | 0 .../ideRegression/OverridingInternal.extra.kt | 0 .../ideRegression/OverridingInternal.fir.java | 0 .../ideRegression/OverridingInternal.java | 0 .../ideRegression/OverridingInternal.kt | 0 .../ideRegression/OverridingProtected.extra.kt | 0 .../ideRegression/OverridingProtected.fir.java | 0 .../ideRegression/OverridingProtected.java | 0 .../ideRegression/OverridingProtected.kt | 0 .../nullabilityAnnotations/Class.java | 0 .../nullabilityAnnotations/Class.kt | 0 .../nullabilityAnnotations/ClassObjectField.java | 0 .../nullabilityAnnotations/ClassObjectField.kt | 0 .../nullabilityAnnotations/ClassWithConstructor.java | 0 .../nullabilityAnnotations/ClassWithConstructor.kt | 0 .../ClassWithConstructorAndProperties.java | 0 .../ClassWithConstructorAndProperties.kt | 0 .../nullabilityAnnotations/FileFacade.java | 0 .../nullabilityAnnotations/FileFacade.kt | 0 .../nullabilityAnnotations/Generic.java | 0 .../nullabilityAnnotations/Generic.kt | 0 .../nullabilityAnnotations/IntOverridesAny.fir.java | 0 .../nullabilityAnnotations/IntOverridesAny.java | 0 .../nullabilityAnnotations/IntOverridesAny.kt | 0 .../nullabilityAnnotations/JvmOverloads.java | 0 .../nullabilityAnnotations/JvmOverloads.kt | 0 .../nullabilityAnnotations/NullableUnitReturn.java | 0 .../nullabilityAnnotations/NullableUnitReturn.kt | 0 .../nullabilityAnnotations/OverrideAnyWithUnit.fir.java | 0 .../nullabilityAnnotations/OverrideAnyWithUnit.java | 0 .../nullabilityAnnotations/OverrideAnyWithUnit.kt | 0 .../nullabilityAnnotations/PlatformTypes.java | 0 .../nullabilityAnnotations/PlatformTypes.kt | 0 .../nullabilityAnnotations/Primitives.java | 0 .../nullabilityAnnotations/Primitives.kt | 0 .../nullabilityAnnotations/PrivateInClass.java | 0 .../nullabilityAnnotations/PrivateInClass.kt | 0 .../nullabilityAnnotations/Synthetic.java | 0 .../nullabilityAnnotations/Synthetic.kt | 0 .../nullabilityAnnotations/Trait.java | 0 .../nullabilityAnnotations/Trait.kt | 0 .../nullabilityAnnotations/UnitAsGenericArgument.fir.java | 0 .../nullabilityAnnotations/UnitAsGenericArgument.java | 0 .../nullabilityAnnotations/UnitAsGenericArgument.kt | 0 .../nullabilityAnnotations/UnitParameter.java | 0 .../nullabilityAnnotations/UnitParameter.kt | 0 .../nullabilityAnnotations/VoidReturn.java | 0 .../nullabilityAnnotations/VoidReturn.kt | 0 .../object/SimpleObject.java | 0 .../object/SimpleObject.kt | 0 .../publicField/CompanionObject.java | 0 .../publicField/CompanionObject.kt | 0 .../publicField/Simple.java | 0 .../publicField/Simple.kt | 0 .../script/HelloWorld.java | 0 .../script/HelloWorld.kts | 0 .../script/InnerClasses.java | 0 .../script/InnerClasses.kts | 0 .../kotlin/test/generators/GenerateJUnit3CompilerTests.kt | 2 +- .../org/jetbrains/kotlin/asJava/KotlinLightClassTest.kt | 2 +- .../kotlin/generators/tests/analysis/api/lightClasses.kt | 8 ++++---- 235 files changed, 6 insertions(+), 6 deletions(-) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/AnnotatedParameterInEnumConstructor.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/AnnotatedParameterInEnumConstructor.kt (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/AnnotatedParameterInInnerClassConstructor.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/AnnotatedParameterInInnerClassConstructor.kt (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/AnnotatedPropertyWithSites.fir.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/AnnotatedPropertyWithSites.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/AnnotatedPropertyWithSites.kt (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/AnnotationClass.fir.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/AnnotationClass.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/AnnotationClass.kt (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/AnnotationJavaRepeatable.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/AnnotationJavaRepeatable.kt (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/AnnotationJvmRepeatable.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/AnnotationJvmRepeatable.kt (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/AnnotationKotlinAndJavaRepeatable.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/AnnotationKotlinAndJavaRepeatable.kt (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/AnnotationKotlinAndJvmRepeatable.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/AnnotationKotlinAndJvmRepeatable.kt (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/AnnotationRepeatable.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/AnnotationRepeatable.kt (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/Constructors.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/Constructors.kt (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/DataClassWithCustomImplementedMembers.fir.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/DataClassWithCustomImplementedMembers.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/DataClassWithCustomImplementedMembers.kt (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/DelegatedNested.fir.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/DelegatedNested.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/DelegatedNested.kt (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/Delegation.fir.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/Delegation.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/Delegation.kt (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/DeprecatedEnumEntry.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/DeprecatedEnumEntry.kt (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/DeprecatedNotHiddenInClass.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/DeprecatedNotHiddenInClass.kt (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/DollarsInName.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/DollarsInName.kt (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/DollarsInNameNoPackage.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/DollarsInNameNoPackage.kt (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/EnumClass.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/EnumClass.kt (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/EnumClassWithEnumEntries.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/EnumClassWithEnumEntries.kt (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/EnumEntry.compiled.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/EnumEntry.fir.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/EnumEntry.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/EnumEntry.kt (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/EnumEntry.lib.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/ExtendingInterfaceWithDefaultImpls.fir.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/ExtendingInterfaceWithDefaultImpls.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/ExtendingInterfaceWithDefaultImpls.kt (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/HiddenDeprecated.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/HiddenDeprecated.kt (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/HiddenDeprecatedInClass.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/HiddenDeprecatedInClass.kt (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/InheritingInterfaceDefaultImpls.compiled.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/InheritingInterfaceDefaultImpls.fir.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/InheritingInterfaceDefaultImpls.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/InheritingInterfaceDefaultImpls.kt (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/InheritingInterfaceDefaultImpls.lib.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/InlineReified.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/InlineReified.kt (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/JavaBetween.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/JavaBetween.kt (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/JvmNameOnMember.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/JvmNameOnMember.kt (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/JvmStatic.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/JvmStatic.kt (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/LocalFunctions.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/LocalFunctions.kt (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/LocalFunctions.lib.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/NestedObjects.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/NestedObjects.kt (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/NonDataClassWithComponentFunctions.fir.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/NonDataClassWithComponentFunctions.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/NonDataClassWithComponentFunctions.kt (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/OnlySecondaryConstructors.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/OnlySecondaryConstructors.kt (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/PublishedApi.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/PublishedApi.kt (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/SpecialAnnotationsOnAnnotationClass.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/SpecialAnnotationsOnAnnotationClass.kt (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/StubOrderForOverloads.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/StubOrderForOverloads.kt (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/TypePararametersInClass.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/TypePararametersInClass.kt (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/VarArgs.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/VarArgs.kt (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/compilationErrors/ActualClass.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/compilationErrors/ActualClass.kt (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/compilationErrors/ActualTypeAlias.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/compilationErrors/ActualTypeAlias.kt (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/compilationErrors/ActualTypeAliasCustomJvmPackageName.fir.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/compilationErrors/ActualTypeAliasCustomJvmPackageName.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/compilationErrors/ActualTypeAliasCustomJvmPackageName.kt (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/compilationErrors/AllInlineOnly.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/compilationErrors/AllInlineOnly.kt (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/compilationErrors/AnnotationModifiers.fir.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/compilationErrors/AnnotationModifiers.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/compilationErrors/AnnotationModifiers.kt (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/compilationErrors/EnumNameOverride.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/compilationErrors/EnumNameOverride.kt (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/compilationErrors/ExpectClass.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/compilationErrors/ExpectClass.kt (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/compilationErrors/ExpectObject.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/compilationErrors/ExpectObject.kt (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/compilationErrors/ExpectedNestedClass.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/compilationErrors/ExpectedNestedClass.kt (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/compilationErrors/ExpectedNestedClassInObject.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/compilationErrors/ExpectedNestedClassInObject.kt (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/compilationErrors/FunctionWithoutName.fir.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/compilationErrors/FunctionWithoutName.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/compilationErrors/FunctionWithoutName.kt (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/compilationErrors/JvmPackageName.fir.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/compilationErrors/JvmPackageName.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/compilationErrors/JvmPackageName.kt (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/compilationErrors/LocalInAnnotation.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/compilationErrors/LocalInAnnotation.kt (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/compilationErrors/PrivateInTrait.fir.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/compilationErrors/PrivateInTrait.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/compilationErrors/PrivateInTrait.kt (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/compilationErrors/PropertyWithoutName.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/compilationErrors/PropertyWithoutName.kt (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/compilationErrors/RepetableAnnotations.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/compilationErrors/RepetableAnnotations.kt (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/compilationErrors/SameName.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/compilationErrors/SameName.kt (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/compilationErrors/TopLevelDestructuring.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/compilationErrors/TopLevelDestructuring.kt (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/compilationErrors/TraitClassObjectField.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/compilationErrors/TraitClassObjectField.kt (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/compilationErrors/TwoOverrides.fir.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/compilationErrors/TwoOverrides.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/compilationErrors/TwoOverrides.kt (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/compilationErrors/WrongAnnotations.fir.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/compilationErrors/WrongAnnotations.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/compilationErrors/WrongAnnotations.kt (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/delegation/Function.fir.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/delegation/Function.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/delegation/Function.kt (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/delegation/Property.fir.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/delegation/Property.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/delegation/Property.kt (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/delegation/WithPlatformTypes.NoCompile.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/delegation/WithPlatformTypes.NoCompile.kt (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/facades/AllPrivate.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/facades/AllPrivate.kt (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/facades/EmptyFile.NoCompile.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/facades/EmptyFile.NoCompile.kt (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/facades/MultiFile.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/facades/MultiFile.kt (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/facades/SingleFile.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/facades/SingleFile.kt (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/facades/SingleJvmClassName.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/facades/SingleJvmClassName.kt (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/ideRegression/AllOpenAnnotatedClasses.fir.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/ideRegression/AllOpenAnnotatedClasses.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/ideRegression/AllOpenAnnotatedClasses.kt (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/ideRegression/ImplementingCharSequenceAndNumber.fir.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/ideRegression/ImplementingCharSequenceAndNumber.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/ideRegression/ImplementingCharSequenceAndNumber.kt (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/ideRegression/ImplementingMap.fir.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/ideRegression/ImplementingMap.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/ideRegression/ImplementingMap.kt (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/ideRegression/ImplementingMutableSet.fir.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/ideRegression/ImplementingMutableSet.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/ideRegression/ImplementingMutableSet.kt (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/ideRegression/InheritingInterfaceDefaultImpls.fir.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/ideRegression/InheritingInterfaceDefaultImpls.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/ideRegression/InheritingInterfaceDefaultImpls.kt (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/ideRegression/InheritingInterfaceDefaultImpls.lib.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/ideRegression/OverridingFinalInternal.extra.kt (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/ideRegression/OverridingFinalInternal.fir.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/ideRegression/OverridingFinalInternal.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/ideRegression/OverridingFinalInternal.kt (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/ideRegression/OverridingInternal.extra.kt (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/ideRegression/OverridingInternal.fir.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/ideRegression/OverridingInternal.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/ideRegression/OverridingInternal.kt (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/ideRegression/OverridingProtected.extra.kt (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/ideRegression/OverridingProtected.fir.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/ideRegression/OverridingProtected.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/ideRegression/OverridingProtected.kt (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/nullabilityAnnotations/Class.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/nullabilityAnnotations/Class.kt (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/nullabilityAnnotations/ClassObjectField.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/nullabilityAnnotations/ClassObjectField.kt (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/nullabilityAnnotations/ClassWithConstructor.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/nullabilityAnnotations/ClassWithConstructor.kt (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/nullabilityAnnotations/ClassWithConstructorAndProperties.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/nullabilityAnnotations/ClassWithConstructorAndProperties.kt (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/nullabilityAnnotations/FileFacade.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/nullabilityAnnotations/FileFacade.kt (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/nullabilityAnnotations/Generic.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/nullabilityAnnotations/Generic.kt (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/nullabilityAnnotations/IntOverridesAny.fir.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/nullabilityAnnotations/IntOverridesAny.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/nullabilityAnnotations/IntOverridesAny.kt (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/nullabilityAnnotations/JvmOverloads.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/nullabilityAnnotations/JvmOverloads.kt (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/nullabilityAnnotations/NullableUnitReturn.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/nullabilityAnnotations/NullableUnitReturn.kt (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/nullabilityAnnotations/OverrideAnyWithUnit.fir.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/nullabilityAnnotations/OverrideAnyWithUnit.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/nullabilityAnnotations/OverrideAnyWithUnit.kt (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/nullabilityAnnotations/PlatformTypes.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/nullabilityAnnotations/PlatformTypes.kt (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/nullabilityAnnotations/Primitives.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/nullabilityAnnotations/Primitives.kt (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/nullabilityAnnotations/PrivateInClass.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/nullabilityAnnotations/PrivateInClass.kt (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/nullabilityAnnotations/Synthetic.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/nullabilityAnnotations/Synthetic.kt (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/nullabilityAnnotations/Trait.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/nullabilityAnnotations/Trait.kt (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/nullabilityAnnotations/UnitAsGenericArgument.fir.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/nullabilityAnnotations/UnitAsGenericArgument.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/nullabilityAnnotations/UnitAsGenericArgument.kt (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/nullabilityAnnotations/UnitParameter.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/nullabilityAnnotations/UnitParameter.kt (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/nullabilityAnnotations/VoidReturn.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/nullabilityAnnotations/VoidReturn.kt (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/object/SimpleObject.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/object/SimpleObject.kt (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/publicField/CompanionObject.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/publicField/CompanionObject.kt (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/publicField/Simple.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/publicField/Simple.kt (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/script/HelloWorld.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/script/HelloWorld.kts (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/script/InnerClasses.java (100%) rename compiler/testData/asJava/lightClasses/{lightClasses => lightClassByFqName}/script/InnerClasses.kts (100%) diff --git a/compiler/testData/asJava/lightClasses/lightClasses/AnnotatedParameterInEnumConstructor.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/AnnotatedParameterInEnumConstructor.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/AnnotatedParameterInEnumConstructor.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/AnnotatedParameterInEnumConstructor.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/AnnotatedParameterInEnumConstructor.kt b/compiler/testData/asJava/lightClasses/lightClassByFqName/AnnotatedParameterInEnumConstructor.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/AnnotatedParameterInEnumConstructor.kt rename to compiler/testData/asJava/lightClasses/lightClassByFqName/AnnotatedParameterInEnumConstructor.kt diff --git a/compiler/testData/asJava/lightClasses/lightClasses/AnnotatedParameterInInnerClassConstructor.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/AnnotatedParameterInInnerClassConstructor.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/AnnotatedParameterInInnerClassConstructor.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/AnnotatedParameterInInnerClassConstructor.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/AnnotatedParameterInInnerClassConstructor.kt b/compiler/testData/asJava/lightClasses/lightClassByFqName/AnnotatedParameterInInnerClassConstructor.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/AnnotatedParameterInInnerClassConstructor.kt rename to compiler/testData/asJava/lightClasses/lightClassByFqName/AnnotatedParameterInInnerClassConstructor.kt diff --git a/compiler/testData/asJava/lightClasses/lightClasses/AnnotatedPropertyWithSites.fir.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/AnnotatedPropertyWithSites.fir.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/AnnotatedPropertyWithSites.fir.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/AnnotatedPropertyWithSites.fir.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/AnnotatedPropertyWithSites.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/AnnotatedPropertyWithSites.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/AnnotatedPropertyWithSites.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/AnnotatedPropertyWithSites.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/AnnotatedPropertyWithSites.kt b/compiler/testData/asJava/lightClasses/lightClassByFqName/AnnotatedPropertyWithSites.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/AnnotatedPropertyWithSites.kt rename to compiler/testData/asJava/lightClasses/lightClassByFqName/AnnotatedPropertyWithSites.kt diff --git a/compiler/testData/asJava/lightClasses/lightClasses/AnnotationClass.fir.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/AnnotationClass.fir.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/AnnotationClass.fir.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/AnnotationClass.fir.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/AnnotationClass.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/AnnotationClass.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/AnnotationClass.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/AnnotationClass.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/AnnotationClass.kt b/compiler/testData/asJava/lightClasses/lightClassByFqName/AnnotationClass.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/AnnotationClass.kt rename to compiler/testData/asJava/lightClasses/lightClassByFqName/AnnotationClass.kt diff --git a/compiler/testData/asJava/lightClasses/lightClasses/AnnotationJavaRepeatable.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/AnnotationJavaRepeatable.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/AnnotationJavaRepeatable.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/AnnotationJavaRepeatable.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/AnnotationJavaRepeatable.kt b/compiler/testData/asJava/lightClasses/lightClassByFqName/AnnotationJavaRepeatable.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/AnnotationJavaRepeatable.kt rename to compiler/testData/asJava/lightClasses/lightClassByFqName/AnnotationJavaRepeatable.kt diff --git a/compiler/testData/asJava/lightClasses/lightClasses/AnnotationJvmRepeatable.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/AnnotationJvmRepeatable.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/AnnotationJvmRepeatable.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/AnnotationJvmRepeatable.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/AnnotationJvmRepeatable.kt b/compiler/testData/asJava/lightClasses/lightClassByFqName/AnnotationJvmRepeatable.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/AnnotationJvmRepeatable.kt rename to compiler/testData/asJava/lightClasses/lightClassByFqName/AnnotationJvmRepeatable.kt diff --git a/compiler/testData/asJava/lightClasses/lightClasses/AnnotationKotlinAndJavaRepeatable.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/AnnotationKotlinAndJavaRepeatable.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/AnnotationKotlinAndJavaRepeatable.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/AnnotationKotlinAndJavaRepeatable.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/AnnotationKotlinAndJavaRepeatable.kt b/compiler/testData/asJava/lightClasses/lightClassByFqName/AnnotationKotlinAndJavaRepeatable.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/AnnotationKotlinAndJavaRepeatable.kt rename to compiler/testData/asJava/lightClasses/lightClassByFqName/AnnotationKotlinAndJavaRepeatable.kt diff --git a/compiler/testData/asJava/lightClasses/lightClasses/AnnotationKotlinAndJvmRepeatable.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/AnnotationKotlinAndJvmRepeatable.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/AnnotationKotlinAndJvmRepeatable.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/AnnotationKotlinAndJvmRepeatable.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/AnnotationKotlinAndJvmRepeatable.kt b/compiler/testData/asJava/lightClasses/lightClassByFqName/AnnotationKotlinAndJvmRepeatable.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/AnnotationKotlinAndJvmRepeatable.kt rename to compiler/testData/asJava/lightClasses/lightClassByFqName/AnnotationKotlinAndJvmRepeatable.kt diff --git a/compiler/testData/asJava/lightClasses/lightClasses/AnnotationRepeatable.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/AnnotationRepeatable.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/AnnotationRepeatable.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/AnnotationRepeatable.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/AnnotationRepeatable.kt b/compiler/testData/asJava/lightClasses/lightClassByFqName/AnnotationRepeatable.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/AnnotationRepeatable.kt rename to compiler/testData/asJava/lightClasses/lightClassByFqName/AnnotationRepeatable.kt diff --git a/compiler/testData/asJava/lightClasses/lightClasses/Constructors.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/Constructors.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/Constructors.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/Constructors.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/Constructors.kt b/compiler/testData/asJava/lightClasses/lightClassByFqName/Constructors.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/Constructors.kt rename to compiler/testData/asJava/lightClasses/lightClassByFqName/Constructors.kt diff --git a/compiler/testData/asJava/lightClasses/lightClasses/DataClassWithCustomImplementedMembers.fir.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/DataClassWithCustomImplementedMembers.fir.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/DataClassWithCustomImplementedMembers.fir.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/DataClassWithCustomImplementedMembers.fir.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/DataClassWithCustomImplementedMembers.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/DataClassWithCustomImplementedMembers.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/DataClassWithCustomImplementedMembers.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/DataClassWithCustomImplementedMembers.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/DataClassWithCustomImplementedMembers.kt b/compiler/testData/asJava/lightClasses/lightClassByFqName/DataClassWithCustomImplementedMembers.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/DataClassWithCustomImplementedMembers.kt rename to compiler/testData/asJava/lightClasses/lightClassByFqName/DataClassWithCustomImplementedMembers.kt diff --git a/compiler/testData/asJava/lightClasses/lightClasses/DelegatedNested.fir.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/DelegatedNested.fir.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/DelegatedNested.fir.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/DelegatedNested.fir.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/DelegatedNested.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/DelegatedNested.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/DelegatedNested.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/DelegatedNested.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/DelegatedNested.kt b/compiler/testData/asJava/lightClasses/lightClassByFqName/DelegatedNested.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/DelegatedNested.kt rename to compiler/testData/asJava/lightClasses/lightClassByFqName/DelegatedNested.kt diff --git a/compiler/testData/asJava/lightClasses/lightClasses/Delegation.fir.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/Delegation.fir.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/Delegation.fir.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/Delegation.fir.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/Delegation.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/Delegation.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/Delegation.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/Delegation.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/Delegation.kt b/compiler/testData/asJava/lightClasses/lightClassByFqName/Delegation.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/Delegation.kt rename to compiler/testData/asJava/lightClasses/lightClassByFqName/Delegation.kt diff --git a/compiler/testData/asJava/lightClasses/lightClasses/DeprecatedEnumEntry.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/DeprecatedEnumEntry.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/DeprecatedEnumEntry.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/DeprecatedEnumEntry.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/DeprecatedEnumEntry.kt b/compiler/testData/asJava/lightClasses/lightClassByFqName/DeprecatedEnumEntry.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/DeprecatedEnumEntry.kt rename to compiler/testData/asJava/lightClasses/lightClassByFqName/DeprecatedEnumEntry.kt diff --git a/compiler/testData/asJava/lightClasses/lightClasses/DeprecatedNotHiddenInClass.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/DeprecatedNotHiddenInClass.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/DeprecatedNotHiddenInClass.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/DeprecatedNotHiddenInClass.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/DeprecatedNotHiddenInClass.kt b/compiler/testData/asJava/lightClasses/lightClassByFqName/DeprecatedNotHiddenInClass.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/DeprecatedNotHiddenInClass.kt rename to compiler/testData/asJava/lightClasses/lightClassByFqName/DeprecatedNotHiddenInClass.kt diff --git a/compiler/testData/asJava/lightClasses/lightClasses/DollarsInName.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/DollarsInName.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/DollarsInName.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/DollarsInName.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/DollarsInName.kt b/compiler/testData/asJava/lightClasses/lightClassByFqName/DollarsInName.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/DollarsInName.kt rename to compiler/testData/asJava/lightClasses/lightClassByFqName/DollarsInName.kt diff --git a/compiler/testData/asJava/lightClasses/lightClasses/DollarsInNameNoPackage.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/DollarsInNameNoPackage.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/DollarsInNameNoPackage.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/DollarsInNameNoPackage.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/DollarsInNameNoPackage.kt b/compiler/testData/asJava/lightClasses/lightClassByFqName/DollarsInNameNoPackage.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/DollarsInNameNoPackage.kt rename to compiler/testData/asJava/lightClasses/lightClassByFqName/DollarsInNameNoPackage.kt diff --git a/compiler/testData/asJava/lightClasses/lightClasses/EnumClass.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/EnumClass.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/EnumClass.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/EnumClass.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/EnumClass.kt b/compiler/testData/asJava/lightClasses/lightClassByFqName/EnumClass.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/EnumClass.kt rename to compiler/testData/asJava/lightClasses/lightClassByFqName/EnumClass.kt diff --git a/compiler/testData/asJava/lightClasses/lightClasses/EnumClassWithEnumEntries.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/EnumClassWithEnumEntries.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/EnumClassWithEnumEntries.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/EnumClassWithEnumEntries.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/EnumClassWithEnumEntries.kt b/compiler/testData/asJava/lightClasses/lightClassByFqName/EnumClassWithEnumEntries.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/EnumClassWithEnumEntries.kt rename to compiler/testData/asJava/lightClasses/lightClassByFqName/EnumClassWithEnumEntries.kt diff --git a/compiler/testData/asJava/lightClasses/lightClasses/EnumEntry.compiled.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/EnumEntry.compiled.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/EnumEntry.compiled.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/EnumEntry.compiled.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/EnumEntry.fir.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/EnumEntry.fir.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/EnumEntry.fir.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/EnumEntry.fir.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/EnumEntry.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/EnumEntry.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/EnumEntry.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/EnumEntry.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/EnumEntry.kt b/compiler/testData/asJava/lightClasses/lightClassByFqName/EnumEntry.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/EnumEntry.kt rename to compiler/testData/asJava/lightClasses/lightClassByFqName/EnumEntry.kt diff --git a/compiler/testData/asJava/lightClasses/lightClasses/EnumEntry.lib.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/EnumEntry.lib.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/EnumEntry.lib.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/EnumEntry.lib.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/ExtendingInterfaceWithDefaultImpls.fir.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/ExtendingInterfaceWithDefaultImpls.fir.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/ExtendingInterfaceWithDefaultImpls.fir.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/ExtendingInterfaceWithDefaultImpls.fir.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/ExtendingInterfaceWithDefaultImpls.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/ExtendingInterfaceWithDefaultImpls.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/ExtendingInterfaceWithDefaultImpls.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/ExtendingInterfaceWithDefaultImpls.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/ExtendingInterfaceWithDefaultImpls.kt b/compiler/testData/asJava/lightClasses/lightClassByFqName/ExtendingInterfaceWithDefaultImpls.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/ExtendingInterfaceWithDefaultImpls.kt rename to compiler/testData/asJava/lightClasses/lightClassByFqName/ExtendingInterfaceWithDefaultImpls.kt diff --git a/compiler/testData/asJava/lightClasses/lightClasses/HiddenDeprecated.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/HiddenDeprecated.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/HiddenDeprecated.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/HiddenDeprecated.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/HiddenDeprecated.kt b/compiler/testData/asJava/lightClasses/lightClassByFqName/HiddenDeprecated.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/HiddenDeprecated.kt rename to compiler/testData/asJava/lightClasses/lightClassByFqName/HiddenDeprecated.kt diff --git a/compiler/testData/asJava/lightClasses/lightClasses/HiddenDeprecatedInClass.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/HiddenDeprecatedInClass.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/HiddenDeprecatedInClass.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/HiddenDeprecatedInClass.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/HiddenDeprecatedInClass.kt b/compiler/testData/asJava/lightClasses/lightClassByFqName/HiddenDeprecatedInClass.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/HiddenDeprecatedInClass.kt rename to compiler/testData/asJava/lightClasses/lightClassByFqName/HiddenDeprecatedInClass.kt diff --git a/compiler/testData/asJava/lightClasses/lightClasses/InheritingInterfaceDefaultImpls.compiled.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/InheritingInterfaceDefaultImpls.compiled.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/InheritingInterfaceDefaultImpls.compiled.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/InheritingInterfaceDefaultImpls.compiled.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/InheritingInterfaceDefaultImpls.fir.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/InheritingInterfaceDefaultImpls.fir.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/InheritingInterfaceDefaultImpls.fir.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/InheritingInterfaceDefaultImpls.fir.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/InheritingInterfaceDefaultImpls.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/InheritingInterfaceDefaultImpls.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/InheritingInterfaceDefaultImpls.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/InheritingInterfaceDefaultImpls.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/InheritingInterfaceDefaultImpls.kt b/compiler/testData/asJava/lightClasses/lightClassByFqName/InheritingInterfaceDefaultImpls.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/InheritingInterfaceDefaultImpls.kt rename to compiler/testData/asJava/lightClasses/lightClassByFqName/InheritingInterfaceDefaultImpls.kt diff --git a/compiler/testData/asJava/lightClasses/lightClasses/InheritingInterfaceDefaultImpls.lib.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/InheritingInterfaceDefaultImpls.lib.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/InheritingInterfaceDefaultImpls.lib.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/InheritingInterfaceDefaultImpls.lib.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/InlineReified.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/InlineReified.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/InlineReified.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/InlineReified.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/InlineReified.kt b/compiler/testData/asJava/lightClasses/lightClassByFqName/InlineReified.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/InlineReified.kt rename to compiler/testData/asJava/lightClasses/lightClassByFqName/InlineReified.kt diff --git a/compiler/testData/asJava/lightClasses/lightClasses/JavaBetween.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/JavaBetween.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/JavaBetween.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/JavaBetween.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/JavaBetween.kt b/compiler/testData/asJava/lightClasses/lightClassByFqName/JavaBetween.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/JavaBetween.kt rename to compiler/testData/asJava/lightClasses/lightClassByFqName/JavaBetween.kt diff --git a/compiler/testData/asJava/lightClasses/lightClasses/JvmNameOnMember.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/JvmNameOnMember.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/JvmNameOnMember.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/JvmNameOnMember.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/JvmNameOnMember.kt b/compiler/testData/asJava/lightClasses/lightClassByFqName/JvmNameOnMember.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/JvmNameOnMember.kt rename to compiler/testData/asJava/lightClasses/lightClassByFqName/JvmNameOnMember.kt diff --git a/compiler/testData/asJava/lightClasses/lightClasses/JvmStatic.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/JvmStatic.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/JvmStatic.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/JvmStatic.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/JvmStatic.kt b/compiler/testData/asJava/lightClasses/lightClassByFqName/JvmStatic.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/JvmStatic.kt rename to compiler/testData/asJava/lightClasses/lightClassByFqName/JvmStatic.kt diff --git a/compiler/testData/asJava/lightClasses/lightClasses/LocalFunctions.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/LocalFunctions.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/LocalFunctions.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/LocalFunctions.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/LocalFunctions.kt b/compiler/testData/asJava/lightClasses/lightClassByFqName/LocalFunctions.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/LocalFunctions.kt rename to compiler/testData/asJava/lightClasses/lightClassByFqName/LocalFunctions.kt diff --git a/compiler/testData/asJava/lightClasses/lightClasses/LocalFunctions.lib.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/LocalFunctions.lib.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/LocalFunctions.lib.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/LocalFunctions.lib.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/NestedObjects.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/NestedObjects.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/NestedObjects.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/NestedObjects.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/NestedObjects.kt b/compiler/testData/asJava/lightClasses/lightClassByFqName/NestedObjects.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/NestedObjects.kt rename to compiler/testData/asJava/lightClasses/lightClassByFqName/NestedObjects.kt diff --git a/compiler/testData/asJava/lightClasses/lightClasses/NonDataClassWithComponentFunctions.fir.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/NonDataClassWithComponentFunctions.fir.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/NonDataClassWithComponentFunctions.fir.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/NonDataClassWithComponentFunctions.fir.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/NonDataClassWithComponentFunctions.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/NonDataClassWithComponentFunctions.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/NonDataClassWithComponentFunctions.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/NonDataClassWithComponentFunctions.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/NonDataClassWithComponentFunctions.kt b/compiler/testData/asJava/lightClasses/lightClassByFqName/NonDataClassWithComponentFunctions.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/NonDataClassWithComponentFunctions.kt rename to compiler/testData/asJava/lightClasses/lightClassByFqName/NonDataClassWithComponentFunctions.kt diff --git a/compiler/testData/asJava/lightClasses/lightClasses/OnlySecondaryConstructors.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/OnlySecondaryConstructors.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/OnlySecondaryConstructors.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/OnlySecondaryConstructors.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/OnlySecondaryConstructors.kt b/compiler/testData/asJava/lightClasses/lightClassByFqName/OnlySecondaryConstructors.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/OnlySecondaryConstructors.kt rename to compiler/testData/asJava/lightClasses/lightClassByFqName/OnlySecondaryConstructors.kt diff --git a/compiler/testData/asJava/lightClasses/lightClasses/PublishedApi.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/PublishedApi.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/PublishedApi.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/PublishedApi.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/PublishedApi.kt b/compiler/testData/asJava/lightClasses/lightClassByFqName/PublishedApi.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/PublishedApi.kt rename to compiler/testData/asJava/lightClasses/lightClassByFqName/PublishedApi.kt diff --git a/compiler/testData/asJava/lightClasses/lightClasses/SpecialAnnotationsOnAnnotationClass.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/SpecialAnnotationsOnAnnotationClass.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/SpecialAnnotationsOnAnnotationClass.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/SpecialAnnotationsOnAnnotationClass.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/SpecialAnnotationsOnAnnotationClass.kt b/compiler/testData/asJava/lightClasses/lightClassByFqName/SpecialAnnotationsOnAnnotationClass.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/SpecialAnnotationsOnAnnotationClass.kt rename to compiler/testData/asJava/lightClasses/lightClassByFqName/SpecialAnnotationsOnAnnotationClass.kt diff --git a/compiler/testData/asJava/lightClasses/lightClasses/StubOrderForOverloads.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/StubOrderForOverloads.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/StubOrderForOverloads.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/StubOrderForOverloads.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/StubOrderForOverloads.kt b/compiler/testData/asJava/lightClasses/lightClassByFqName/StubOrderForOverloads.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/StubOrderForOverloads.kt rename to compiler/testData/asJava/lightClasses/lightClassByFqName/StubOrderForOverloads.kt diff --git a/compiler/testData/asJava/lightClasses/lightClasses/TypePararametersInClass.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/TypePararametersInClass.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/TypePararametersInClass.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/TypePararametersInClass.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/TypePararametersInClass.kt b/compiler/testData/asJava/lightClasses/lightClassByFqName/TypePararametersInClass.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/TypePararametersInClass.kt rename to compiler/testData/asJava/lightClasses/lightClassByFqName/TypePararametersInClass.kt diff --git a/compiler/testData/asJava/lightClasses/lightClasses/VarArgs.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/VarArgs.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/VarArgs.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/VarArgs.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/VarArgs.kt b/compiler/testData/asJava/lightClasses/lightClassByFqName/VarArgs.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/VarArgs.kt rename to compiler/testData/asJava/lightClasses/lightClassByFqName/VarArgs.kt diff --git a/compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/ActualClass.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/ActualClass.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/ActualClass.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/ActualClass.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/ActualClass.kt b/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/ActualClass.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/ActualClass.kt rename to compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/ActualClass.kt diff --git a/compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/ActualTypeAlias.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/ActualTypeAlias.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/ActualTypeAlias.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/ActualTypeAlias.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/ActualTypeAlias.kt b/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/ActualTypeAlias.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/ActualTypeAlias.kt rename to compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/ActualTypeAlias.kt diff --git a/compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/ActualTypeAliasCustomJvmPackageName.fir.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/ActualTypeAliasCustomJvmPackageName.fir.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/ActualTypeAliasCustomJvmPackageName.fir.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/ActualTypeAliasCustomJvmPackageName.fir.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/ActualTypeAliasCustomJvmPackageName.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/ActualTypeAliasCustomJvmPackageName.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/ActualTypeAliasCustomJvmPackageName.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/ActualTypeAliasCustomJvmPackageName.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/ActualTypeAliasCustomJvmPackageName.kt b/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/ActualTypeAliasCustomJvmPackageName.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/ActualTypeAliasCustomJvmPackageName.kt rename to compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/ActualTypeAliasCustomJvmPackageName.kt diff --git a/compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/AllInlineOnly.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/AllInlineOnly.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/AllInlineOnly.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/AllInlineOnly.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/AllInlineOnly.kt b/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/AllInlineOnly.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/AllInlineOnly.kt rename to compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/AllInlineOnly.kt diff --git a/compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/AnnotationModifiers.fir.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/AnnotationModifiers.fir.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/AnnotationModifiers.fir.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/AnnotationModifiers.fir.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/AnnotationModifiers.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/AnnotationModifiers.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/AnnotationModifiers.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/AnnotationModifiers.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/AnnotationModifiers.kt b/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/AnnotationModifiers.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/AnnotationModifiers.kt rename to compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/AnnotationModifiers.kt diff --git a/compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/EnumNameOverride.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/EnumNameOverride.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/EnumNameOverride.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/EnumNameOverride.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/EnumNameOverride.kt b/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/EnumNameOverride.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/EnumNameOverride.kt rename to compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/EnumNameOverride.kt diff --git a/compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/ExpectClass.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/ExpectClass.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/ExpectClass.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/ExpectClass.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/ExpectClass.kt b/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/ExpectClass.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/ExpectClass.kt rename to compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/ExpectClass.kt diff --git a/compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/ExpectObject.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/ExpectObject.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/ExpectObject.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/ExpectObject.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/ExpectObject.kt b/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/ExpectObject.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/ExpectObject.kt rename to compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/ExpectObject.kt diff --git a/compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/ExpectedNestedClass.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/ExpectedNestedClass.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/ExpectedNestedClass.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/ExpectedNestedClass.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/ExpectedNestedClass.kt b/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/ExpectedNestedClass.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/ExpectedNestedClass.kt rename to compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/ExpectedNestedClass.kt diff --git a/compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/ExpectedNestedClassInObject.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/ExpectedNestedClassInObject.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/ExpectedNestedClassInObject.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/ExpectedNestedClassInObject.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/ExpectedNestedClassInObject.kt b/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/ExpectedNestedClassInObject.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/ExpectedNestedClassInObject.kt rename to compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/ExpectedNestedClassInObject.kt diff --git a/compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/FunctionWithoutName.fir.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/FunctionWithoutName.fir.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/FunctionWithoutName.fir.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/FunctionWithoutName.fir.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/FunctionWithoutName.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/FunctionWithoutName.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/FunctionWithoutName.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/FunctionWithoutName.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/FunctionWithoutName.kt b/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/FunctionWithoutName.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/FunctionWithoutName.kt rename to compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/FunctionWithoutName.kt diff --git a/compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/JvmPackageName.fir.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/JvmPackageName.fir.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/JvmPackageName.fir.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/JvmPackageName.fir.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/JvmPackageName.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/JvmPackageName.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/JvmPackageName.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/JvmPackageName.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/JvmPackageName.kt b/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/JvmPackageName.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/JvmPackageName.kt rename to compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/JvmPackageName.kt diff --git a/compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/LocalInAnnotation.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/LocalInAnnotation.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/LocalInAnnotation.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/LocalInAnnotation.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/LocalInAnnotation.kt b/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/LocalInAnnotation.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/LocalInAnnotation.kt rename to compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/LocalInAnnotation.kt diff --git a/compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/PrivateInTrait.fir.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/PrivateInTrait.fir.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/PrivateInTrait.fir.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/PrivateInTrait.fir.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/PrivateInTrait.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/PrivateInTrait.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/PrivateInTrait.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/PrivateInTrait.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/PrivateInTrait.kt b/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/PrivateInTrait.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/PrivateInTrait.kt rename to compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/PrivateInTrait.kt diff --git a/compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/PropertyWithoutName.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/PropertyWithoutName.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/PropertyWithoutName.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/PropertyWithoutName.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/PropertyWithoutName.kt b/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/PropertyWithoutName.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/PropertyWithoutName.kt rename to compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/PropertyWithoutName.kt diff --git a/compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/RepetableAnnotations.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/RepetableAnnotations.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/RepetableAnnotations.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/RepetableAnnotations.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/RepetableAnnotations.kt b/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/RepetableAnnotations.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/RepetableAnnotations.kt rename to compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/RepetableAnnotations.kt diff --git a/compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/SameName.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/SameName.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/SameName.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/SameName.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/SameName.kt b/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/SameName.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/SameName.kt rename to compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/SameName.kt diff --git a/compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/TopLevelDestructuring.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/TopLevelDestructuring.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/TopLevelDestructuring.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/TopLevelDestructuring.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/TopLevelDestructuring.kt b/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/TopLevelDestructuring.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/TopLevelDestructuring.kt rename to compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/TopLevelDestructuring.kt diff --git a/compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/TraitClassObjectField.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/TraitClassObjectField.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/TraitClassObjectField.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/TraitClassObjectField.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/TraitClassObjectField.kt b/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/TraitClassObjectField.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/TraitClassObjectField.kt rename to compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/TraitClassObjectField.kt diff --git a/compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/TwoOverrides.fir.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/TwoOverrides.fir.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/TwoOverrides.fir.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/TwoOverrides.fir.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/TwoOverrides.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/TwoOverrides.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/TwoOverrides.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/TwoOverrides.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/TwoOverrides.kt b/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/TwoOverrides.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/TwoOverrides.kt rename to compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/TwoOverrides.kt diff --git a/compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/WrongAnnotations.fir.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/WrongAnnotations.fir.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/WrongAnnotations.fir.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/WrongAnnotations.fir.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/WrongAnnotations.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/WrongAnnotations.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/WrongAnnotations.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/WrongAnnotations.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/WrongAnnotations.kt b/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/WrongAnnotations.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/WrongAnnotations.kt rename to compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/WrongAnnotations.kt diff --git a/compiler/testData/asJava/lightClasses/lightClasses/delegation/Function.fir.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/delegation/Function.fir.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/delegation/Function.fir.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/delegation/Function.fir.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/delegation/Function.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/delegation/Function.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/delegation/Function.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/delegation/Function.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/delegation/Function.kt b/compiler/testData/asJava/lightClasses/lightClassByFqName/delegation/Function.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/delegation/Function.kt rename to compiler/testData/asJava/lightClasses/lightClassByFqName/delegation/Function.kt diff --git a/compiler/testData/asJava/lightClasses/lightClasses/delegation/Property.fir.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/delegation/Property.fir.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/delegation/Property.fir.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/delegation/Property.fir.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/delegation/Property.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/delegation/Property.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/delegation/Property.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/delegation/Property.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/delegation/Property.kt b/compiler/testData/asJava/lightClasses/lightClassByFqName/delegation/Property.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/delegation/Property.kt rename to compiler/testData/asJava/lightClasses/lightClassByFqName/delegation/Property.kt diff --git a/compiler/testData/asJava/lightClasses/lightClasses/delegation/WithPlatformTypes.NoCompile.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/delegation/WithPlatformTypes.NoCompile.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/delegation/WithPlatformTypes.NoCompile.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/delegation/WithPlatformTypes.NoCompile.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/delegation/WithPlatformTypes.NoCompile.kt b/compiler/testData/asJava/lightClasses/lightClassByFqName/delegation/WithPlatformTypes.NoCompile.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/delegation/WithPlatformTypes.NoCompile.kt rename to compiler/testData/asJava/lightClasses/lightClassByFqName/delegation/WithPlatformTypes.NoCompile.kt diff --git a/compiler/testData/asJava/lightClasses/lightClasses/facades/AllPrivate.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/facades/AllPrivate.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/facades/AllPrivate.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/facades/AllPrivate.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/facades/AllPrivate.kt b/compiler/testData/asJava/lightClasses/lightClassByFqName/facades/AllPrivate.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/facades/AllPrivate.kt rename to compiler/testData/asJava/lightClasses/lightClassByFqName/facades/AllPrivate.kt diff --git a/compiler/testData/asJava/lightClasses/lightClasses/facades/EmptyFile.NoCompile.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/facades/EmptyFile.NoCompile.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/facades/EmptyFile.NoCompile.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/facades/EmptyFile.NoCompile.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/facades/EmptyFile.NoCompile.kt b/compiler/testData/asJava/lightClasses/lightClassByFqName/facades/EmptyFile.NoCompile.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/facades/EmptyFile.NoCompile.kt rename to compiler/testData/asJava/lightClasses/lightClassByFqName/facades/EmptyFile.NoCompile.kt diff --git a/compiler/testData/asJava/lightClasses/lightClasses/facades/MultiFile.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/facades/MultiFile.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/facades/MultiFile.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/facades/MultiFile.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/facades/MultiFile.kt b/compiler/testData/asJava/lightClasses/lightClassByFqName/facades/MultiFile.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/facades/MultiFile.kt rename to compiler/testData/asJava/lightClasses/lightClassByFqName/facades/MultiFile.kt diff --git a/compiler/testData/asJava/lightClasses/lightClasses/facades/SingleFile.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/facades/SingleFile.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/facades/SingleFile.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/facades/SingleFile.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/facades/SingleFile.kt b/compiler/testData/asJava/lightClasses/lightClassByFqName/facades/SingleFile.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/facades/SingleFile.kt rename to compiler/testData/asJava/lightClasses/lightClassByFqName/facades/SingleFile.kt diff --git a/compiler/testData/asJava/lightClasses/lightClasses/facades/SingleJvmClassName.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/facades/SingleJvmClassName.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/facades/SingleJvmClassName.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/facades/SingleJvmClassName.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/facades/SingleJvmClassName.kt b/compiler/testData/asJava/lightClasses/lightClassByFqName/facades/SingleJvmClassName.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/facades/SingleJvmClassName.kt rename to compiler/testData/asJava/lightClasses/lightClassByFqName/facades/SingleJvmClassName.kt diff --git a/compiler/testData/asJava/lightClasses/lightClasses/ideRegression/AllOpenAnnotatedClasses.fir.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/AllOpenAnnotatedClasses.fir.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/ideRegression/AllOpenAnnotatedClasses.fir.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/AllOpenAnnotatedClasses.fir.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/ideRegression/AllOpenAnnotatedClasses.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/AllOpenAnnotatedClasses.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/ideRegression/AllOpenAnnotatedClasses.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/AllOpenAnnotatedClasses.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/ideRegression/AllOpenAnnotatedClasses.kt b/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/AllOpenAnnotatedClasses.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/ideRegression/AllOpenAnnotatedClasses.kt rename to compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/AllOpenAnnotatedClasses.kt diff --git a/compiler/testData/asJava/lightClasses/lightClasses/ideRegression/ImplementingCharSequenceAndNumber.fir.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/ImplementingCharSequenceAndNumber.fir.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/ideRegression/ImplementingCharSequenceAndNumber.fir.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/ImplementingCharSequenceAndNumber.fir.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/ideRegression/ImplementingCharSequenceAndNumber.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/ImplementingCharSequenceAndNumber.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/ideRegression/ImplementingCharSequenceAndNumber.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/ImplementingCharSequenceAndNumber.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/ideRegression/ImplementingCharSequenceAndNumber.kt b/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/ImplementingCharSequenceAndNumber.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/ideRegression/ImplementingCharSequenceAndNumber.kt rename to compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/ImplementingCharSequenceAndNumber.kt diff --git a/compiler/testData/asJava/lightClasses/lightClasses/ideRegression/ImplementingMap.fir.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/ImplementingMap.fir.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/ideRegression/ImplementingMap.fir.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/ImplementingMap.fir.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/ideRegression/ImplementingMap.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/ImplementingMap.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/ideRegression/ImplementingMap.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/ImplementingMap.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/ideRegression/ImplementingMap.kt b/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/ImplementingMap.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/ideRegression/ImplementingMap.kt rename to compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/ImplementingMap.kt diff --git a/compiler/testData/asJava/lightClasses/lightClasses/ideRegression/ImplementingMutableSet.fir.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/ImplementingMutableSet.fir.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/ideRegression/ImplementingMutableSet.fir.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/ImplementingMutableSet.fir.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/ideRegression/ImplementingMutableSet.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/ImplementingMutableSet.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/ideRegression/ImplementingMutableSet.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/ImplementingMutableSet.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/ideRegression/ImplementingMutableSet.kt b/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/ImplementingMutableSet.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/ideRegression/ImplementingMutableSet.kt rename to compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/ImplementingMutableSet.kt diff --git a/compiler/testData/asJava/lightClasses/lightClasses/ideRegression/InheritingInterfaceDefaultImpls.fir.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/InheritingInterfaceDefaultImpls.fir.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/ideRegression/InheritingInterfaceDefaultImpls.fir.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/InheritingInterfaceDefaultImpls.fir.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/ideRegression/InheritingInterfaceDefaultImpls.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/InheritingInterfaceDefaultImpls.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/ideRegression/InheritingInterfaceDefaultImpls.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/InheritingInterfaceDefaultImpls.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/ideRegression/InheritingInterfaceDefaultImpls.kt b/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/InheritingInterfaceDefaultImpls.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/ideRegression/InheritingInterfaceDefaultImpls.kt rename to compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/InheritingInterfaceDefaultImpls.kt diff --git a/compiler/testData/asJava/lightClasses/lightClasses/ideRegression/InheritingInterfaceDefaultImpls.lib.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/InheritingInterfaceDefaultImpls.lib.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/ideRegression/InheritingInterfaceDefaultImpls.lib.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/InheritingInterfaceDefaultImpls.lib.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/ideRegression/OverridingFinalInternal.extra.kt b/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/OverridingFinalInternal.extra.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/ideRegression/OverridingFinalInternal.extra.kt rename to compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/OverridingFinalInternal.extra.kt diff --git a/compiler/testData/asJava/lightClasses/lightClasses/ideRegression/OverridingFinalInternal.fir.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/OverridingFinalInternal.fir.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/ideRegression/OverridingFinalInternal.fir.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/OverridingFinalInternal.fir.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/ideRegression/OverridingFinalInternal.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/OverridingFinalInternal.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/ideRegression/OverridingFinalInternal.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/OverridingFinalInternal.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/ideRegression/OverridingFinalInternal.kt b/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/OverridingFinalInternal.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/ideRegression/OverridingFinalInternal.kt rename to compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/OverridingFinalInternal.kt diff --git a/compiler/testData/asJava/lightClasses/lightClasses/ideRegression/OverridingInternal.extra.kt b/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/OverridingInternal.extra.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/ideRegression/OverridingInternal.extra.kt rename to compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/OverridingInternal.extra.kt diff --git a/compiler/testData/asJava/lightClasses/lightClasses/ideRegression/OverridingInternal.fir.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/OverridingInternal.fir.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/ideRegression/OverridingInternal.fir.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/OverridingInternal.fir.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/ideRegression/OverridingInternal.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/OverridingInternal.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/ideRegression/OverridingInternal.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/OverridingInternal.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/ideRegression/OverridingInternal.kt b/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/OverridingInternal.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/ideRegression/OverridingInternal.kt rename to compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/OverridingInternal.kt diff --git a/compiler/testData/asJava/lightClasses/lightClasses/ideRegression/OverridingProtected.extra.kt b/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/OverridingProtected.extra.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/ideRegression/OverridingProtected.extra.kt rename to compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/OverridingProtected.extra.kt diff --git a/compiler/testData/asJava/lightClasses/lightClasses/ideRegression/OverridingProtected.fir.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/OverridingProtected.fir.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/ideRegression/OverridingProtected.fir.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/OverridingProtected.fir.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/ideRegression/OverridingProtected.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/OverridingProtected.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/ideRegression/OverridingProtected.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/OverridingProtected.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/ideRegression/OverridingProtected.kt b/compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/OverridingProtected.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/ideRegression/OverridingProtected.kt rename to compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/OverridingProtected.kt diff --git a/compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/Class.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/Class.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/Class.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/Class.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/Class.kt b/compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/Class.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/Class.kt rename to compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/Class.kt diff --git a/compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/ClassObjectField.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/ClassObjectField.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/ClassObjectField.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/ClassObjectField.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/ClassObjectField.kt b/compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/ClassObjectField.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/ClassObjectField.kt rename to compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/ClassObjectField.kt diff --git a/compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/ClassWithConstructor.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/ClassWithConstructor.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/ClassWithConstructor.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/ClassWithConstructor.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/ClassWithConstructor.kt b/compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/ClassWithConstructor.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/ClassWithConstructor.kt rename to compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/ClassWithConstructor.kt diff --git a/compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/ClassWithConstructorAndProperties.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/ClassWithConstructorAndProperties.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/ClassWithConstructorAndProperties.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/ClassWithConstructorAndProperties.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/ClassWithConstructorAndProperties.kt b/compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/ClassWithConstructorAndProperties.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/ClassWithConstructorAndProperties.kt rename to compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/ClassWithConstructorAndProperties.kt diff --git a/compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/FileFacade.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/FileFacade.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/FileFacade.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/FileFacade.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/FileFacade.kt b/compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/FileFacade.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/FileFacade.kt rename to compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/FileFacade.kt diff --git a/compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/Generic.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/Generic.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/Generic.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/Generic.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/Generic.kt b/compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/Generic.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/Generic.kt rename to compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/Generic.kt diff --git a/compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/IntOverridesAny.fir.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/IntOverridesAny.fir.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/IntOverridesAny.fir.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/IntOverridesAny.fir.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/IntOverridesAny.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/IntOverridesAny.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/IntOverridesAny.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/IntOverridesAny.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/IntOverridesAny.kt b/compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/IntOverridesAny.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/IntOverridesAny.kt rename to compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/IntOverridesAny.kt diff --git a/compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/JvmOverloads.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/JvmOverloads.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/JvmOverloads.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/JvmOverloads.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/JvmOverloads.kt b/compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/JvmOverloads.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/JvmOverloads.kt rename to compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/JvmOverloads.kt diff --git a/compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/NullableUnitReturn.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/NullableUnitReturn.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/NullableUnitReturn.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/NullableUnitReturn.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/NullableUnitReturn.kt b/compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/NullableUnitReturn.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/NullableUnitReturn.kt rename to compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/NullableUnitReturn.kt diff --git a/compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/OverrideAnyWithUnit.fir.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/OverrideAnyWithUnit.fir.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/OverrideAnyWithUnit.fir.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/OverrideAnyWithUnit.fir.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/OverrideAnyWithUnit.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/OverrideAnyWithUnit.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/OverrideAnyWithUnit.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/OverrideAnyWithUnit.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/OverrideAnyWithUnit.kt b/compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/OverrideAnyWithUnit.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/OverrideAnyWithUnit.kt rename to compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/OverrideAnyWithUnit.kt diff --git a/compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/PlatformTypes.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/PlatformTypes.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/PlatformTypes.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/PlatformTypes.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/PlatformTypes.kt b/compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/PlatformTypes.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/PlatformTypes.kt rename to compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/PlatformTypes.kt diff --git a/compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/Primitives.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/Primitives.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/Primitives.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/Primitives.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/Primitives.kt b/compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/Primitives.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/Primitives.kt rename to compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/Primitives.kt diff --git a/compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/PrivateInClass.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/PrivateInClass.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/PrivateInClass.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/PrivateInClass.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/PrivateInClass.kt b/compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/PrivateInClass.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/PrivateInClass.kt rename to compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/PrivateInClass.kt diff --git a/compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/Synthetic.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/Synthetic.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/Synthetic.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/Synthetic.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/Synthetic.kt b/compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/Synthetic.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/Synthetic.kt rename to compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/Synthetic.kt diff --git a/compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/Trait.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/Trait.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/Trait.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/Trait.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/Trait.kt b/compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/Trait.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/Trait.kt rename to compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/Trait.kt diff --git a/compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/UnitAsGenericArgument.fir.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/UnitAsGenericArgument.fir.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/UnitAsGenericArgument.fir.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/UnitAsGenericArgument.fir.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/UnitAsGenericArgument.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/UnitAsGenericArgument.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/UnitAsGenericArgument.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/UnitAsGenericArgument.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/UnitAsGenericArgument.kt b/compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/UnitAsGenericArgument.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/UnitAsGenericArgument.kt rename to compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/UnitAsGenericArgument.kt diff --git a/compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/UnitParameter.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/UnitParameter.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/UnitParameter.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/UnitParameter.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/UnitParameter.kt b/compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/UnitParameter.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/UnitParameter.kt rename to compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/UnitParameter.kt diff --git a/compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/VoidReturn.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/VoidReturn.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/VoidReturn.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/VoidReturn.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/VoidReturn.kt b/compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/VoidReturn.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/VoidReturn.kt rename to compiler/testData/asJava/lightClasses/lightClassByFqName/nullabilityAnnotations/VoidReturn.kt diff --git a/compiler/testData/asJava/lightClasses/lightClasses/object/SimpleObject.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/object/SimpleObject.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/object/SimpleObject.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/object/SimpleObject.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/object/SimpleObject.kt b/compiler/testData/asJava/lightClasses/lightClassByFqName/object/SimpleObject.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/object/SimpleObject.kt rename to compiler/testData/asJava/lightClasses/lightClassByFqName/object/SimpleObject.kt diff --git a/compiler/testData/asJava/lightClasses/lightClasses/publicField/CompanionObject.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/publicField/CompanionObject.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/publicField/CompanionObject.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/publicField/CompanionObject.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/publicField/CompanionObject.kt b/compiler/testData/asJava/lightClasses/lightClassByFqName/publicField/CompanionObject.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/publicField/CompanionObject.kt rename to compiler/testData/asJava/lightClasses/lightClassByFqName/publicField/CompanionObject.kt diff --git a/compiler/testData/asJava/lightClasses/lightClasses/publicField/Simple.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/publicField/Simple.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/publicField/Simple.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/publicField/Simple.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/publicField/Simple.kt b/compiler/testData/asJava/lightClasses/lightClassByFqName/publicField/Simple.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/publicField/Simple.kt rename to compiler/testData/asJava/lightClasses/lightClassByFqName/publicField/Simple.kt diff --git a/compiler/testData/asJava/lightClasses/lightClasses/script/HelloWorld.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/script/HelloWorld.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/script/HelloWorld.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/script/HelloWorld.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/script/HelloWorld.kts b/compiler/testData/asJava/lightClasses/lightClassByFqName/script/HelloWorld.kts similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/script/HelloWorld.kts rename to compiler/testData/asJava/lightClasses/lightClassByFqName/script/HelloWorld.kts diff --git a/compiler/testData/asJava/lightClasses/lightClasses/script/InnerClasses.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/script/InnerClasses.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/script/InnerClasses.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/script/InnerClasses.java diff --git a/compiler/testData/asJava/lightClasses/lightClasses/script/InnerClasses.kts b/compiler/testData/asJava/lightClasses/lightClassByFqName/script/InnerClasses.kts similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClasses/script/InnerClasses.kts rename to compiler/testData/asJava/lightClasses/lightClassByFqName/script/InnerClasses.kts diff --git a/compiler/tests-for-compiler-generator/tests/org/jetbrains/kotlin/test/generators/GenerateJUnit3CompilerTests.kt b/compiler/tests-for-compiler-generator/tests/org/jetbrains/kotlin/test/generators/GenerateJUnit3CompilerTests.kt index 9719bf6c424..714f4807bca 100644 --- a/compiler/tests-for-compiler-generator/tests/org/jetbrains/kotlin/test/generators/GenerateJUnit3CompilerTests.kt +++ b/compiler/tests-for-compiler-generator/tests/org/jetbrains/kotlin/test/generators/GenerateJUnit3CompilerTests.kt @@ -283,7 +283,7 @@ fun generateJUnit3CompilerTests(args: Array) { testClass { model( - "asJava/lightClasses/lightClasses", + "asJava/lightClasses/lightClassByFqName", excludeDirs = listOf("local", "ideRegression"), pattern = KT_OR_KTS_WITHOUT_DOTS_IN_NAME, ) diff --git a/compiler/tests/org/jetbrains/kotlin/asJava/KotlinLightClassTest.kt b/compiler/tests/org/jetbrains/kotlin/asJava/KotlinLightClassTest.kt index 0d476a1a900..479697eb1dd 100644 --- a/compiler/tests/org/jetbrains/kotlin/asJava/KotlinLightClassTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/asJava/KotlinLightClassTest.kt @@ -14,7 +14,7 @@ import java.io.File class KotlinLightClassTest : KotlinAsJavaTestBase() { override fun getKotlinSourceRoots(): List = listOf( File("compiler/testData/asJava/lightClasses/lightClassStructure/ClassObject.kt"), - File("compiler/testData/asJava/lightClasses/lightClasses/ideRegression/ImplementingMap.kt") + File("compiler/testData/asJava/lightClasses/lightClassByFqName/ideRegression/ImplementingMap.kt") ) private val key = Key.create("testKey") diff --git a/generators/analysis-api-generator/tests/org/jetbrains/kotlin/generators/tests/analysis/api/lightClasses.kt b/generators/analysis-api-generator/tests/org/jetbrains/kotlin/generators/tests/analysis/api/lightClasses.kt index bbd701e55c5..be617c07048 100644 --- a/generators/analysis-api-generator/tests/org/jetbrains/kotlin/generators/tests/analysis/api/lightClasses.kt +++ b/generators/analysis-api-generator/tests/org/jetbrains/kotlin/generators/tests/analysis/api/lightClasses.kt @@ -18,14 +18,14 @@ internal fun TestGroupSuite.generateSymbolLightClassesTests() { run { testClass { model( - "asJava/lightClasses/lightClasses", + "asJava/lightClasses/lightClassByFqName", pattern = TestGeneratorUtil.KT_WITHOUT_DOTS_IN_NAME ) } testClass { model( - "asJava/lightClasses/lightClasses", + "asJava/lightClasses/lightClassByFqName", excludeDirs = listOf("compilationErrors"), pattern = TestGeneratorUtil.KT_WITHOUT_DOTS_IN_NAME ) @@ -33,14 +33,14 @@ internal fun TestGroupSuite.generateSymbolLightClassesTests() { testClass { model( - "asJava/lightClasses/lightClasses", + "asJava/lightClasses/lightClassByFqName", pattern = TestGeneratorUtil.KT_WITHOUT_DOTS_IN_NAME ) } testClass { model( - "asJava/lightClasses/lightClasses", + "asJava/lightClasses/lightClassByFqName", excludeDirs = listOf("compilationErrors"), pattern = TestGeneratorUtil.KT_WITHOUT_DOTS_IN_NAME )