From 84f3cc9f9c4db193f3077b4d0116aff6989dc7ec Mon Sep 17 00:00:00 2001 From: Dmitrii Gridin Date: Fri, 16 Feb 2024 14:12:16 +0100 Subject: [PATCH] [Analysis API] drop obsolete code --- .../analysis/api/fir/utils/typeBuilder.kt | 0 .../analysis/api/impl/barebone/psiUtils.kt | 12 ---------- .../AbstractAnalysisApiImportOptimizerTest.kt | 0 ...nalysisApiExpressionPsiTypeProviderTest.kt | 0 .../AbstractAnalysisApiPsiTypeProviderTest.kt | 0 .../AbstractAnalysisApiGetSuperTypesTest.kt | 0 .../fir/FirModuleResolveStateConfigurator.kt | 7 ------ ...irModuleResolveStateConfiguratorIdeImpl.kt | 7 ------ .../low/level/api/fir/IdeSessionComponents.kt | 23 ------------------- .../structure/sessionFactoryHelpers.kt | 4 +--- 10 files changed, 1 insertion(+), 52 deletions(-) delete mode 100644 analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/utils/typeBuilder.kt delete mode 100644 analysis/analysis-api-impl-barebone/src/org/jetbrains/kotlin/analysis/api/impl/barebone/psiUtils.kt delete mode 100644 analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/components/callResolver/importOptimizer/AbstractAnalysisApiImportOptimizerTest.kt delete mode 100644 analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/components/callResolver/psiTypeProvider/AbstractAnalysisApiExpressionPsiTypeProviderTest.kt delete mode 100644 analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/components/callResolver/psiTypeProvider/AbstractAnalysisApiPsiTypeProviderTest.kt delete mode 100644 analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/components/callResolver/typeProvider/AbstractAnalysisApiGetSuperTypesTest.kt delete mode 100644 analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/FirModuleResolveStateConfigurator.kt delete mode 100644 analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/FirModuleResolveStateConfiguratorIdeImpl.kt delete mode 100644 analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/IdeSessionComponents.kt diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/utils/typeBuilder.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/utils/typeBuilder.kt deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/analysis/analysis-api-impl-barebone/src/org/jetbrains/kotlin/analysis/api/impl/barebone/psiUtils.kt b/analysis/analysis-api-impl-barebone/src/org/jetbrains/kotlin/analysis/api/impl/barebone/psiUtils.kt deleted file mode 100644 index 2b9a6c0f6ef..00000000000 --- a/analysis/analysis-api-impl-barebone/src/org/jetbrains/kotlin/analysis/api/impl/barebone/psiUtils.kt +++ /dev/null @@ -1,12 +0,0 @@ -/* - * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. - * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. - */ - -package org.jetbrains.kotlin.analysis.api.impl.barebone - -import com.intellij.psi.PsiElement -import com.intellij.psi.util.PsiTreeUtil -import org.jetbrains.kotlin.psi.psiUtil.parents -import org.jetbrains.kotlin.psi.psiUtil.parentsWithSelf - diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/components/callResolver/importOptimizer/AbstractAnalysisApiImportOptimizerTest.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/components/callResolver/importOptimizer/AbstractAnalysisApiImportOptimizerTest.kt deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/components/callResolver/psiTypeProvider/AbstractAnalysisApiExpressionPsiTypeProviderTest.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/components/callResolver/psiTypeProvider/AbstractAnalysisApiExpressionPsiTypeProviderTest.kt deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/components/callResolver/psiTypeProvider/AbstractAnalysisApiPsiTypeProviderTest.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/components/callResolver/psiTypeProvider/AbstractAnalysisApiPsiTypeProviderTest.kt deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/components/callResolver/typeProvider/AbstractAnalysisApiGetSuperTypesTest.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/components/callResolver/typeProvider/AbstractAnalysisApiGetSuperTypesTest.kt deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/FirModuleResolveStateConfigurator.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/FirModuleResolveStateConfigurator.kt deleted file mode 100644 index ff32782b9e2..00000000000 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/FirModuleResolveStateConfigurator.kt +++ /dev/null @@ -1,7 +0,0 @@ -/* - * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. - * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. - */ - -package org.jetbrains.kotlin.analysis.low.level.api.fir - diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/FirModuleResolveStateConfiguratorIdeImpl.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/FirModuleResolveStateConfiguratorIdeImpl.kt deleted file mode 100644 index ff32782b9e2..00000000000 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/FirModuleResolveStateConfiguratorIdeImpl.kt +++ /dev/null @@ -1,7 +0,0 @@ -/* - * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. - * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. - */ - -package org.jetbrains.kotlin.analysis.low.level.api.fir - diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/IdeSessionComponents.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/IdeSessionComponents.kt deleted file mode 100644 index 43bb2547fb3..00000000000 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/IdeSessionComponents.kt +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors. - * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. - */ - -package org.jetbrains.kotlin.analysis.low.level.api.fir - -import org.jetbrains.kotlin.fir.FirSession -import org.jetbrains.kotlin.fir.FirSessionComponent -import org.jetbrains.kotlin.fir.NoMutableState -import org.jetbrains.kotlin.fir.backend.jvm.FirJvmKotlinMangler -import org.jetbrains.kotlin.fir.signaturer.FirBasedSignatureComposer - -@NoMutableState -data class IdeSessionComponents(val signatureComposer: FirBasedSignatureComposer) : FirSessionComponent { - companion object { - fun create(): IdeSessionComponents = IdeSessionComponents( - signatureComposer = FirBasedSignatureComposer(FirJvmKotlinMangler()) - ) - } -} - -val FirSession.ideSessionComponents: IdeSessionComponents by FirSession.sessionComponentAccessor() diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/project/structure/sessionFactoryHelpers.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/project/structure/sessionFactoryHelpers.kt index 0f6eb3575ad..1c41c37d574 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/project/structure/sessionFactoryHelpers.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/project/structure/sessionFactoryHelpers.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Copyright 2010-2024 JetBrains s.r.o. and Kotlin Programming Language contributors. * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ @@ -7,7 +7,6 @@ package org.jetbrains.kotlin.analysis.low.level.api.fir.project.structure import com.intellij.openapi.project.Project import org.jetbrains.kotlin.analysis.api.resolve.extensions.KtResolveExtensionProvider -import org.jetbrains.kotlin.analysis.low.level.api.fir.IdeSessionComponents import org.jetbrains.kotlin.analysis.low.level.api.fir.api.services.createSealedInheritorsProvider import org.jetbrains.kotlin.analysis.low.level.api.fir.compile.CodeFragmentScopeProvider import org.jetbrains.kotlin.analysis.low.level.api.fir.fir.caches.FirThreadSafeCachesFactory @@ -36,7 +35,6 @@ import org.jetbrains.kotlin.fir.session.FirSessionConfigurator @SessionConfiguration internal fun LLFirSession.registerIdeComponents(project: Project) { - register(IdeSessionComponents::class, IdeSessionComponents.create()) register(FirCachesFactory::class, FirThreadSafeCachesFactory) register(SealedClassInheritorsProvider::class, createSealedInheritorsProvider(project)) register(FirExceptionHandler::class, LLFirExceptionHandler)