azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIR] Fix moduleInfo module names

Browse Source
This commit is contained in:
Simon Ogorodnik
2019-12-11 21:42:24 +03:00
parent 7f51be9cd3
commit dd803cb650
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/modularized-tests/tests/org/jetbrains/kotlin/fir/FirResolveModularizedTotalKotlinTest.kt
+1 -1
View File
@@ -50,7 +50,7 @@ class FirResolveModularizedTotalKotlinTest : AbstractModularizedTest() {
val scope = ProjectScope.getContentScope(project) val scope = ProjectScope.getContentScope(project)
val librariesScope = ProjectScope.getLibrariesScope(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 builder = RawFirBuilder(session, stubMode = false)
val totalTransformer = FirTotalResolveTransformer() val totalTransformer = FirTotalResolveTransformer()
compiler/tests-common/tests/org/jetbrains/kotlin/codegen/GenerationUtils.kt
+1 -1
View File
@@ -110,7 +110,7 @@ object GenerationUtils {
val scope = GlobalSearchScope.filesScope(project, files.map { it.virtualFile }) val scope = GlobalSearchScope.filesScope(project, files.map { it.virtualFile })
.uniteWith(TopDownAnalyzerFacadeForJVM.AllJavaSourcesInProjectScope(project)) .uniteWith(TopDownAnalyzerFacadeForJVM.AllJavaSourcesInProjectScope(project))
val librariesScope = ProjectScope.getLibrariesScope(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 builder = RawFirBuilder(session, stubMode = false)
val resolveTransformer = FirTotalResolveTransformer() val resolveTransformer = FirTotalResolveTransformer()
compiler/tests-common/tests/org/jetbrains/kotlin/fir/SessionTestUtils.kt
+7 -4
View File
@@ -12,20 +12,23 @@ import org.jetbrains.kotlin.fir.java.FirJavaModuleBasedSession
import org.jetbrains.kotlin.fir.java.FirLibrarySession import org.jetbrains.kotlin.fir.java.FirLibrarySession
import org.jetbrains.kotlin.fir.java.FirProjectSessionProvider import org.jetbrains.kotlin.fir.java.FirProjectSessionProvider
import org.jetbrains.kotlin.load.kotlin.PackagePartProvider import org.jetbrains.kotlin.load.kotlin.PackagePartProvider
import org.jetbrains.kotlin.name.Name
fun createSession( fun createSession(
environment: KotlinCoreEnvironment, environment: KotlinCoreEnvironment,
sourceScope: GlobalSearchScope, sourceScope: GlobalSearchScope,
librariesScope: GlobalSearchScope = GlobalSearchScope.notScope(sourceScope) librariesScope: GlobalSearchScope = GlobalSearchScope.notScope(sourceScope),
) = createSession(environment.project, sourceScope, librariesScope, environment::createPackagePartProvider) moduleName: String = "TestModule"
) = createSession(environment.project, sourceScope, librariesScope, moduleName, environment::createPackagePartProvider)
fun createSession( fun createSession(
project: Project, project: Project,
sourceScope: GlobalSearchScope, sourceScope: GlobalSearchScope,
librariesScope: GlobalSearchScope, librariesScope: GlobalSearchScope,
moduleName: String = "TestModule",
packagePartProvider: (GlobalSearchScope) -> PackagePartProvider packagePartProvider: (GlobalSearchScope) -> PackagePartProvider
): FirSession { ): FirSession {
val moduleInfo = FirTestModuleInfo() val moduleInfo = FirTestModuleInfo(name = Name.identifier(moduleName))
val provider = FirProjectSessionProvider(project) val provider = FirProjectSessionProvider(project)
return FirJavaModuleBasedSession(moduleInfo, provider, sourceScope).also { return FirJavaModuleBasedSession(moduleInfo, provider, sourceScope).also {
createSessionForDependencies(project, provider, moduleInfo, librariesScope, packagePartProvider) createSessionForDependencies(project, provider, moduleInfo, librariesScope, packagePartProvider)
@@ -39,7 +42,7 @@ private fun createSessionForDependencies(
librariesScope: GlobalSearchScope, librariesScope: GlobalSearchScope,
packagePartProvider: (GlobalSearchScope) -> PackagePartProvider packagePartProvider: (GlobalSearchScope) -> PackagePartProvider
) { ) {
val dependenciesInfo = FirTestModuleInfo() val dependenciesInfo = FirTestModuleInfo(name = Name.identifier(moduleInfo.name.identifier + ".dependencies"))
moduleInfo.dependencies.add(dependenciesInfo) moduleInfo.dependencies.add(dependenciesInfo)
FirLibrarySession.create( FirLibrarySession.create(
dependenciesInfo, provider, librariesScope, project, packagePartProvider(librariesScope) dependenciesInfo, provider, librariesScope, project, packagePartProvider(librariesScope)