diff --git a/compiler/testData/asJava/lightClasses/ultraLightClasses/LateinitProperties.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/LateinitProperties.java similarity index 100% rename from compiler/testData/asJava/lightClasses/ultraLightClasses/LateinitProperties.java rename to compiler/testData/asJava/lightClasses/lightClassByPsi/LateinitProperties.java diff --git a/compiler/testData/asJava/lightClasses/ultraLightClasses/LateinitProperties.kt b/compiler/testData/asJava/lightClasses/lightClassByPsi/LateinitProperties.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/ultraLightClasses/LateinitProperties.kt rename to compiler/testData/asJava/lightClasses/lightClassByPsi/LateinitProperties.kt diff --git a/compiler/testData/asJava/lightClasses/ultraLightClasses/LateinitProperties.lib.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/LateinitProperties.lib.java similarity index 100% rename from compiler/testData/asJava/lightClasses/ultraLightClasses/LateinitProperties.lib.java rename to compiler/testData/asJava/lightClasses/lightClassByPsi/LateinitProperties.lib.java diff --git a/compiler/testData/asJava/lightClasses/ultraLightClasses/annotationWithSetParamPropertyModifier.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/annotationWithSetParamPropertyModifier.java similarity index 100% rename from compiler/testData/asJava/lightClasses/ultraLightClasses/annotationWithSetParamPropertyModifier.java rename to compiler/testData/asJava/lightClasses/lightClassByPsi/annotationWithSetParamPropertyModifier.java diff --git a/compiler/testData/asJava/lightClasses/ultraLightClasses/annotationWithSetParamPropertyModifier.kt b/compiler/testData/asJava/lightClasses/lightClassByPsi/annotationWithSetParamPropertyModifier.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/ultraLightClasses/annotationWithSetParamPropertyModifier.kt rename to compiler/testData/asJava/lightClasses/lightClassByPsi/annotationWithSetParamPropertyModifier.kt diff --git a/compiler/testData/asJava/lightClasses/ultraLightClasses/annotationWithSetParamPropertyModifier.lib.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/annotationWithSetParamPropertyModifier.lib.java similarity index 100% rename from compiler/testData/asJava/lightClasses/ultraLightClasses/annotationWithSetParamPropertyModifier.lib.java rename to compiler/testData/asJava/lightClasses/lightClassByPsi/annotationWithSetParamPropertyModifier.lib.java diff --git a/compiler/testData/asJava/lightClasses/ultraLightClasses/annotations.fir.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/annotations.fir.java similarity index 100% rename from compiler/testData/asJava/lightClasses/ultraLightClasses/annotations.fir.java rename to compiler/testData/asJava/lightClasses/lightClassByPsi/annotations.fir.java diff --git a/compiler/testData/asJava/lightClasses/ultraLightClasses/annotations.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/annotations.java similarity index 100% rename from compiler/testData/asJava/lightClasses/ultraLightClasses/annotations.java rename to compiler/testData/asJava/lightClasses/lightClassByPsi/annotations.java diff --git a/compiler/testData/asJava/lightClasses/ultraLightClasses/annotations.kt b/compiler/testData/asJava/lightClasses/lightClassByPsi/annotations.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/ultraLightClasses/annotations.kt rename to compiler/testData/asJava/lightClasses/lightClassByPsi/annotations.kt diff --git a/compiler/testData/asJava/lightClasses/ultraLightClasses/classModifiers.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/classModifiers.java similarity index 100% rename from compiler/testData/asJava/lightClasses/ultraLightClasses/classModifiers.java rename to compiler/testData/asJava/lightClasses/lightClassByPsi/classModifiers.java diff --git a/compiler/testData/asJava/lightClasses/ultraLightClasses/classModifiers.kt b/compiler/testData/asJava/lightClasses/lightClassByPsi/classModifiers.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/ultraLightClasses/classModifiers.kt rename to compiler/testData/asJava/lightClasses/lightClassByPsi/classModifiers.kt diff --git a/compiler/testData/asJava/lightClasses/ultraLightClasses/classModifiers.lib.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/classModifiers.lib.java similarity index 100% rename from compiler/testData/asJava/lightClasses/ultraLightClasses/classModifiers.lib.java rename to compiler/testData/asJava/lightClasses/lightClassByPsi/classModifiers.lib.java diff --git a/compiler/testData/asJava/lightClasses/ultraLightClasses/constructors.fir.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/constructors.fir.java similarity index 100% rename from compiler/testData/asJava/lightClasses/ultraLightClasses/constructors.fir.java rename to compiler/testData/asJava/lightClasses/lightClassByPsi/constructors.fir.java diff --git a/compiler/testData/asJava/lightClasses/ultraLightClasses/constructors.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/constructors.java similarity index 100% rename from compiler/testData/asJava/lightClasses/ultraLightClasses/constructors.java rename to compiler/testData/asJava/lightClasses/lightClassByPsi/constructors.java diff --git a/compiler/testData/asJava/lightClasses/ultraLightClasses/constructors.kt b/compiler/testData/asJava/lightClasses/lightClassByPsi/constructors.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/ultraLightClasses/constructors.kt rename to compiler/testData/asJava/lightClasses/lightClassByPsi/constructors.kt diff --git a/compiler/testData/asJava/lightClasses/ultraLightClasses/constructors.lib.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/constructors.lib.java similarity index 100% rename from compiler/testData/asJava/lightClasses/ultraLightClasses/constructors.lib.java rename to compiler/testData/asJava/lightClasses/lightClassByPsi/constructors.lib.java diff --git a/compiler/testData/asJava/lightClasses/ultraLightClasses/coroutines.fir.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/coroutines.fir.java similarity index 100% rename from compiler/testData/asJava/lightClasses/ultraLightClasses/coroutines.fir.java rename to compiler/testData/asJava/lightClasses/lightClassByPsi/coroutines.fir.java diff --git a/compiler/testData/asJava/lightClasses/ultraLightClasses/coroutines.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/coroutines.java similarity index 100% rename from compiler/testData/asJava/lightClasses/ultraLightClasses/coroutines.java rename to compiler/testData/asJava/lightClasses/lightClassByPsi/coroutines.java diff --git a/compiler/testData/asJava/lightClasses/ultraLightClasses/coroutines.kt b/compiler/testData/asJava/lightClasses/lightClassByPsi/coroutines.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/ultraLightClasses/coroutines.kt rename to compiler/testData/asJava/lightClasses/lightClassByPsi/coroutines.kt diff --git a/compiler/testData/asJava/lightClasses/ultraLightClasses/coroutines.lib.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/coroutines.lib.java similarity index 100% rename from compiler/testData/asJava/lightClasses/ultraLightClasses/coroutines.lib.java rename to compiler/testData/asJava/lightClasses/lightClassByPsi/coroutines.lib.java diff --git a/compiler/testData/asJava/lightClasses/ultraLightClasses/dataClasses.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/dataClasses.java similarity index 100% rename from compiler/testData/asJava/lightClasses/ultraLightClasses/dataClasses.java rename to compiler/testData/asJava/lightClasses/lightClassByPsi/dataClasses.java diff --git a/compiler/testData/asJava/lightClasses/ultraLightClasses/dataClasses.kt b/compiler/testData/asJava/lightClasses/lightClassByPsi/dataClasses.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/ultraLightClasses/dataClasses.kt rename to compiler/testData/asJava/lightClasses/lightClassByPsi/dataClasses.kt diff --git a/compiler/testData/asJava/lightClasses/ultraLightClasses/dataClasses.lib.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/dataClasses.lib.java similarity index 100% rename from compiler/testData/asJava/lightClasses/ultraLightClasses/dataClasses.lib.java rename to compiler/testData/asJava/lightClasses/lightClassByPsi/dataClasses.lib.java diff --git a/compiler/testData/asJava/lightClasses/ultraLightClasses/defaultMethodInKotlinWithSettingAll.fir.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/defaultMethodInKotlinWithSettingAll.fir.java similarity index 100% rename from compiler/testData/asJava/lightClasses/ultraLightClasses/defaultMethodInKotlinWithSettingAll.fir.java rename to compiler/testData/asJava/lightClasses/lightClassByPsi/defaultMethodInKotlinWithSettingAll.fir.java diff --git a/compiler/testData/asJava/lightClasses/ultraLightClasses/defaultMethodInKotlinWithSettingAll.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/defaultMethodInKotlinWithSettingAll.java similarity index 100% rename from compiler/testData/asJava/lightClasses/ultraLightClasses/defaultMethodInKotlinWithSettingAll.java rename to compiler/testData/asJava/lightClasses/lightClassByPsi/defaultMethodInKotlinWithSettingAll.java diff --git a/compiler/testData/asJava/lightClasses/ultraLightClasses/defaultMethodInKotlinWithSettingAll.kt b/compiler/testData/asJava/lightClasses/lightClassByPsi/defaultMethodInKotlinWithSettingAll.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/ultraLightClasses/defaultMethodInKotlinWithSettingAll.kt rename to compiler/testData/asJava/lightClasses/lightClassByPsi/defaultMethodInKotlinWithSettingAll.kt diff --git a/compiler/testData/asJava/lightClasses/ultraLightClasses/defaultMethodInKotlinWithSettingAllCompatibility.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/defaultMethodInKotlinWithSettingAllCompatibility.java similarity index 100% rename from compiler/testData/asJava/lightClasses/ultraLightClasses/defaultMethodInKotlinWithSettingAllCompatibility.java rename to compiler/testData/asJava/lightClasses/lightClassByPsi/defaultMethodInKotlinWithSettingAllCompatibility.java diff --git a/compiler/testData/asJava/lightClasses/ultraLightClasses/defaultMethodInKotlinWithSettingAllCompatibility.kt b/compiler/testData/asJava/lightClasses/lightClassByPsi/defaultMethodInKotlinWithSettingAllCompatibility.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/ultraLightClasses/defaultMethodInKotlinWithSettingAllCompatibility.kt rename to compiler/testData/asJava/lightClasses/lightClassByPsi/defaultMethodInKotlinWithSettingAllCompatibility.kt diff --git a/compiler/testData/asJava/lightClasses/ultraLightClasses/delegatesWithAnnotations.fir.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/delegatesWithAnnotations.fir.java similarity index 100% rename from compiler/testData/asJava/lightClasses/ultraLightClasses/delegatesWithAnnotations.fir.java rename to compiler/testData/asJava/lightClasses/lightClassByPsi/delegatesWithAnnotations.fir.java diff --git a/compiler/testData/asJava/lightClasses/ultraLightClasses/delegatesWithAnnotations.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/delegatesWithAnnotations.java similarity index 100% rename from compiler/testData/asJava/lightClasses/ultraLightClasses/delegatesWithAnnotations.java rename to compiler/testData/asJava/lightClasses/lightClassByPsi/delegatesWithAnnotations.java diff --git a/compiler/testData/asJava/lightClasses/ultraLightClasses/delegatesWithAnnotations.kt b/compiler/testData/asJava/lightClasses/lightClassByPsi/delegatesWithAnnotations.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/ultraLightClasses/delegatesWithAnnotations.kt rename to compiler/testData/asJava/lightClasses/lightClassByPsi/delegatesWithAnnotations.kt diff --git a/compiler/testData/asJava/lightClasses/ultraLightClasses/delegatesWithAnnotations.lib.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/delegatesWithAnnotations.lib.java similarity index 100% rename from compiler/testData/asJava/lightClasses/ultraLightClasses/delegatesWithAnnotations.lib.java rename to compiler/testData/asJava/lightClasses/lightClassByPsi/delegatesWithAnnotations.lib.java diff --git a/compiler/testData/asJava/lightClasses/ultraLightClasses/delegatingToInterfaces.fir.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/delegatingToInterfaces.fir.java similarity index 100% rename from compiler/testData/asJava/lightClasses/ultraLightClasses/delegatingToInterfaces.fir.java rename to compiler/testData/asJava/lightClasses/lightClassByPsi/delegatingToInterfaces.fir.java diff --git a/compiler/testData/asJava/lightClasses/ultraLightClasses/delegatingToInterfaces.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/delegatingToInterfaces.java similarity index 100% rename from compiler/testData/asJava/lightClasses/ultraLightClasses/delegatingToInterfaces.java rename to compiler/testData/asJava/lightClasses/lightClassByPsi/delegatingToInterfaces.java diff --git a/compiler/testData/asJava/lightClasses/ultraLightClasses/delegatingToInterfaces.kt b/compiler/testData/asJava/lightClasses/lightClassByPsi/delegatingToInterfaces.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/ultraLightClasses/delegatingToInterfaces.kt rename to compiler/testData/asJava/lightClasses/lightClassByPsi/delegatingToInterfaces.kt diff --git a/compiler/testData/asJava/lightClasses/ultraLightClasses/dollarsInNameLocal.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/dollarsInNameLocal.java similarity index 100% rename from compiler/testData/asJava/lightClasses/ultraLightClasses/dollarsInNameLocal.java rename to compiler/testData/asJava/lightClasses/lightClassByPsi/dollarsInNameLocal.java diff --git a/compiler/testData/asJava/lightClasses/ultraLightClasses/dollarsInNameLocal.kt b/compiler/testData/asJava/lightClasses/lightClassByPsi/dollarsInNameLocal.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/ultraLightClasses/dollarsInNameLocal.kt rename to compiler/testData/asJava/lightClasses/lightClassByPsi/dollarsInNameLocal.kt diff --git a/compiler/testData/asJava/lightClasses/ultraLightClasses/dollarsInNameLocal.lib.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/dollarsInNameLocal.lib.java similarity index 100% rename from compiler/testData/asJava/lightClasses/ultraLightClasses/dollarsInNameLocal.lib.java rename to compiler/testData/asJava/lightClasses/lightClassByPsi/dollarsInNameLocal.lib.java diff --git a/compiler/testData/asJava/lightClasses/ultraLightClasses/enums.fir.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/enums.fir.java similarity index 100% rename from compiler/testData/asJava/lightClasses/ultraLightClasses/enums.fir.java rename to compiler/testData/asJava/lightClasses/lightClassByPsi/enums.fir.java diff --git a/compiler/testData/asJava/lightClasses/ultraLightClasses/enums.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/enums.java similarity index 100% rename from compiler/testData/asJava/lightClasses/ultraLightClasses/enums.java rename to compiler/testData/asJava/lightClasses/lightClassByPsi/enums.java diff --git a/compiler/testData/asJava/lightClasses/ultraLightClasses/enums.kt b/compiler/testData/asJava/lightClasses/lightClassByPsi/enums.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/ultraLightClasses/enums.kt rename to compiler/testData/asJava/lightClasses/lightClassByPsi/enums.kt diff --git a/compiler/testData/asJava/lightClasses/ultraLightClasses/enums.lib.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/enums.lib.java similarity index 100% rename from compiler/testData/asJava/lightClasses/ultraLightClasses/enums.lib.java rename to compiler/testData/asJava/lightClasses/lightClassByPsi/enums.lib.java diff --git a/compiler/testData/asJava/lightClasses/ultraLightClasses/generics.fir.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/generics.fir.java similarity index 100% rename from compiler/testData/asJava/lightClasses/ultraLightClasses/generics.fir.java rename to compiler/testData/asJava/lightClasses/lightClassByPsi/generics.fir.java diff --git a/compiler/testData/asJava/lightClasses/ultraLightClasses/generics.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/generics.java similarity index 100% rename from compiler/testData/asJava/lightClasses/ultraLightClasses/generics.java rename to compiler/testData/asJava/lightClasses/lightClassByPsi/generics.java diff --git a/compiler/testData/asJava/lightClasses/ultraLightClasses/generics.kt b/compiler/testData/asJava/lightClasses/lightClassByPsi/generics.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/ultraLightClasses/generics.kt rename to compiler/testData/asJava/lightClasses/lightClassByPsi/generics.kt diff --git a/compiler/testData/asJava/lightClasses/ultraLightClasses/implementingKotlinCollections.fir.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/implementingKotlinCollections.fir.java similarity index 100% rename from compiler/testData/asJava/lightClasses/ultraLightClasses/implementingKotlinCollections.fir.java rename to compiler/testData/asJava/lightClasses/lightClassByPsi/implementingKotlinCollections.fir.java diff --git a/compiler/testData/asJava/lightClasses/ultraLightClasses/implementingKotlinCollections.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/implementingKotlinCollections.java similarity index 100% rename from compiler/testData/asJava/lightClasses/ultraLightClasses/implementingKotlinCollections.java rename to compiler/testData/asJava/lightClasses/lightClassByPsi/implementingKotlinCollections.java diff --git a/compiler/testData/asJava/lightClasses/ultraLightClasses/implementingKotlinCollections.kt b/compiler/testData/asJava/lightClasses/lightClassByPsi/implementingKotlinCollections.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/ultraLightClasses/implementingKotlinCollections.kt rename to compiler/testData/asJava/lightClasses/lightClassByPsi/implementingKotlinCollections.kt diff --git a/compiler/testData/asJava/lightClasses/ultraLightClasses/importAliases.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/importAliases.java similarity index 100% rename from compiler/testData/asJava/lightClasses/ultraLightClasses/importAliases.java rename to compiler/testData/asJava/lightClasses/lightClassByPsi/importAliases.java diff --git a/compiler/testData/asJava/lightClasses/ultraLightClasses/importAliases.kt b/compiler/testData/asJava/lightClasses/lightClassByPsi/importAliases.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/ultraLightClasses/importAliases.kt rename to compiler/testData/asJava/lightClasses/lightClassByPsi/importAliases.kt diff --git a/compiler/testData/asJava/lightClasses/ultraLightClasses/inferringAnonymousObjectTypes.fir.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/inferringAnonymousObjectTypes.fir.java similarity index 100% rename from compiler/testData/asJava/lightClasses/ultraLightClasses/inferringAnonymousObjectTypes.fir.java rename to compiler/testData/asJava/lightClasses/lightClassByPsi/inferringAnonymousObjectTypes.fir.java diff --git a/compiler/testData/asJava/lightClasses/ultraLightClasses/inferringAnonymousObjectTypes.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/inferringAnonymousObjectTypes.java similarity index 100% rename from compiler/testData/asJava/lightClasses/ultraLightClasses/inferringAnonymousObjectTypes.java rename to compiler/testData/asJava/lightClasses/lightClassByPsi/inferringAnonymousObjectTypes.java diff --git a/compiler/testData/asJava/lightClasses/ultraLightClasses/inferringAnonymousObjectTypes.kt b/compiler/testData/asJava/lightClasses/lightClassByPsi/inferringAnonymousObjectTypes.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/ultraLightClasses/inferringAnonymousObjectTypes.kt rename to compiler/testData/asJava/lightClasses/lightClassByPsi/inferringAnonymousObjectTypes.kt diff --git a/compiler/testData/asJava/lightClasses/ultraLightClasses/inheritance.fir.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/inheritance.fir.java similarity index 100% rename from compiler/testData/asJava/lightClasses/ultraLightClasses/inheritance.fir.java rename to compiler/testData/asJava/lightClasses/lightClassByPsi/inheritance.fir.java diff --git a/compiler/testData/asJava/lightClasses/ultraLightClasses/inheritance.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/inheritance.java similarity index 100% rename from compiler/testData/asJava/lightClasses/ultraLightClasses/inheritance.java rename to compiler/testData/asJava/lightClasses/lightClassByPsi/inheritance.java diff --git a/compiler/testData/asJava/lightClasses/ultraLightClasses/inheritance.kt b/compiler/testData/asJava/lightClasses/lightClassByPsi/inheritance.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/ultraLightClasses/inheritance.kt rename to compiler/testData/asJava/lightClasses/lightClassByPsi/inheritance.kt diff --git a/compiler/testData/asJava/lightClasses/ultraLightClasses/inlineClasses.fir.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/inlineClasses.fir.java similarity index 100% rename from compiler/testData/asJava/lightClasses/ultraLightClasses/inlineClasses.fir.java rename to compiler/testData/asJava/lightClasses/lightClassByPsi/inlineClasses.fir.java diff --git a/compiler/testData/asJava/lightClasses/ultraLightClasses/inlineClasses.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/inlineClasses.java similarity index 100% rename from compiler/testData/asJava/lightClasses/ultraLightClasses/inlineClasses.java rename to compiler/testData/asJava/lightClasses/lightClassByPsi/inlineClasses.java diff --git a/compiler/testData/asJava/lightClasses/ultraLightClasses/inlineClasses.kt b/compiler/testData/asJava/lightClasses/lightClassByPsi/inlineClasses.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/ultraLightClasses/inlineClasses.kt rename to compiler/testData/asJava/lightClasses/lightClassByPsi/inlineClasses.kt diff --git a/compiler/testData/asJava/lightClasses/ultraLightClasses/inlineOnly.fir.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/inlineOnly.fir.java similarity index 100% rename from compiler/testData/asJava/lightClasses/ultraLightClasses/inlineOnly.fir.java rename to compiler/testData/asJava/lightClasses/lightClassByPsi/inlineOnly.fir.java diff --git a/compiler/testData/asJava/lightClasses/ultraLightClasses/inlineOnly.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/inlineOnly.java similarity index 100% rename from compiler/testData/asJava/lightClasses/ultraLightClasses/inlineOnly.java rename to compiler/testData/asJava/lightClasses/lightClassByPsi/inlineOnly.java diff --git a/compiler/testData/asJava/lightClasses/ultraLightClasses/inlineOnly.kt b/compiler/testData/asJava/lightClasses/lightClassByPsi/inlineOnly.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/ultraLightClasses/inlineOnly.kt rename to compiler/testData/asJava/lightClasses/lightClassByPsi/inlineOnly.kt diff --git a/compiler/testData/asJava/lightClasses/ultraLightClasses/inlineReified.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/inlineReified.java similarity index 100% rename from compiler/testData/asJava/lightClasses/ultraLightClasses/inlineReified.java rename to compiler/testData/asJava/lightClasses/lightClassByPsi/inlineReified.java diff --git a/compiler/testData/asJava/lightClasses/ultraLightClasses/inlineReified.kt b/compiler/testData/asJava/lightClasses/lightClassByPsi/inlineReified.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/ultraLightClasses/inlineReified.kt rename to compiler/testData/asJava/lightClasses/lightClassByPsi/inlineReified.kt diff --git a/compiler/testData/asJava/lightClasses/ultraLightClasses/jvmField.fir.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmField.fir.java similarity index 100% rename from compiler/testData/asJava/lightClasses/ultraLightClasses/jvmField.fir.java rename to compiler/testData/asJava/lightClasses/lightClassByPsi/jvmField.fir.java diff --git a/compiler/testData/asJava/lightClasses/ultraLightClasses/jvmField.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmField.java similarity index 100% rename from compiler/testData/asJava/lightClasses/ultraLightClasses/jvmField.java rename to compiler/testData/asJava/lightClasses/lightClassByPsi/jvmField.java diff --git a/compiler/testData/asJava/lightClasses/ultraLightClasses/jvmField.kt b/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmField.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/ultraLightClasses/jvmField.kt rename to compiler/testData/asJava/lightClasses/lightClassByPsi/jvmField.kt diff --git a/compiler/testData/asJava/lightClasses/ultraLightClasses/jvmName.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmName.java similarity index 100% rename from compiler/testData/asJava/lightClasses/ultraLightClasses/jvmName.java rename to compiler/testData/asJava/lightClasses/lightClassByPsi/jvmName.java diff --git a/compiler/testData/asJava/lightClasses/ultraLightClasses/jvmName.kt b/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmName.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/ultraLightClasses/jvmName.kt rename to compiler/testData/asJava/lightClasses/lightClassByPsi/jvmName.kt diff --git a/compiler/testData/asJava/lightClasses/ultraLightClasses/jvmOverloads.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmOverloads.java similarity index 100% rename from compiler/testData/asJava/lightClasses/ultraLightClasses/jvmOverloads.java rename to compiler/testData/asJava/lightClasses/lightClassByPsi/jvmOverloads.java diff --git a/compiler/testData/asJava/lightClasses/ultraLightClasses/jvmOverloads.kt b/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmOverloads.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/ultraLightClasses/jvmOverloads.kt rename to compiler/testData/asJava/lightClasses/lightClassByPsi/jvmOverloads.kt diff --git a/compiler/testData/asJava/lightClasses/ultraLightClasses/jvmOverloads.lib.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmOverloads.lib.java similarity index 100% rename from compiler/testData/asJava/lightClasses/ultraLightClasses/jvmOverloads.lib.java rename to compiler/testData/asJava/lightClasses/lightClassByPsi/jvmOverloads.lib.java diff --git a/compiler/testData/asJava/lightClasses/ultraLightClasses/jvmRecord.fir.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmRecord.fir.java similarity index 100% rename from compiler/testData/asJava/lightClasses/ultraLightClasses/jvmRecord.fir.java rename to compiler/testData/asJava/lightClasses/lightClassByPsi/jvmRecord.fir.java diff --git a/compiler/testData/asJava/lightClasses/ultraLightClasses/jvmRecord.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmRecord.java similarity index 100% rename from compiler/testData/asJava/lightClasses/ultraLightClasses/jvmRecord.java rename to compiler/testData/asJava/lightClasses/lightClassByPsi/jvmRecord.java diff --git a/compiler/testData/asJava/lightClasses/ultraLightClasses/jvmRecord.kt b/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmRecord.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/ultraLightClasses/jvmRecord.kt rename to compiler/testData/asJava/lightClasses/lightClassByPsi/jvmRecord.kt diff --git a/compiler/testData/asJava/lightClasses/ultraLightClasses/jvmRecord.lib.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmRecord.lib.java similarity index 100% rename from compiler/testData/asJava/lightClasses/ultraLightClasses/jvmRecord.lib.java rename to compiler/testData/asJava/lightClasses/lightClassByPsi/jvmRecord.lib.java diff --git a/compiler/testData/asJava/lightClasses/ultraLightClasses/jvmStaticOnPropertySetter.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmStaticOnPropertySetter.java similarity index 100% rename from compiler/testData/asJava/lightClasses/ultraLightClasses/jvmStaticOnPropertySetter.java rename to compiler/testData/asJava/lightClasses/lightClassByPsi/jvmStaticOnPropertySetter.java diff --git a/compiler/testData/asJava/lightClasses/ultraLightClasses/jvmStaticOnPropertySetter.kt b/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmStaticOnPropertySetter.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/ultraLightClasses/jvmStaticOnPropertySetter.kt rename to compiler/testData/asJava/lightClasses/lightClassByPsi/jvmStaticOnPropertySetter.kt diff --git a/compiler/testData/asJava/lightClasses/ultraLightClasses/jvmStaticOnPropertySetter.lib.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmStaticOnPropertySetter.lib.java similarity index 100% rename from compiler/testData/asJava/lightClasses/ultraLightClasses/jvmStaticOnPropertySetter.lib.java rename to compiler/testData/asJava/lightClasses/lightClassByPsi/jvmStaticOnPropertySetter.lib.java diff --git a/compiler/testData/asJava/lightClasses/ultraLightClasses/jvmSynthetic.fir.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmSynthetic.fir.java similarity index 100% rename from compiler/testData/asJava/lightClasses/ultraLightClasses/jvmSynthetic.fir.java rename to compiler/testData/asJava/lightClasses/lightClassByPsi/jvmSynthetic.fir.java diff --git a/compiler/testData/asJava/lightClasses/ultraLightClasses/jvmSynthetic.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmSynthetic.java similarity index 100% rename from compiler/testData/asJava/lightClasses/ultraLightClasses/jvmSynthetic.java rename to compiler/testData/asJava/lightClasses/lightClassByPsi/jvmSynthetic.java diff --git a/compiler/testData/asJava/lightClasses/ultraLightClasses/jvmSynthetic.kt b/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmSynthetic.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/ultraLightClasses/jvmSynthetic.kt rename to compiler/testData/asJava/lightClasses/lightClassByPsi/jvmSynthetic.kt diff --git a/compiler/testData/asJava/lightClasses/ultraLightClasses/jvmSyntheticForAccessors.fir.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmSyntheticForAccessors.fir.java similarity index 100% rename from compiler/testData/asJava/lightClasses/ultraLightClasses/jvmSyntheticForAccessors.fir.java rename to compiler/testData/asJava/lightClasses/lightClassByPsi/jvmSyntheticForAccessors.fir.java diff --git a/compiler/testData/asJava/lightClasses/ultraLightClasses/jvmSyntheticForAccessors.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmSyntheticForAccessors.java similarity index 100% rename from compiler/testData/asJava/lightClasses/ultraLightClasses/jvmSyntheticForAccessors.java rename to compiler/testData/asJava/lightClasses/lightClassByPsi/jvmSyntheticForAccessors.java diff --git a/compiler/testData/asJava/lightClasses/ultraLightClasses/jvmSyntheticForAccessors.kt b/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmSyntheticForAccessors.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/ultraLightClasses/jvmSyntheticForAccessors.kt rename to compiler/testData/asJava/lightClasses/lightClassByPsi/jvmSyntheticForAccessors.kt diff --git a/compiler/testData/asJava/lightClasses/ultraLightClasses/jvmSyntheticForAccessors.lib.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmSyntheticForAccessors.lib.java similarity index 100% rename from compiler/testData/asJava/lightClasses/ultraLightClasses/jvmSyntheticForAccessors.lib.java rename to compiler/testData/asJava/lightClasses/lightClassByPsi/jvmSyntheticForAccessors.lib.java diff --git a/compiler/testData/asJava/lightClasses/ultraLightClasses/jvmWildcardAnnotations.fir.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmWildcardAnnotations.fir.java similarity index 100% rename from compiler/testData/asJava/lightClasses/ultraLightClasses/jvmWildcardAnnotations.fir.java rename to compiler/testData/asJava/lightClasses/lightClassByPsi/jvmWildcardAnnotations.fir.java diff --git a/compiler/testData/asJava/lightClasses/ultraLightClasses/jvmWildcardAnnotations.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmWildcardAnnotations.java similarity index 100% rename from compiler/testData/asJava/lightClasses/ultraLightClasses/jvmWildcardAnnotations.java rename to compiler/testData/asJava/lightClasses/lightClassByPsi/jvmWildcardAnnotations.java diff --git a/compiler/testData/asJava/lightClasses/ultraLightClasses/jvmWildcardAnnotations.kt b/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmWildcardAnnotations.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/ultraLightClasses/jvmWildcardAnnotations.kt rename to compiler/testData/asJava/lightClasses/lightClassByPsi/jvmWildcardAnnotations.kt diff --git a/compiler/testData/asJava/lightClasses/ultraLightClasses/jvmWildcardAnnotations.lib.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmWildcardAnnotations.lib.java similarity index 100% rename from compiler/testData/asJava/lightClasses/ultraLightClasses/jvmWildcardAnnotations.lib.java rename to compiler/testData/asJava/lightClasses/lightClassByPsi/jvmWildcardAnnotations.lib.java diff --git a/compiler/testData/asJava/lightClasses/ultraLightClasses/lateinitProperty.fir.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/lateinitProperty.fir.java similarity index 100% rename from compiler/testData/asJava/lightClasses/ultraLightClasses/lateinitProperty.fir.java rename to compiler/testData/asJava/lightClasses/lightClassByPsi/lateinitProperty.fir.java diff --git a/compiler/testData/asJava/lightClasses/ultraLightClasses/lateinitProperty.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/lateinitProperty.java similarity index 100% rename from compiler/testData/asJava/lightClasses/ultraLightClasses/lateinitProperty.java rename to compiler/testData/asJava/lightClasses/lightClassByPsi/lateinitProperty.java diff --git a/compiler/testData/asJava/lightClasses/ultraLightClasses/lateinitProperty.kt b/compiler/testData/asJava/lightClasses/lightClassByPsi/lateinitProperty.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/ultraLightClasses/lateinitProperty.kt rename to compiler/testData/asJava/lightClasses/lightClassByPsi/lateinitProperty.kt diff --git a/compiler/testData/asJava/lightClasses/ultraLightClasses/localClassDerived.fir.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/localClassDerived.fir.java similarity index 100% rename from compiler/testData/asJava/lightClasses/ultraLightClasses/localClassDerived.fir.java rename to compiler/testData/asJava/lightClasses/lightClassByPsi/localClassDerived.fir.java diff --git a/compiler/testData/asJava/lightClasses/ultraLightClasses/localClassDerived.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/localClassDerived.java similarity index 100% rename from compiler/testData/asJava/lightClasses/ultraLightClasses/localClassDerived.java rename to compiler/testData/asJava/lightClasses/lightClassByPsi/localClassDerived.java diff --git a/compiler/testData/asJava/lightClasses/ultraLightClasses/localClassDerived.kt b/compiler/testData/asJava/lightClasses/lightClassByPsi/localClassDerived.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/ultraLightClasses/localClassDerived.kt rename to compiler/testData/asJava/lightClasses/lightClassByPsi/localClassDerived.kt diff --git a/compiler/testData/asJava/lightClasses/ultraLightClasses/objects.fir.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/objects.fir.java similarity index 100% rename from compiler/testData/asJava/lightClasses/ultraLightClasses/objects.fir.java rename to compiler/testData/asJava/lightClasses/lightClassByPsi/objects.fir.java diff --git a/compiler/testData/asJava/lightClasses/ultraLightClasses/objects.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/objects.java similarity index 100% rename from compiler/testData/asJava/lightClasses/ultraLightClasses/objects.java rename to compiler/testData/asJava/lightClasses/lightClassByPsi/objects.java diff --git a/compiler/testData/asJava/lightClasses/ultraLightClasses/objects.kt b/compiler/testData/asJava/lightClasses/lightClassByPsi/objects.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/ultraLightClasses/objects.kt rename to compiler/testData/asJava/lightClasses/lightClassByPsi/objects.kt diff --git a/compiler/testData/asJava/lightClasses/ultraLightClasses/properties.fir.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/properties.fir.java similarity index 100% rename from compiler/testData/asJava/lightClasses/ultraLightClasses/properties.fir.java rename to compiler/testData/asJava/lightClasses/lightClassByPsi/properties.fir.java diff --git a/compiler/testData/asJava/lightClasses/ultraLightClasses/properties.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/properties.java similarity index 100% rename from compiler/testData/asJava/lightClasses/ultraLightClasses/properties.java rename to compiler/testData/asJava/lightClasses/lightClassByPsi/properties.java diff --git a/compiler/testData/asJava/lightClasses/ultraLightClasses/properties.kt b/compiler/testData/asJava/lightClasses/lightClassByPsi/properties.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/ultraLightClasses/properties.kt rename to compiler/testData/asJava/lightClasses/lightClassByPsi/properties.kt diff --git a/compiler/testData/asJava/lightClasses/ultraLightClasses/simpleFunctions.fir.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/simpleFunctions.fir.java similarity index 100% rename from compiler/testData/asJava/lightClasses/ultraLightClasses/simpleFunctions.fir.java rename to compiler/testData/asJava/lightClasses/lightClassByPsi/simpleFunctions.fir.java diff --git a/compiler/testData/asJava/lightClasses/ultraLightClasses/simpleFunctions.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/simpleFunctions.java similarity index 100% rename from compiler/testData/asJava/lightClasses/ultraLightClasses/simpleFunctions.java rename to compiler/testData/asJava/lightClasses/lightClassByPsi/simpleFunctions.java diff --git a/compiler/testData/asJava/lightClasses/ultraLightClasses/simpleFunctions.kt b/compiler/testData/asJava/lightClasses/lightClassByPsi/simpleFunctions.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/ultraLightClasses/simpleFunctions.kt rename to compiler/testData/asJava/lightClasses/lightClassByPsi/simpleFunctions.kt diff --git a/compiler/testData/asJava/lightClasses/ultraLightClasses/throwsAnnotation.fir.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/throwsAnnotation.fir.java similarity index 100% rename from compiler/testData/asJava/lightClasses/ultraLightClasses/throwsAnnotation.fir.java rename to compiler/testData/asJava/lightClasses/lightClassByPsi/throwsAnnotation.fir.java diff --git a/compiler/testData/asJava/lightClasses/ultraLightClasses/throwsAnnotation.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/throwsAnnotation.java similarity index 100% rename from compiler/testData/asJava/lightClasses/ultraLightClasses/throwsAnnotation.java rename to compiler/testData/asJava/lightClasses/lightClassByPsi/throwsAnnotation.java diff --git a/compiler/testData/asJava/lightClasses/ultraLightClasses/throwsAnnotation.kt b/compiler/testData/asJava/lightClasses/lightClassByPsi/throwsAnnotation.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/ultraLightClasses/throwsAnnotation.kt rename to compiler/testData/asJava/lightClasses/lightClassByPsi/throwsAnnotation.kt diff --git a/compiler/testData/asJava/lightClasses/ultraLightClasses/throwsAnnotation.lib.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/throwsAnnotation.lib.java similarity index 100% rename from compiler/testData/asJava/lightClasses/ultraLightClasses/throwsAnnotation.lib.java rename to compiler/testData/asJava/lightClasses/lightClassByPsi/throwsAnnotation.lib.java diff --git a/compiler/testData/asJava/lightClasses/ultraLightClasses/typeAliases.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/typeAliases.java similarity index 100% rename from compiler/testData/asJava/lightClasses/ultraLightClasses/typeAliases.java rename to compiler/testData/asJava/lightClasses/lightClassByPsi/typeAliases.java diff --git a/compiler/testData/asJava/lightClasses/ultraLightClasses/typeAliases.kt b/compiler/testData/asJava/lightClasses/lightClassByPsi/typeAliases.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/ultraLightClasses/typeAliases.kt rename to compiler/testData/asJava/lightClasses/lightClassByPsi/typeAliases.kt diff --git a/compiler/testData/asJava/lightClasses/ultraLightClasses/typeAliases.lib.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/typeAliases.lib.java similarity index 100% rename from compiler/testData/asJava/lightClasses/ultraLightClasses/typeAliases.lib.java rename to compiler/testData/asJava/lightClasses/lightClassByPsi/typeAliases.lib.java diff --git a/compiler/testData/asJava/lightClasses/ultraLightClasses/typeAnnotations.fir.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/typeAnnotations.fir.java similarity index 100% rename from compiler/testData/asJava/lightClasses/ultraLightClasses/typeAnnotations.fir.java rename to compiler/testData/asJava/lightClasses/lightClassByPsi/typeAnnotations.fir.java diff --git a/compiler/testData/asJava/lightClasses/ultraLightClasses/typeAnnotations.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/typeAnnotations.java similarity index 100% rename from compiler/testData/asJava/lightClasses/ultraLightClasses/typeAnnotations.java rename to compiler/testData/asJava/lightClasses/lightClassByPsi/typeAnnotations.java diff --git a/compiler/testData/asJava/lightClasses/ultraLightClasses/typeAnnotations.kt b/compiler/testData/asJava/lightClasses/lightClassByPsi/typeAnnotations.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/ultraLightClasses/typeAnnotations.kt rename to compiler/testData/asJava/lightClasses/lightClassByPsi/typeAnnotations.kt diff --git a/compiler/testData/asJava/lightClasses/ultraLightClasses/wildcardOptimization.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/wildcardOptimization.java similarity index 100% rename from compiler/testData/asJava/lightClasses/ultraLightClasses/wildcardOptimization.java rename to compiler/testData/asJava/lightClasses/lightClassByPsi/wildcardOptimization.java diff --git a/compiler/testData/asJava/lightClasses/ultraLightClasses/wildcardOptimization.kt b/compiler/testData/asJava/lightClasses/lightClassByPsi/wildcardOptimization.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/ultraLightClasses/wildcardOptimization.kt rename to compiler/testData/asJava/lightClasses/lightClassByPsi/wildcardOptimization.kt diff --git a/compiler/testData/asJava/lightClasses/ultraLightClasses/wildcardOptimization.lib.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/wildcardOptimization.lib.java similarity index 100% rename from compiler/testData/asJava/lightClasses/ultraLightClasses/wildcardOptimization.lib.java rename to compiler/testData/asJava/lightClasses/lightClassByPsi/wildcardOptimization.lib.java 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 be617c07048..ec29b05418a 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 @@ -49,11 +49,11 @@ internal fun TestGroupSuite.generateSymbolLightClassesTests() { run { testClass { - model("asJava/lightClasses/ultraLightClasses", pattern = TestGeneratorUtil.KT_OR_KTS) + model("asJava/lightClasses/lightClassByPsi", pattern = TestGeneratorUtil.KT_OR_KTS) } testClass { - model("asJava/lightClasses/ultraLightClasses", pattern = TestGeneratorUtil.KT_OR_KTS) + model("asJava/lightClasses/lightClassByPsi", pattern = TestGeneratorUtil.KT_OR_KTS) } }