Refactor setting dependencies for ModuleDescriptors

This commit is contained in:
Pavel V. Talanov
2015-06-10 20:14:06 +03:00
parent 1d696c2e54
commit 705f35450f
12 changed files with 52 additions and 72 deletions
@@ -146,7 +146,7 @@ public trait AnalyzerFacade<A : ResolverForModule, in P : PlatformAnalysisParame
val builtinsModule = KotlinBuiltIns.getInstance().getBuiltInsModule()
module.dependencyOnBuiltins().adjustDependencies(builtinsModule, dependenciesDescriptors)
dependenciesDescriptors.forEach { currentModule.addDependencyOnModule(it) }
currentModule.setDependencies(dependenciesDescriptors)
}
}
@@ -164,8 +164,6 @@ public trait AnalyzerFacade<A : ResolverForModule, in P : PlatformAnalysisParame
addFriends()
resolverForProject.descriptorByModule.values().forEach { it.seal() }
fun initializeResolverForProject() {
modules.forEach {
module ->
@@ -51,14 +51,11 @@ public trait MutableModuleContext: ModuleContext {
override val module: ModuleDescriptorImpl
public fun setDependencies(vararg dependencies: ModuleDescriptorImpl) {
setDependencies(dependencies.toList())
module.setDependencies(*dependencies)
}
public fun setDependencies(dependencies: List<ModuleDescriptorImpl>) {
for (dependency in dependencies) {
module.addDependencyOnModule(dependency)
}
module.seal()
module.setDependencies(dependencies)
}
public fun initializeModuleContents(packageFragmentProvider: PackageFragmentProvider) {