From 04f12846f17eda612a24cdcd821d2654c3396db8 Mon Sep 17 00:00:00 2001 From: Dmitry Savvinov Date: Fri, 8 Jun 2018 17:03:40 +0300 Subject: [PATCH] Minor: reformat ModuleDescriptorImpl.kt --- .../descriptors/impl/ModuleDescriptorImpl.kt | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/ModuleDescriptorImpl.kt b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/ModuleDescriptorImpl.kt index 944b9ab4e0d..c9bbc0a6934 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/ModuleDescriptorImpl.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/ModuleDescriptorImpl.kt @@ -30,12 +30,12 @@ import org.jetbrains.kotlin.utils.sure import java.lang.IllegalArgumentException class ModuleDescriptorImpl @JvmOverloads constructor( - moduleName: Name, - private val storageManager: StorageManager, - override val builtIns: KotlinBuiltIns, - // May be null in compiler context, should be not-null in IDE context - multiTargetPlatform: MultiTargetPlatform? = null, - capabilities: Map, Any?> = emptyMap() + moduleName: Name, + private val storageManager: StorageManager, + override val builtIns: KotlinBuiltIns, + // May be null in compiler context, should be not-null in IDE context + multiTargetPlatform: MultiTargetPlatform? = null, + capabilities: Map, Any?> = emptyMap() ) : DeclarationDescriptorImpl(Annotations.EMPTY, moduleName), ModuleDescriptor { init { if (!moduleName.isSpecial) { @@ -56,12 +56,13 @@ class ModuleDescriptorImpl @JvmOverloads constructor( } } - private val packages = storageManager.createMemoizedFunction { - fqName: FqName -> LazyPackageViewDescriptorImpl(this, fqName, storageManager) + private val packages = storageManager.createMemoizedFunction { fqName: FqName -> + LazyPackageViewDescriptorImpl(this, fqName, storageManager) } @Deprecated("This method is not going to be supported. Please do not use it") - val testOnly_AllDependentModules: List get() = this.dependencies!!.allDependencies + val testOnly_AllDependentModules: List + get() = this.dependencies!!.allDependencies override val allDependencyModules: List get() = this.dependencies.sure { "Dependencies of module $id were not set" }.allDependencies.filter { it != this } @@ -83,8 +84,7 @@ class ModuleDescriptorImpl @JvmOverloads constructor( val moduleDependencies = dependencies.sure { "Dependencies of module $id were not set before querying module content" } val dependenciesDescriptors = moduleDependencies.allDependencies assert(this in dependenciesDescriptors) { "Module $id is not contained in his own dependencies, this is probably a misconfiguration" } - dependenciesDescriptors.forEach { - dependency -> + dependenciesDescriptors.forEach { dependency -> assert(dependency.isInitialized) { "Dependency module ${dependency.id} was not initialized by the time contents of dependent module ${this.id} were queried" }