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
@@ -68,15 +68,13 @@ public abstract class DeserializerForDecompilerBase(
init {
moduleDescriptor.initialize(packageFragmentProvider)
moduleDescriptor.addDependencyOnModule(moduleDescriptor)
moduleDescriptor.addDependencyOnModule(KotlinBuiltIns.getInstance().getBuiltInsModule())
val moduleContainingMissingDependencies = createDummyModule("module containing missing dependencies for decompiled sources")
moduleContainingMissingDependencies.addDependencyOnModule(moduleContainingMissingDependencies)
moduleContainingMissingDependencies.setDependencies(moduleContainingMissingDependencies)
moduleContainingMissingDependencies.initialize(
PackageFragmentProviderForMissingDependencies(moduleContainingMissingDependencies)
)
moduleDescriptor.addDependencyOnModule(moduleContainingMissingDependencies)
moduleDescriptor.seal()
moduleContainingMissingDependencies.seal()
moduleDescriptor.setDependencies(
moduleDescriptor, KotlinBuiltIns.getInstance().getBuiltInsModule(), moduleContainingMissingDependencies
)
}
}
@@ -62,9 +62,7 @@ public class KotlinJavaScriptDecompiledTextConsistencyTest : TextConsistencyBase
.sure { "No package fragment provider was created" }
module.initialize(provider)
module.addDependencyOnModule(module)
module.addDependencyOnModule(KotlinBuiltIns.getInstance().getBuiltInsModule())
module.seal()
module.setDependencies(module, KotlinBuiltIns.getInstance().getBuiltInsModule())
return module
}