From a1155204c7178363c0c8a46e78e7008bd8710a97 Mon Sep 17 00:00:00 2001 From: Roman Golyshev Date: Mon, 6 Nov 2023 17:51:57 +0100 Subject: [PATCH] KT-63096 [LL] Remove `KtModuleScopeProvider` It has no usages anymore --- .../AnalysisApiBaseTestServiceRegistrar.kt | 3 -- .../StandaloneAnalysisAPISessionBuilder.kt | 3 -- .../structure/KtModuleScopeProvider.kt | 40 ------------------- 3 files changed, 46 deletions(-) delete mode 100644 analysis/project-structure/src/org/jetbrains/kotlin/analysis/project/structure/KtModuleScopeProvider.kt diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/configurators/AnalysisApiBaseTestServiceRegistrar.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/configurators/AnalysisApiBaseTestServiceRegistrar.kt index 7079697c758..5ee89c964e3 100644 --- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/configurators/AnalysisApiBaseTestServiceRegistrar.kt +++ b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/configurators/AnalysisApiBaseTestServiceRegistrar.kt @@ -18,8 +18,6 @@ import org.jetbrains.kotlin.analysis.decompiled.light.classes.DecompiledLightCla import org.jetbrains.kotlin.analysis.decompiler.psi.BuiltInDefinitionFile import org.jetbrains.kotlin.analysis.decompiler.psi.KotlinBuiltInFileType import org.jetbrains.kotlin.analysis.decompiler.psi.file.KtClsFile -import org.jetbrains.kotlin.analysis.project.structure.KtModuleScopeProvider -import org.jetbrains.kotlin.analysis.project.structure.KtModuleScopeProviderImpl import org.jetbrains.kotlin.analysis.providers.* import org.jetbrains.kotlin.analysis.providers.impl.* import org.jetbrains.kotlin.analysis.test.framework.project.structure.ktModuleProvider @@ -74,7 +72,6 @@ object AnalysisApiBaseTestServiceRegistrar: AnalysisApiTestServiceRegistrar() { testServices.environmentManager.getProjectEnvironment() ).distinct() project.apply { - registerService(KtModuleScopeProvider::class.java, KtModuleScopeProviderImpl()) registerService(KotlinAnnotationsResolverFactory::class.java, KotlinStaticAnnotationsResolverFactory(allSourceKtFiles)) val filter = BuiltInDefinitionFile.FILTER_OUT_CLASSES_EXISTING_AS_JVM_CLASS_FILES diff --git a/analysis/analysis-api-standalone/src/org/jetbrains/kotlin/analysis/api/standalone/StandaloneAnalysisAPISessionBuilder.kt b/analysis/analysis-api-standalone/src/org/jetbrains/kotlin/analysis/api/standalone/StandaloneAnalysisAPISessionBuilder.kt index 7a7d361798f..b81bba4eab0 100644 --- a/analysis/analysis-api-standalone/src/org/jetbrains/kotlin/analysis/api/standalone/StandaloneAnalysisAPISessionBuilder.kt +++ b/analysis/analysis-api-standalone/src/org/jetbrains/kotlin/analysis/api/standalone/StandaloneAnalysisAPISessionBuilder.kt @@ -20,8 +20,6 @@ import org.jetbrains.kotlin.analysis.api.standalone.base.project.structure.LLFir import org.jetbrains.kotlin.analysis.api.standalone.base.project.structure.StandaloneProjectFactory import org.jetbrains.kotlin.analysis.low.level.api.fir.api.services.FirSealedClassInheritorsProcessorFactory import org.jetbrains.kotlin.analysis.low.level.api.fir.project.structure.LLFirLibrarySymbolProviderFactory -import org.jetbrains.kotlin.analysis.project.structure.KtModuleScopeProvider -import org.jetbrains.kotlin.analysis.project.structure.KtModuleScopeProviderImpl import org.jetbrains.kotlin.analysis.project.structure.KtSourceModule import org.jetbrains.kotlin.analysis.project.structure.builder.KtModuleProviderBuilder import org.jetbrains.kotlin.analysis.project.structure.builder.buildProjectStructureProvider @@ -127,7 +125,6 @@ public class StandaloneAnalysisAPISessionBuilder( registerService(KotlinModificationTrackerFactory::class.java, KotlinStaticModificationTrackerFactory::class.java) registerService(KotlinGlobalModificationService::class.java, KotlinStaticGlobalModificationService::class.java) - registerService(KtModuleScopeProvider::class.java, KtModuleScopeProviderImpl()) registerService(KotlinAnnotationsResolverFactory::class.java, KotlinStaticAnnotationsResolverFactory(sourceKtFiles)) registerService(KotlinResolutionScopeProvider::class.java, KotlinByModulesResolutionScopeProvider::class.java) val declarationProviderFactory = KotlinStaticDeclarationProviderFactory( diff --git a/analysis/project-structure/src/org/jetbrains/kotlin/analysis/project/structure/KtModuleScopeProvider.kt b/analysis/project-structure/src/org/jetbrains/kotlin/analysis/project/structure/KtModuleScopeProvider.kt deleted file mode 100644 index 4debaaf36e6..00000000000 --- a/analysis/project-structure/src/org/jetbrains/kotlin/analysis/project/structure/KtModuleScopeProvider.kt +++ /dev/null @@ -1,40 +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.project.structure - -import com.intellij.openapi.project.Project -import com.intellij.psi.search.GlobalSearchScope - -public abstract class KtModuleScopeProvider { - /** - * Get a scope of binaries on which current source module depends. - * Should be equivalent to - * - * ``` - * GlobalSearchScope.union( - * sourceModule.allDependenciesOfType() - * .map { it.contentScope } - * ) - * ``` - * For the IDE there can be more optimal implementations. - * - * See [KtModuleScopeProviderImpl] a correct but non-optimal implementation. - */ - public abstract fun getModuleLibrariesScope(sourceModule: KtSourceModule): GlobalSearchScope -} - -public class KtModuleScopeProviderImpl : KtModuleScopeProvider() { - override fun getModuleLibrariesScope(sourceModule: KtSourceModule): GlobalSearchScope { - val scopes = sourceModule.allDirectDependenciesOfType() - .map { it.contentScope } - .toList() - if (scopes.isEmpty()) return GlobalSearchScope.EMPTY_SCOPE - return GlobalSearchScope.union(scopes) - } -} - -public val Project.moduleScopeProvider: KtModuleScopeProvider - get() = this.getService(KtModuleScopeProvider::class.java)