From 96199ecc1fd9d5e3041e204c04fe18b495e38860 Mon Sep 17 00:00:00 2001
From: "Pavel V. Talanov" <talanov.pavel@gmail.com>
Date: Mon, 15 Jun 2015 18:42:24 +0300
Subject: [PATCH] Refactor AnalyzerFacade: move module.initialize() outside of
 createResolverForModule()

---
 .../org/jetbrains/kotlin/resolve/jvm/JvmAnalyzerFacade.kt | 5 +++--
 .../src/org/jetbrains/kotlin/analyzer/AnalyzerFacade.kt   | 4 +++-
 .../kotlin/descriptors/impl/ModuleDescriptorImpl.kt       | 2 +-
 .../kotlin/idea/caches/resolve/JsAnalyzerFacade.kt        | 8 ++++----
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/JvmAnalyzerFacade.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/JvmAnalyzerFacade.kt
index e420da2d629..d1fbdb5de46 100644
--- a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/JvmAnalyzerFacade.kt
+++ b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/JvmAnalyzerFacade.kt
@@ -21,6 +21,7 @@ import com.intellij.psi.search.GlobalSearchScope
 import org.jetbrains.kotlin.analyzer.*
 import org.jetbrains.kotlin.context.ModuleContext
 import org.jetbrains.kotlin.descriptors.ModuleParameters
+import org.jetbrains.kotlin.descriptors.PackageFragmentProvider
 import org.jetbrains.kotlin.descriptors.impl.CompositePackageFragmentProvider
 import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl
 import org.jetbrains.kotlin.di.InjectorForLazyResolveWithJava
@@ -36,6 +37,7 @@ import kotlin.platform.platformStatic
 
 public class JvmResolverForModule(
         override val lazyResolveSession: ResolveSession,
+        override val packageFragmentProvider: PackageFragmentProvider,
         public val javaDescriptorResolver: JavaDescriptorResolver
 ) : ResolverForModule
 
@@ -75,8 +77,7 @@ public object JvmAnalyzerFacade : AnalyzerFacade<JvmResolverForModule, JvmPlatfo
         val resolveSession = injector.getResolveSession()!!
         val javaDescriptorResolver = injector.getJavaDescriptorResolver()!!
         val providersForModule = listOf(resolveSession.getPackageFragmentProvider(), javaDescriptorResolver.packageFragmentProvider)
-        moduleDescriptor.initialize(CompositePackageFragmentProvider(providersForModule))
-        return JvmResolverForModule(resolveSession, javaDescriptorResolver)
+        return JvmResolverForModule(resolveSession, CompositePackageFragmentProvider(providersForModule), javaDescriptorResolver)
     }
 
     override val moduleParameters: ModuleParameters
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/analyzer/AnalyzerFacade.kt b/compiler/frontend/src/org/jetbrains/kotlin/analyzer/AnalyzerFacade.kt
index bbbba59607e..4aa5508235b 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/analyzer/AnalyzerFacade.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/analyzer/AnalyzerFacade.kt
@@ -23,6 +23,7 @@ import org.jetbrains.kotlin.context.ProjectContext
 import org.jetbrains.kotlin.context.withModule
 import org.jetbrains.kotlin.descriptors.ModuleDescriptor
 import org.jetbrains.kotlin.descriptors.ModuleParameters
+import org.jetbrains.kotlin.descriptors.PackageFragmentProvider
 import org.jetbrains.kotlin.descriptors.impl.LazyModuleDependencies
 import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl
 import org.jetbrains.kotlin.name.Name
@@ -34,6 +35,7 @@ import kotlin.properties.Delegates
 
 public trait ResolverForModule {
     public val lazyResolveSession: ResolveSession
+    public val packageFragmentProvider: PackageFragmentProvider
 }
 
 public trait ResolverForProject<M : ModuleInfo,out R : ResolverForModule> {
@@ -178,7 +180,7 @@ public trait AnalyzerFacade<A : ResolverForModule, in P : PlatformAnalysisParame
                         module, descriptor, projectContext.withModule(descriptor),
                         modulesContent(module), platformParameters, resolverForProject
                 )
-                assert(descriptor.isInitialized, "ModuleDescriptorImpl#initialize() should be called in createResolverForModule")
+                descriptor.initialize(resolverForModule.packageFragmentProvider)
                 resolverForProject.resolverByModuleDescriptor[descriptor] = resolverForModule
             }
         }
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 7ae1f11db28..6a337c85acc 100644
--- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/ModuleDescriptorImpl.kt
+++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/ModuleDescriptorImpl.kt
@@ -64,7 +64,7 @@ public class ModuleDescriptorImpl(
         })
     }
 
-    public val isInitialized: Boolean
+    private val isInitialized: Boolean
         get() = packageFragmentProviderForModuleContent != null
 
     public fun setDependencies(dependencies: ModuleDependencies) {
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/JsAnalyzerFacade.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/JsAnalyzerFacade.kt
index d35a5d1671f..055b2bcb57c 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/JsAnalyzerFacade.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/JsAnalyzerFacade.kt
@@ -22,6 +22,7 @@ import com.intellij.util.PathUtil
 import org.jetbrains.kotlin.analyzer.*
 import org.jetbrains.kotlin.context.ModuleContext
 import org.jetbrains.kotlin.descriptors.ModuleParameters
+import org.jetbrains.kotlin.descriptors.PackageFragmentProvider
 import org.jetbrains.kotlin.descriptors.impl.CompositePackageFragmentProvider
 import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl
 import org.jetbrains.kotlin.di.InjectorForLazyResolve
@@ -36,10 +37,10 @@ import org.jetbrains.kotlin.types.DynamicTypesAllowed
 import org.jetbrains.kotlin.utils.KotlinJavascriptMetadataUtils
 
 public class JsResolverForModule(
-        override val lazyResolveSession: ResolveSession
+        override val lazyResolveSession: ResolveSession,
+        override val packageFragmentProvider: PackageFragmentProvider
 ) : ResolverForModule
 
-
 public object JsAnalyzerFacade : AnalyzerFacade<JsResolverForModule, PlatformAnalysisParameters> {
 
     override fun <M : ModuleInfo> createResolverForModule(
@@ -72,8 +73,7 @@ public object JsAnalyzerFacade : AnalyzerFacade<JsResolverForModule, PlatformAna
             }
         }
 
-        moduleDescriptor.initialize(packageFragmentProvider)
-        return JsResolverForModule(resolveSession)
+        return JsResolverForModule(resolveSession, packageFragmentProvider)
     }
 
     override val moduleParameters: ModuleParameters