[Analysis API] Give a standalone module provider a better naming

Some components in Analysis API have the 'Impl' suffix both in test
and standalone environments. This commit fixes the logical ambiguity
for a project structure provider.
This commit is contained in:
Yan Zhulanow
2023-11-13 16:51:53 +09:00
committed by Space Team
parent a614d0325f
commit 441f3e0209
3 changed files with 6 additions and 6 deletions
@@ -23,7 +23,7 @@ import org.jetbrains.kotlin.analysis.low.level.api.fir.project.structure.LLFirLi
import org.jetbrains.kotlin.analysis.project.structure.KtSourceModule 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.KtModuleProviderBuilder
import org.jetbrains.kotlin.analysis.project.structure.builder.buildProjectStructureProvider import org.jetbrains.kotlin.analysis.project.structure.builder.buildProjectStructureProvider
import org.jetbrains.kotlin.analysis.project.structure.impl.KtModuleProviderImpl import org.jetbrains.kotlin.analysis.project.structure.impl.KtStandaloneProjectStructureProvider
import org.jetbrains.kotlin.analysis.project.structure.impl.KtSourceModuleImpl import org.jetbrains.kotlin.analysis.project.structure.impl.KtSourceModuleImpl
import org.jetbrains.kotlin.analysis.project.structure.impl.buildKtModuleProviderByCompilerConfiguration import org.jetbrains.kotlin.analysis.project.structure.impl.buildKtModuleProviderByCompilerConfiguration
import org.jetbrains.kotlin.analysis.project.structure.impl.getPsiFilesFromPaths import org.jetbrains.kotlin.analysis.project.structure.impl.getPsiFilesFromPaths
@@ -161,13 +161,13 @@ public class StandaloneAnalysisAPISessionBuilder(
} }
private fun registerPsiDeclarationFromBinaryModuleProvider() { private fun registerPsiDeclarationFromBinaryModuleProvider() {
val ktModuleProviderImpl = projectStructureProvider as KtModuleProviderImpl val standaloneProjectStructureProvider = projectStructureProvider as KtStandaloneProjectStructureProvider
kotlinCoreProjectEnvironment.project.apply { kotlinCoreProjectEnvironment.project.apply {
registerService( registerService(
KotlinPsiDeclarationProviderFactory::class.java, KotlinPsiDeclarationProviderFactory::class.java,
KotlinStaticPsiDeclarationProviderFactory( KotlinStaticPsiDeclarationProviderFactory(
this, this,
ktModuleProviderImpl.binaryModules, standaloneProjectStructureProvider.binaryModules,
kotlinCoreProjectEnvironment.environment.jarFileSystem as CoreJarFileSystem kotlinCoreProjectEnvironment.environment.jarFileSystem as CoreJarFileSystem
) )
) )
@@ -7,7 +7,7 @@ package org.jetbrains.kotlin.analysis.project.structure.builder
import org.jetbrains.kotlin.analysis.api.standalone.base.project.structure.KtStaticProjectStructureProvider import org.jetbrains.kotlin.analysis.api.standalone.base.project.structure.KtStaticProjectStructureProvider
import org.jetbrains.kotlin.analysis.project.structure.KtModule import org.jetbrains.kotlin.analysis.project.structure.KtModule
import org.jetbrains.kotlin.analysis.project.structure.impl.KtModuleProviderImpl import org.jetbrains.kotlin.analysis.project.structure.impl.KtStandaloneProjectStructureProvider
import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreProjectEnvironment import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreProjectEnvironment
import org.jetbrains.kotlin.platform.TargetPlatform import org.jetbrains.kotlin.platform.TargetPlatform
import kotlin.contracts.ExperimentalContracts import kotlin.contracts.ExperimentalContracts
@@ -27,7 +27,7 @@ public class KtModuleProviderBuilder(
public lateinit var platform: TargetPlatform public lateinit var platform: TargetPlatform
public fun build(): KtStaticProjectStructureProvider { public fun build(): KtStaticProjectStructureProvider {
return KtModuleProviderImpl( return KtStandaloneProjectStructureProvider(
platform, platform,
kotlinCoreProjectEnvironment.project, kotlinCoreProjectEnvironment.project,
mainModules, mainModules,
@@ -21,7 +21,7 @@ import org.jetbrains.kotlin.psi.analysisContext
import org.jetbrains.kotlin.serialization.deserialization.builtins.BuiltInSerializerProtocol import org.jetbrains.kotlin.serialization.deserialization.builtins.BuiltInSerializerProtocol
import org.jetbrains.kotlin.utils.KotlinExceptionWithAttachments import org.jetbrains.kotlin.utils.KotlinExceptionWithAttachments
internal class KtModuleProviderImpl( internal class KtStandaloneProjectStructureProvider(
private val platform: TargetPlatform, private val platform: TargetPlatform,
private val project: Project, private val project: Project,
override val allKtModules: List<KtModule>, override val allKtModules: List<KtModule>,