From 1708b4fe4885a72fe1518b3a3b862cfb83e5dd4a Mon Sep 17 00:00:00 2001 From: Dmitry Gridin Date: Tue, 26 Jul 2022 17:14:21 +0200 Subject: [PATCH] [light classes] move light-classes-base module to analysis ^KT-53097 --- analysis/analysis-api-fir/build.gradle.kts | 2 +- analysis/decompiled/decompiler-to-psi/build.gradle.kts | 2 +- .../light-classes-for-decompiled-fe10/build.gradle.kts | 2 +- .../decompiled/light-classes-for-decompiled/build.gradle.kts | 2 +- analysis/kt-references/build.gradle.kts | 2 +- analysis/kt-references/kt-references-fe10/build.gradle.kts | 2 +- {compiler => analysis}/light-classes-base/build.gradle.kts | 0 .../src/org/jetbrains/kotlin/asJava/ImpreciseResolveResult.kt | 0 .../src/org/jetbrains/kotlin/asJava/KotlinAsJavaSupport.kt | 0 .../src/org/jetbrains/kotlin/asJava/LightClassUtil.kt | 0 .../kotlin/asJava/builder/ClsWrapperStubPsiFactory.java | 0 .../org/jetbrains/kotlin/asJava/builder/LightElementOrigin.kt | 0 .../kotlin/asJava/classes/KotlinClassInnerStuffCache.kt | 0 .../jetbrains/kotlin/asJava/classes/KotlinLightClassFactory.kt | 0 .../kotlin/asJava/classes/KotlinLightReferenceListBuilder.java | 0 .../kotlin/asJava/classes/KotlinSuperTypeListBuilder.kt | 0 .../src/org/jetbrains/kotlin/asJava/classes/KtFakeLightClass.kt | 0 .../src/org/jetbrains/kotlin/asJava/classes/KtLightClass.kt | 0 .../src/org/jetbrains/kotlin/asJava/classes/KtLightClassBase.kt | 0 .../jetbrains/kotlin/asJava/classes/KtLightClassForFacade.kt | 0 .../kotlin/asJava/classes/KtLightClassForFacadeBase.kt | 0 .../jetbrains/kotlin/asJava/classes/KtLightClassForScript.kt | 0 .../kotlin/asJava/classes/KtLightClassForSourceDeclaration.kt | 0 .../classes/KtUltraLightElementWithNullabilityAnnotation.kt | 0 .../kotlin/asJava/classes/KtUltraLightTypeParameter.kt | 0 .../jetbrains/kotlin/asJava/classes/LightClassesLazyCreator.kt | 0 .../src/org/jetbrains/kotlin/asJava/classes/implUtils.kt | 0 .../jetbrains/kotlin/asJava/classes/lightClassPlatformUtils.kt | 0 .../src/org/jetbrains/kotlin/asJava/classes/methodIndices.kt | 0 .../jetbrains/kotlin/asJava/elements/FakeFileForLightClass.kt | 0 .../kotlin/asJava/elements/KotlinLightTypeParameterBuilder.kt | 0 .../asJava/elements/KotlinLightTypeParameterListBuilder.kt | 0 .../kotlin/asJava/elements/KtLightAbstractAnnotation.kt | 0 .../kotlin/asJava/elements/KtLightAnnotationsValues.kt | 0 .../org/jetbrains/kotlin/asJava/elements/KtLightElementBase.kt | 0 .../src/org/jetbrains/kotlin/asJava/elements/KtLightElements.kt | 0 .../org/jetbrains/kotlin/asJava/elements/KtLightIdentifier.kt | 0 .../org/jetbrains/kotlin/asJava/elements/KtLightMemberImpl.kt | 0 .../org/jetbrains/kotlin/asJava/elements/KtLightMethodImpl.kt | 0 .../org/jetbrains/kotlin/asJava/elements/KtLightModifierList.kt | 0 .../jetbrains/kotlin/asJava/elements/KtLightParameterList.kt | 0 .../asJava/elements/KtLightPsiJavaCodeReferenceElement.kt | 0 .../src/org/jetbrains/kotlin/asJava/elements/LightParameter.kt | 0 .../jetbrains/kotlin/asJava/elements/LightVariableBuilder.java | 0 .../jetbrains/kotlin/asJava/elements/PsiElementWithOrigin.kt | 0 .../src/org/jetbrains/kotlin/asJava/elements/utils.kt | 0 .../src/org/jetbrains/kotlin/asJava/finder/JavaElementFinder.kt | 0 .../src/org/jetbrains/kotlin/asJava/finder/KtLightPackage.java | 0 .../src/org/jetbrains/kotlin/asJava/lightClassUtils.kt | 0 analysis/symbol-light-classes/build.gradle.kts | 2 +- build.gradle.kts | 2 +- compiler/light-classes/build.gradle.kts | 2 +- compiler/tests-common/build.gradle.kts | 2 +- settings.gradle | 2 +- 54 files changed, 11 insertions(+), 11 deletions(-) rename {compiler => analysis}/light-classes-base/build.gradle.kts (100%) rename {compiler => analysis}/light-classes-base/src/org/jetbrains/kotlin/asJava/ImpreciseResolveResult.kt (100%) rename {compiler => analysis}/light-classes-base/src/org/jetbrains/kotlin/asJava/KotlinAsJavaSupport.kt (100%) rename {compiler => analysis}/light-classes-base/src/org/jetbrains/kotlin/asJava/LightClassUtil.kt (100%) rename {compiler => analysis}/light-classes-base/src/org/jetbrains/kotlin/asJava/builder/ClsWrapperStubPsiFactory.java (100%) rename {compiler => analysis}/light-classes-base/src/org/jetbrains/kotlin/asJava/builder/LightElementOrigin.kt (100%) rename {compiler => analysis}/light-classes-base/src/org/jetbrains/kotlin/asJava/classes/KotlinClassInnerStuffCache.kt (100%) rename {compiler => analysis}/light-classes-base/src/org/jetbrains/kotlin/asJava/classes/KotlinLightClassFactory.kt (100%) rename {compiler => analysis}/light-classes-base/src/org/jetbrains/kotlin/asJava/classes/KotlinLightReferenceListBuilder.java (100%) rename {compiler => analysis}/light-classes-base/src/org/jetbrains/kotlin/asJava/classes/KotlinSuperTypeListBuilder.kt (100%) rename {compiler => analysis}/light-classes-base/src/org/jetbrains/kotlin/asJava/classes/KtFakeLightClass.kt (100%) rename {compiler => analysis}/light-classes-base/src/org/jetbrains/kotlin/asJava/classes/KtLightClass.kt (100%) rename {compiler => analysis}/light-classes-base/src/org/jetbrains/kotlin/asJava/classes/KtLightClassBase.kt (100%) rename {compiler => analysis}/light-classes-base/src/org/jetbrains/kotlin/asJava/classes/KtLightClassForFacade.kt (100%) rename {compiler => analysis}/light-classes-base/src/org/jetbrains/kotlin/asJava/classes/KtLightClassForFacadeBase.kt (100%) rename {compiler => analysis}/light-classes-base/src/org/jetbrains/kotlin/asJava/classes/KtLightClassForScript.kt (100%) rename {compiler => analysis}/light-classes-base/src/org/jetbrains/kotlin/asJava/classes/KtLightClassForSourceDeclaration.kt (100%) rename {compiler => analysis}/light-classes-base/src/org/jetbrains/kotlin/asJava/classes/KtUltraLightElementWithNullabilityAnnotation.kt (100%) rename {compiler => analysis}/light-classes-base/src/org/jetbrains/kotlin/asJava/classes/KtUltraLightTypeParameter.kt (100%) rename {compiler => analysis}/light-classes-base/src/org/jetbrains/kotlin/asJava/classes/LightClassesLazyCreator.kt (100%) rename {compiler => analysis}/light-classes-base/src/org/jetbrains/kotlin/asJava/classes/implUtils.kt (100%) rename {compiler => analysis}/light-classes-base/src/org/jetbrains/kotlin/asJava/classes/lightClassPlatformUtils.kt (100%) rename {compiler => analysis}/light-classes-base/src/org/jetbrains/kotlin/asJava/classes/methodIndices.kt (100%) rename {compiler => analysis}/light-classes-base/src/org/jetbrains/kotlin/asJava/elements/FakeFileForLightClass.kt (100%) rename {compiler => analysis}/light-classes-base/src/org/jetbrains/kotlin/asJava/elements/KotlinLightTypeParameterBuilder.kt (100%) rename {compiler => analysis}/light-classes-base/src/org/jetbrains/kotlin/asJava/elements/KotlinLightTypeParameterListBuilder.kt (100%) rename {compiler => analysis}/light-classes-base/src/org/jetbrains/kotlin/asJava/elements/KtLightAbstractAnnotation.kt (100%) rename {compiler => analysis}/light-classes-base/src/org/jetbrains/kotlin/asJava/elements/KtLightAnnotationsValues.kt (100%) rename {compiler => analysis}/light-classes-base/src/org/jetbrains/kotlin/asJava/elements/KtLightElementBase.kt (100%) rename {compiler => analysis}/light-classes-base/src/org/jetbrains/kotlin/asJava/elements/KtLightElements.kt (100%) rename {compiler => analysis}/light-classes-base/src/org/jetbrains/kotlin/asJava/elements/KtLightIdentifier.kt (100%) rename {compiler => analysis}/light-classes-base/src/org/jetbrains/kotlin/asJava/elements/KtLightMemberImpl.kt (100%) rename {compiler => analysis}/light-classes-base/src/org/jetbrains/kotlin/asJava/elements/KtLightMethodImpl.kt (100%) rename {compiler => analysis}/light-classes-base/src/org/jetbrains/kotlin/asJava/elements/KtLightModifierList.kt (100%) rename {compiler => analysis}/light-classes-base/src/org/jetbrains/kotlin/asJava/elements/KtLightParameterList.kt (100%) rename {compiler => analysis}/light-classes-base/src/org/jetbrains/kotlin/asJava/elements/KtLightPsiJavaCodeReferenceElement.kt (100%) rename {compiler => analysis}/light-classes-base/src/org/jetbrains/kotlin/asJava/elements/LightParameter.kt (100%) rename {compiler => analysis}/light-classes-base/src/org/jetbrains/kotlin/asJava/elements/LightVariableBuilder.java (100%) rename {compiler => analysis}/light-classes-base/src/org/jetbrains/kotlin/asJava/elements/PsiElementWithOrigin.kt (100%) rename {compiler => analysis}/light-classes-base/src/org/jetbrains/kotlin/asJava/elements/utils.kt (100%) rename {compiler => analysis}/light-classes-base/src/org/jetbrains/kotlin/asJava/finder/JavaElementFinder.kt (100%) rename {compiler => analysis}/light-classes-base/src/org/jetbrains/kotlin/asJava/finder/KtLightPackage.java (100%) rename {compiler => analysis}/light-classes-base/src/org/jetbrains/kotlin/asJava/lightClassUtils.kt (100%) diff --git a/analysis/analysis-api-fir/build.gradle.kts b/analysis/analysis-api-fir/build.gradle.kts index 1aa17454b57..d55778c5865 100644 --- a/analysis/analysis-api-fir/build.gradle.kts +++ b/analysis/analysis-api-fir/build.gradle.kts @@ -17,7 +17,7 @@ dependencies { api(project(":analysis:low-level-api-fir")) api(project(":analysis:analysis-api")) api(project(":analysis:analysis-api-impl-base")) - api(project(":compiler:light-classes-base")) + api(project(":analysis:light-classes-base")) api(project(":compiler:backend")) api(intellijCore()) implementation(project(":analysis:analysis-api-providers")) diff --git a/analysis/decompiled/decompiler-to-psi/build.gradle.kts b/analysis/decompiled/decompiler-to-psi/build.gradle.kts index f6f018abc61..b8d680107ed 100644 --- a/analysis/decompiled/decompiler-to-psi/build.gradle.kts +++ b/analysis/decompiled/decompiler-to-psi/build.gradle.kts @@ -7,7 +7,7 @@ dependencies { implementation(project(":compiler:psi")) implementation(project(":compiler:frontend.java")) implementation(project(":core:compiler.common")) - implementation(project(":compiler:light-classes-base")) + implementation(project(":analysis:light-classes-base")) implementation(project(":analysis:decompiled:decompiler-to-stubs")) implementation(project(":analysis:decompiled:decompiler-to-file-stubs")) implementation(intellijCore()) diff --git a/analysis/decompiled/light-classes-for-decompiled-fe10/build.gradle.kts b/analysis/decompiled/light-classes-for-decompiled-fe10/build.gradle.kts index 04f19817e42..26497708c35 100644 --- a/analysis/decompiled/light-classes-for-decompiled-fe10/build.gradle.kts +++ b/analysis/decompiled/light-classes-for-decompiled-fe10/build.gradle.kts @@ -7,7 +7,7 @@ dependencies { api(project(":compiler:psi")) api(project(":analysis:decompiled:decompiler-to-psi")) api(project(":analysis:decompiled:light-classes-for-decompiled")) - api(project(":compiler:light-classes-base")) + api(project(":analysis:light-classes-base")) implementation(intellijCore()) } diff --git a/analysis/decompiled/light-classes-for-decompiled/build.gradle.kts b/analysis/decompiled/light-classes-for-decompiled/build.gradle.kts index a0acdbc4053..5ea94427143 100644 --- a/analysis/decompiled/light-classes-for-decompiled/build.gradle.kts +++ b/analysis/decompiled/light-classes-for-decompiled/build.gradle.kts @@ -6,7 +6,7 @@ plugins { dependencies { api(project(":compiler:psi")) api(project(":analysis:decompiled:decompiler-to-psi")) - api(project(":compiler:light-classes-base")) + api(project(":analysis:light-classes-base")) implementation(intellijCore()) } diff --git a/analysis/kt-references/build.gradle.kts b/analysis/kt-references/build.gradle.kts index 3f4b072c399..146977168ef 100644 --- a/analysis/kt-references/build.gradle.kts +++ b/analysis/kt-references/build.gradle.kts @@ -5,7 +5,7 @@ plugins { dependencies { implementation(project(":compiler:psi")) - implementation(project(":compiler:light-classes-base")) + implementation(project(":analysis:light-classes-base")) implementation(intellijCore()) compileOnly(commonDependency("com.google.guava:guava")) diff --git a/analysis/kt-references/kt-references-fe10/build.gradle.kts b/analysis/kt-references/kt-references-fe10/build.gradle.kts index dc5c5b3110e..f44046d1ed8 100644 --- a/analysis/kt-references/kt-references-fe10/build.gradle.kts +++ b/analysis/kt-references/kt-references-fe10/build.gradle.kts @@ -7,7 +7,7 @@ dependencies { implementation(project(":analysis:kt-references")) implementation(project(":compiler:psi")) - implementation(project(":compiler:light-classes-base")) + implementation(project(":analysis:light-classes-base")) implementation(project(":compiler:frontend.java")) implementation(intellijCore()) diff --git a/compiler/light-classes-base/build.gradle.kts b/analysis/light-classes-base/build.gradle.kts similarity index 100% rename from compiler/light-classes-base/build.gradle.kts rename to analysis/light-classes-base/build.gradle.kts diff --git a/compiler/light-classes-base/src/org/jetbrains/kotlin/asJava/ImpreciseResolveResult.kt b/analysis/light-classes-base/src/org/jetbrains/kotlin/asJava/ImpreciseResolveResult.kt similarity index 100% rename from compiler/light-classes-base/src/org/jetbrains/kotlin/asJava/ImpreciseResolveResult.kt rename to analysis/light-classes-base/src/org/jetbrains/kotlin/asJava/ImpreciseResolveResult.kt diff --git a/compiler/light-classes-base/src/org/jetbrains/kotlin/asJava/KotlinAsJavaSupport.kt b/analysis/light-classes-base/src/org/jetbrains/kotlin/asJava/KotlinAsJavaSupport.kt similarity index 100% rename from compiler/light-classes-base/src/org/jetbrains/kotlin/asJava/KotlinAsJavaSupport.kt rename to analysis/light-classes-base/src/org/jetbrains/kotlin/asJava/KotlinAsJavaSupport.kt diff --git a/compiler/light-classes-base/src/org/jetbrains/kotlin/asJava/LightClassUtil.kt b/analysis/light-classes-base/src/org/jetbrains/kotlin/asJava/LightClassUtil.kt similarity index 100% rename from compiler/light-classes-base/src/org/jetbrains/kotlin/asJava/LightClassUtil.kt rename to analysis/light-classes-base/src/org/jetbrains/kotlin/asJava/LightClassUtil.kt diff --git a/compiler/light-classes-base/src/org/jetbrains/kotlin/asJava/builder/ClsWrapperStubPsiFactory.java b/analysis/light-classes-base/src/org/jetbrains/kotlin/asJava/builder/ClsWrapperStubPsiFactory.java similarity index 100% rename from compiler/light-classes-base/src/org/jetbrains/kotlin/asJava/builder/ClsWrapperStubPsiFactory.java rename to analysis/light-classes-base/src/org/jetbrains/kotlin/asJava/builder/ClsWrapperStubPsiFactory.java diff --git a/compiler/light-classes-base/src/org/jetbrains/kotlin/asJava/builder/LightElementOrigin.kt b/analysis/light-classes-base/src/org/jetbrains/kotlin/asJava/builder/LightElementOrigin.kt similarity index 100% rename from compiler/light-classes-base/src/org/jetbrains/kotlin/asJava/builder/LightElementOrigin.kt rename to analysis/light-classes-base/src/org/jetbrains/kotlin/asJava/builder/LightElementOrigin.kt diff --git a/compiler/light-classes-base/src/org/jetbrains/kotlin/asJava/classes/KotlinClassInnerStuffCache.kt b/analysis/light-classes-base/src/org/jetbrains/kotlin/asJava/classes/KotlinClassInnerStuffCache.kt similarity index 100% rename from compiler/light-classes-base/src/org/jetbrains/kotlin/asJava/classes/KotlinClassInnerStuffCache.kt rename to analysis/light-classes-base/src/org/jetbrains/kotlin/asJava/classes/KotlinClassInnerStuffCache.kt diff --git a/compiler/light-classes-base/src/org/jetbrains/kotlin/asJava/classes/KotlinLightClassFactory.kt b/analysis/light-classes-base/src/org/jetbrains/kotlin/asJava/classes/KotlinLightClassFactory.kt similarity index 100% rename from compiler/light-classes-base/src/org/jetbrains/kotlin/asJava/classes/KotlinLightClassFactory.kt rename to analysis/light-classes-base/src/org/jetbrains/kotlin/asJava/classes/KotlinLightClassFactory.kt diff --git a/compiler/light-classes-base/src/org/jetbrains/kotlin/asJava/classes/KotlinLightReferenceListBuilder.java b/analysis/light-classes-base/src/org/jetbrains/kotlin/asJava/classes/KotlinLightReferenceListBuilder.java similarity index 100% rename from compiler/light-classes-base/src/org/jetbrains/kotlin/asJava/classes/KotlinLightReferenceListBuilder.java rename to analysis/light-classes-base/src/org/jetbrains/kotlin/asJava/classes/KotlinLightReferenceListBuilder.java diff --git a/compiler/light-classes-base/src/org/jetbrains/kotlin/asJava/classes/KotlinSuperTypeListBuilder.kt b/analysis/light-classes-base/src/org/jetbrains/kotlin/asJava/classes/KotlinSuperTypeListBuilder.kt similarity index 100% rename from compiler/light-classes-base/src/org/jetbrains/kotlin/asJava/classes/KotlinSuperTypeListBuilder.kt rename to analysis/light-classes-base/src/org/jetbrains/kotlin/asJava/classes/KotlinSuperTypeListBuilder.kt diff --git a/compiler/light-classes-base/src/org/jetbrains/kotlin/asJava/classes/KtFakeLightClass.kt b/analysis/light-classes-base/src/org/jetbrains/kotlin/asJava/classes/KtFakeLightClass.kt similarity index 100% rename from compiler/light-classes-base/src/org/jetbrains/kotlin/asJava/classes/KtFakeLightClass.kt rename to analysis/light-classes-base/src/org/jetbrains/kotlin/asJava/classes/KtFakeLightClass.kt diff --git a/compiler/light-classes-base/src/org/jetbrains/kotlin/asJava/classes/KtLightClass.kt b/analysis/light-classes-base/src/org/jetbrains/kotlin/asJava/classes/KtLightClass.kt similarity index 100% rename from compiler/light-classes-base/src/org/jetbrains/kotlin/asJava/classes/KtLightClass.kt rename to analysis/light-classes-base/src/org/jetbrains/kotlin/asJava/classes/KtLightClass.kt diff --git a/compiler/light-classes-base/src/org/jetbrains/kotlin/asJava/classes/KtLightClassBase.kt b/analysis/light-classes-base/src/org/jetbrains/kotlin/asJava/classes/KtLightClassBase.kt similarity index 100% rename from compiler/light-classes-base/src/org/jetbrains/kotlin/asJava/classes/KtLightClassBase.kt rename to analysis/light-classes-base/src/org/jetbrains/kotlin/asJava/classes/KtLightClassBase.kt diff --git a/compiler/light-classes-base/src/org/jetbrains/kotlin/asJava/classes/KtLightClassForFacade.kt b/analysis/light-classes-base/src/org/jetbrains/kotlin/asJava/classes/KtLightClassForFacade.kt similarity index 100% rename from compiler/light-classes-base/src/org/jetbrains/kotlin/asJava/classes/KtLightClassForFacade.kt rename to analysis/light-classes-base/src/org/jetbrains/kotlin/asJava/classes/KtLightClassForFacade.kt diff --git a/compiler/light-classes-base/src/org/jetbrains/kotlin/asJava/classes/KtLightClassForFacadeBase.kt b/analysis/light-classes-base/src/org/jetbrains/kotlin/asJava/classes/KtLightClassForFacadeBase.kt similarity index 100% rename from compiler/light-classes-base/src/org/jetbrains/kotlin/asJava/classes/KtLightClassForFacadeBase.kt rename to analysis/light-classes-base/src/org/jetbrains/kotlin/asJava/classes/KtLightClassForFacadeBase.kt diff --git a/compiler/light-classes-base/src/org/jetbrains/kotlin/asJava/classes/KtLightClassForScript.kt b/analysis/light-classes-base/src/org/jetbrains/kotlin/asJava/classes/KtLightClassForScript.kt similarity index 100% rename from compiler/light-classes-base/src/org/jetbrains/kotlin/asJava/classes/KtLightClassForScript.kt rename to analysis/light-classes-base/src/org/jetbrains/kotlin/asJava/classes/KtLightClassForScript.kt diff --git a/compiler/light-classes-base/src/org/jetbrains/kotlin/asJava/classes/KtLightClassForSourceDeclaration.kt b/analysis/light-classes-base/src/org/jetbrains/kotlin/asJava/classes/KtLightClassForSourceDeclaration.kt similarity index 100% rename from compiler/light-classes-base/src/org/jetbrains/kotlin/asJava/classes/KtLightClassForSourceDeclaration.kt rename to analysis/light-classes-base/src/org/jetbrains/kotlin/asJava/classes/KtLightClassForSourceDeclaration.kt diff --git a/compiler/light-classes-base/src/org/jetbrains/kotlin/asJava/classes/KtUltraLightElementWithNullabilityAnnotation.kt b/analysis/light-classes-base/src/org/jetbrains/kotlin/asJava/classes/KtUltraLightElementWithNullabilityAnnotation.kt similarity index 100% rename from compiler/light-classes-base/src/org/jetbrains/kotlin/asJava/classes/KtUltraLightElementWithNullabilityAnnotation.kt rename to analysis/light-classes-base/src/org/jetbrains/kotlin/asJava/classes/KtUltraLightElementWithNullabilityAnnotation.kt diff --git a/compiler/light-classes-base/src/org/jetbrains/kotlin/asJava/classes/KtUltraLightTypeParameter.kt b/analysis/light-classes-base/src/org/jetbrains/kotlin/asJava/classes/KtUltraLightTypeParameter.kt similarity index 100% rename from compiler/light-classes-base/src/org/jetbrains/kotlin/asJava/classes/KtUltraLightTypeParameter.kt rename to analysis/light-classes-base/src/org/jetbrains/kotlin/asJava/classes/KtUltraLightTypeParameter.kt diff --git a/compiler/light-classes-base/src/org/jetbrains/kotlin/asJava/classes/LightClassesLazyCreator.kt b/analysis/light-classes-base/src/org/jetbrains/kotlin/asJava/classes/LightClassesLazyCreator.kt similarity index 100% rename from compiler/light-classes-base/src/org/jetbrains/kotlin/asJava/classes/LightClassesLazyCreator.kt rename to analysis/light-classes-base/src/org/jetbrains/kotlin/asJava/classes/LightClassesLazyCreator.kt diff --git a/compiler/light-classes-base/src/org/jetbrains/kotlin/asJava/classes/implUtils.kt b/analysis/light-classes-base/src/org/jetbrains/kotlin/asJava/classes/implUtils.kt similarity index 100% rename from compiler/light-classes-base/src/org/jetbrains/kotlin/asJava/classes/implUtils.kt rename to analysis/light-classes-base/src/org/jetbrains/kotlin/asJava/classes/implUtils.kt diff --git a/compiler/light-classes-base/src/org/jetbrains/kotlin/asJava/classes/lightClassPlatformUtils.kt b/analysis/light-classes-base/src/org/jetbrains/kotlin/asJava/classes/lightClassPlatformUtils.kt similarity index 100% rename from compiler/light-classes-base/src/org/jetbrains/kotlin/asJava/classes/lightClassPlatformUtils.kt rename to analysis/light-classes-base/src/org/jetbrains/kotlin/asJava/classes/lightClassPlatformUtils.kt diff --git a/compiler/light-classes-base/src/org/jetbrains/kotlin/asJava/classes/methodIndices.kt b/analysis/light-classes-base/src/org/jetbrains/kotlin/asJava/classes/methodIndices.kt similarity index 100% rename from compiler/light-classes-base/src/org/jetbrains/kotlin/asJava/classes/methodIndices.kt rename to analysis/light-classes-base/src/org/jetbrains/kotlin/asJava/classes/methodIndices.kt diff --git a/compiler/light-classes-base/src/org/jetbrains/kotlin/asJava/elements/FakeFileForLightClass.kt b/analysis/light-classes-base/src/org/jetbrains/kotlin/asJava/elements/FakeFileForLightClass.kt similarity index 100% rename from compiler/light-classes-base/src/org/jetbrains/kotlin/asJava/elements/FakeFileForLightClass.kt rename to analysis/light-classes-base/src/org/jetbrains/kotlin/asJava/elements/FakeFileForLightClass.kt diff --git a/compiler/light-classes-base/src/org/jetbrains/kotlin/asJava/elements/KotlinLightTypeParameterBuilder.kt b/analysis/light-classes-base/src/org/jetbrains/kotlin/asJava/elements/KotlinLightTypeParameterBuilder.kt similarity index 100% rename from compiler/light-classes-base/src/org/jetbrains/kotlin/asJava/elements/KotlinLightTypeParameterBuilder.kt rename to analysis/light-classes-base/src/org/jetbrains/kotlin/asJava/elements/KotlinLightTypeParameterBuilder.kt diff --git a/compiler/light-classes-base/src/org/jetbrains/kotlin/asJava/elements/KotlinLightTypeParameterListBuilder.kt b/analysis/light-classes-base/src/org/jetbrains/kotlin/asJava/elements/KotlinLightTypeParameterListBuilder.kt similarity index 100% rename from compiler/light-classes-base/src/org/jetbrains/kotlin/asJava/elements/KotlinLightTypeParameterListBuilder.kt rename to analysis/light-classes-base/src/org/jetbrains/kotlin/asJava/elements/KotlinLightTypeParameterListBuilder.kt diff --git a/compiler/light-classes-base/src/org/jetbrains/kotlin/asJava/elements/KtLightAbstractAnnotation.kt b/analysis/light-classes-base/src/org/jetbrains/kotlin/asJava/elements/KtLightAbstractAnnotation.kt similarity index 100% rename from compiler/light-classes-base/src/org/jetbrains/kotlin/asJava/elements/KtLightAbstractAnnotation.kt rename to analysis/light-classes-base/src/org/jetbrains/kotlin/asJava/elements/KtLightAbstractAnnotation.kt diff --git a/compiler/light-classes-base/src/org/jetbrains/kotlin/asJava/elements/KtLightAnnotationsValues.kt b/analysis/light-classes-base/src/org/jetbrains/kotlin/asJava/elements/KtLightAnnotationsValues.kt similarity index 100% rename from compiler/light-classes-base/src/org/jetbrains/kotlin/asJava/elements/KtLightAnnotationsValues.kt rename to analysis/light-classes-base/src/org/jetbrains/kotlin/asJava/elements/KtLightAnnotationsValues.kt diff --git a/compiler/light-classes-base/src/org/jetbrains/kotlin/asJava/elements/KtLightElementBase.kt b/analysis/light-classes-base/src/org/jetbrains/kotlin/asJava/elements/KtLightElementBase.kt similarity index 100% rename from compiler/light-classes-base/src/org/jetbrains/kotlin/asJava/elements/KtLightElementBase.kt rename to analysis/light-classes-base/src/org/jetbrains/kotlin/asJava/elements/KtLightElementBase.kt diff --git a/compiler/light-classes-base/src/org/jetbrains/kotlin/asJava/elements/KtLightElements.kt b/analysis/light-classes-base/src/org/jetbrains/kotlin/asJava/elements/KtLightElements.kt similarity index 100% rename from compiler/light-classes-base/src/org/jetbrains/kotlin/asJava/elements/KtLightElements.kt rename to analysis/light-classes-base/src/org/jetbrains/kotlin/asJava/elements/KtLightElements.kt diff --git a/compiler/light-classes-base/src/org/jetbrains/kotlin/asJava/elements/KtLightIdentifier.kt b/analysis/light-classes-base/src/org/jetbrains/kotlin/asJava/elements/KtLightIdentifier.kt similarity index 100% rename from compiler/light-classes-base/src/org/jetbrains/kotlin/asJava/elements/KtLightIdentifier.kt rename to analysis/light-classes-base/src/org/jetbrains/kotlin/asJava/elements/KtLightIdentifier.kt diff --git a/compiler/light-classes-base/src/org/jetbrains/kotlin/asJava/elements/KtLightMemberImpl.kt b/analysis/light-classes-base/src/org/jetbrains/kotlin/asJava/elements/KtLightMemberImpl.kt similarity index 100% rename from compiler/light-classes-base/src/org/jetbrains/kotlin/asJava/elements/KtLightMemberImpl.kt rename to analysis/light-classes-base/src/org/jetbrains/kotlin/asJava/elements/KtLightMemberImpl.kt diff --git a/compiler/light-classes-base/src/org/jetbrains/kotlin/asJava/elements/KtLightMethodImpl.kt b/analysis/light-classes-base/src/org/jetbrains/kotlin/asJava/elements/KtLightMethodImpl.kt similarity index 100% rename from compiler/light-classes-base/src/org/jetbrains/kotlin/asJava/elements/KtLightMethodImpl.kt rename to analysis/light-classes-base/src/org/jetbrains/kotlin/asJava/elements/KtLightMethodImpl.kt diff --git a/compiler/light-classes-base/src/org/jetbrains/kotlin/asJava/elements/KtLightModifierList.kt b/analysis/light-classes-base/src/org/jetbrains/kotlin/asJava/elements/KtLightModifierList.kt similarity index 100% rename from compiler/light-classes-base/src/org/jetbrains/kotlin/asJava/elements/KtLightModifierList.kt rename to analysis/light-classes-base/src/org/jetbrains/kotlin/asJava/elements/KtLightModifierList.kt diff --git a/compiler/light-classes-base/src/org/jetbrains/kotlin/asJava/elements/KtLightParameterList.kt b/analysis/light-classes-base/src/org/jetbrains/kotlin/asJava/elements/KtLightParameterList.kt similarity index 100% rename from compiler/light-classes-base/src/org/jetbrains/kotlin/asJava/elements/KtLightParameterList.kt rename to analysis/light-classes-base/src/org/jetbrains/kotlin/asJava/elements/KtLightParameterList.kt diff --git a/compiler/light-classes-base/src/org/jetbrains/kotlin/asJava/elements/KtLightPsiJavaCodeReferenceElement.kt b/analysis/light-classes-base/src/org/jetbrains/kotlin/asJava/elements/KtLightPsiJavaCodeReferenceElement.kt similarity index 100% rename from compiler/light-classes-base/src/org/jetbrains/kotlin/asJava/elements/KtLightPsiJavaCodeReferenceElement.kt rename to analysis/light-classes-base/src/org/jetbrains/kotlin/asJava/elements/KtLightPsiJavaCodeReferenceElement.kt diff --git a/compiler/light-classes-base/src/org/jetbrains/kotlin/asJava/elements/LightParameter.kt b/analysis/light-classes-base/src/org/jetbrains/kotlin/asJava/elements/LightParameter.kt similarity index 100% rename from compiler/light-classes-base/src/org/jetbrains/kotlin/asJava/elements/LightParameter.kt rename to analysis/light-classes-base/src/org/jetbrains/kotlin/asJava/elements/LightParameter.kt diff --git a/compiler/light-classes-base/src/org/jetbrains/kotlin/asJava/elements/LightVariableBuilder.java b/analysis/light-classes-base/src/org/jetbrains/kotlin/asJava/elements/LightVariableBuilder.java similarity index 100% rename from compiler/light-classes-base/src/org/jetbrains/kotlin/asJava/elements/LightVariableBuilder.java rename to analysis/light-classes-base/src/org/jetbrains/kotlin/asJava/elements/LightVariableBuilder.java diff --git a/compiler/light-classes-base/src/org/jetbrains/kotlin/asJava/elements/PsiElementWithOrigin.kt b/analysis/light-classes-base/src/org/jetbrains/kotlin/asJava/elements/PsiElementWithOrigin.kt similarity index 100% rename from compiler/light-classes-base/src/org/jetbrains/kotlin/asJava/elements/PsiElementWithOrigin.kt rename to analysis/light-classes-base/src/org/jetbrains/kotlin/asJava/elements/PsiElementWithOrigin.kt diff --git a/compiler/light-classes-base/src/org/jetbrains/kotlin/asJava/elements/utils.kt b/analysis/light-classes-base/src/org/jetbrains/kotlin/asJava/elements/utils.kt similarity index 100% rename from compiler/light-classes-base/src/org/jetbrains/kotlin/asJava/elements/utils.kt rename to analysis/light-classes-base/src/org/jetbrains/kotlin/asJava/elements/utils.kt diff --git a/compiler/light-classes-base/src/org/jetbrains/kotlin/asJava/finder/JavaElementFinder.kt b/analysis/light-classes-base/src/org/jetbrains/kotlin/asJava/finder/JavaElementFinder.kt similarity index 100% rename from compiler/light-classes-base/src/org/jetbrains/kotlin/asJava/finder/JavaElementFinder.kt rename to analysis/light-classes-base/src/org/jetbrains/kotlin/asJava/finder/JavaElementFinder.kt diff --git a/compiler/light-classes-base/src/org/jetbrains/kotlin/asJava/finder/KtLightPackage.java b/analysis/light-classes-base/src/org/jetbrains/kotlin/asJava/finder/KtLightPackage.java similarity index 100% rename from compiler/light-classes-base/src/org/jetbrains/kotlin/asJava/finder/KtLightPackage.java rename to analysis/light-classes-base/src/org/jetbrains/kotlin/asJava/finder/KtLightPackage.java diff --git a/compiler/light-classes-base/src/org/jetbrains/kotlin/asJava/lightClassUtils.kt b/analysis/light-classes-base/src/org/jetbrains/kotlin/asJava/lightClassUtils.kt similarity index 100% rename from compiler/light-classes-base/src/org/jetbrains/kotlin/asJava/lightClassUtils.kt rename to analysis/light-classes-base/src/org/jetbrains/kotlin/asJava/lightClassUtils.kt diff --git a/analysis/symbol-light-classes/build.gradle.kts b/analysis/symbol-light-classes/build.gradle.kts index 4feafade209..c403037381f 100644 --- a/analysis/symbol-light-classes/build.gradle.kts +++ b/analysis/symbol-light-classes/build.gradle.kts @@ -7,7 +7,7 @@ dependencies { implementation(project(":compiler:psi")) implementation(project(":compiler:frontend.java")) implementation(project(":core:compiler.common")) - implementation(project(":compiler:light-classes-base")) + implementation(project(":analysis:light-classes-base")) implementation(project(":compiler:backend.common.jvm")) implementation(project(":analysis:analysis-api-providers")) implementation(project(":analysis:analysis-api")) diff --git a/build.gradle.kts b/build.gradle.kts index 8b2bc70cb3f..622429c32ac 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -142,7 +142,7 @@ val irCompilerModules = arrayOf( val commonCompilerModules = arrayOf( ":compiler:psi", ":compiler:frontend.common-psi", - ":compiler:light-classes-base", + ":analysis:light-classes-base", ":compiler:frontend.common", ":compiler:util", ":compiler:config.jvm", diff --git a/compiler/light-classes/build.gradle.kts b/compiler/light-classes/build.gradle.kts index 5fc991220c6..42f2e65339f 100644 --- a/compiler/light-classes/build.gradle.kts +++ b/compiler/light-classes/build.gradle.kts @@ -4,7 +4,7 @@ plugins { } dependencies { - api(project(":compiler:light-classes-base")) + api(project(":analysis:light-classes-base")) api(project(":compiler:util")) api(project(":compiler:backend")) api(project(":compiler:frontend")) diff --git a/compiler/tests-common/build.gradle.kts b/compiler/tests-common/build.gradle.kts index c0d5791ba8e..c0371105ca5 100644 --- a/compiler/tests-common/build.gradle.kts +++ b/compiler/tests-common/build.gradle.kts @@ -38,7 +38,7 @@ dependencies { testApi(project(":compiler:cli-common")) testApi(project(":compiler:cli")) testApi(project(":compiler:cli-js")) - testApi(project(":compiler:light-classes-base")) + testApi(project(":analysis:light-classes-base")) testApi(project(":compiler:serialization")) testApi(project(":kotlin-preloader")) testApi(project(":compiler:cli-common")) diff --git a/settings.gradle b/settings.gradle index 7e2c7e5bcae..82a072161a1 100644 --- a/settings.gradle +++ b/settings.gradle @@ -145,7 +145,6 @@ include ":benchmarks", ":compiler:backend", ":compiler:plugin-api", ":compiler:light-classes", - ":compiler:light-classes-base", ":compiler:javac-wrapper", ":compiler:cli", ":compiler:cli-js", @@ -583,6 +582,7 @@ include ":generators:analysis-api-generator", ":analysis:kt-references", ":analysis:kt-references:kt-references-fe10", ":analysis:symbol-light-classes", + ":analysis:light-classes-base", ":analysis:project-structure", ":analysis:analysis-api-standalone", ":analysis:analysis-api-standalone:analysis-api-standalone-base",