From dd803cb65070d753f5641ef1be494a3defd12946 Mon Sep 17 00:00:00 2001 From: Simon Ogorodnik Date: Wed, 11 Dec 2019 21:42:24 +0300 Subject: [PATCH] [FIR] Fix moduleInfo module names --- .../fir/FirResolveModularizedTotalKotlinTest.kt | 2 +- .../org/jetbrains/kotlin/codegen/GenerationUtils.kt | 2 +- .../org/jetbrains/kotlin/fir/SessionTestUtils.kt | 11 +++++++---- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/compiler/fir/modularized-tests/tests/org/jetbrains/kotlin/fir/FirResolveModularizedTotalKotlinTest.kt b/compiler/fir/modularized-tests/tests/org/jetbrains/kotlin/fir/FirResolveModularizedTotalKotlinTest.kt index 302eaf67cf9..e7af9da0927 100644 --- a/compiler/fir/modularized-tests/tests/org/jetbrains/kotlin/fir/FirResolveModularizedTotalKotlinTest.kt +++ b/compiler/fir/modularized-tests/tests/org/jetbrains/kotlin/fir/FirResolveModularizedTotalKotlinTest.kt @@ -50,7 +50,7 @@ class FirResolveModularizedTotalKotlinTest : AbstractModularizedTest() { val scope = ProjectScope.getContentScope(project) val librariesScope = ProjectScope.getLibrariesScope(project) - val session = createSession(environment, scope, librariesScope) + val session = createSession(environment, scope, librariesScope, moduleData.qualifiedName) val builder = RawFirBuilder(session, stubMode = false) val totalTransformer = FirTotalResolveTransformer() diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/GenerationUtils.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/GenerationUtils.kt index a9723d4d9e1..010ae560230 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/GenerationUtils.kt +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/GenerationUtils.kt @@ -110,7 +110,7 @@ object GenerationUtils { val scope = GlobalSearchScope.filesScope(project, files.map { it.virtualFile }) .uniteWith(TopDownAnalyzerFacadeForJVM.AllJavaSourcesInProjectScope(project)) val librariesScope = ProjectScope.getLibrariesScope(project) - val session = createSession(project, scope, librariesScope, packagePartProvider) + val session = createSession(project, scope, librariesScope, "main", packagePartProvider) val builder = RawFirBuilder(session, stubMode = false) val resolveTransformer = FirTotalResolveTransformer() diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/fir/SessionTestUtils.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/fir/SessionTestUtils.kt index 1ad5630edbf..ad43f22e686 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/fir/SessionTestUtils.kt +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/fir/SessionTestUtils.kt @@ -12,20 +12,23 @@ import org.jetbrains.kotlin.fir.java.FirJavaModuleBasedSession import org.jetbrains.kotlin.fir.java.FirLibrarySession import org.jetbrains.kotlin.fir.java.FirProjectSessionProvider import org.jetbrains.kotlin.load.kotlin.PackagePartProvider +import org.jetbrains.kotlin.name.Name fun createSession( environment: KotlinCoreEnvironment, sourceScope: GlobalSearchScope, - librariesScope: GlobalSearchScope = GlobalSearchScope.notScope(sourceScope) -) = createSession(environment.project, sourceScope, librariesScope, environment::createPackagePartProvider) + librariesScope: GlobalSearchScope = GlobalSearchScope.notScope(sourceScope), + moduleName: String = "TestModule" +) = createSession(environment.project, sourceScope, librariesScope, moduleName, environment::createPackagePartProvider) fun createSession( project: Project, sourceScope: GlobalSearchScope, librariesScope: GlobalSearchScope, + moduleName: String = "TestModule", packagePartProvider: (GlobalSearchScope) -> PackagePartProvider ): FirSession { - val moduleInfo = FirTestModuleInfo() + val moduleInfo = FirTestModuleInfo(name = Name.identifier(moduleName)) val provider = FirProjectSessionProvider(project) return FirJavaModuleBasedSession(moduleInfo, provider, sourceScope).also { createSessionForDependencies(project, provider, moduleInfo, librariesScope, packagePartProvider) @@ -39,7 +42,7 @@ private fun createSessionForDependencies( librariesScope: GlobalSearchScope, packagePartProvider: (GlobalSearchScope) -> PackagePartProvider ) { - val dependenciesInfo = FirTestModuleInfo() + val dependenciesInfo = FirTestModuleInfo(name = Name.identifier(moduleInfo.name.identifier + ".dependencies")) moduleInfo.dependencies.add(dependenciesInfo) FirLibrarySession.create( dependenciesInfo, provider, librariesScope, project, packagePartProvider(librariesScope)