From a583a2f171fa4cbbea6d4d4fc32df8af670d65e7 Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Wed, 24 May 2017 15:42:15 +0300
Subject: [PATCH] Move JavaModuleInfo and JavaModuleGraph to frontend.java

---
 .../kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt        | 6 +++---
 .../kotlin/resolve/jvm/modules/JavaModuleGraph.kt}          | 4 ++--
 .../jetbrains/kotlin/resolve}/jvm/modules/JavaModuleInfo.kt | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)
 rename compiler/{cli/src/org/jetbrains/kotlin/cli/jvm/modules/ModuleGraph.kt => frontend.java/src/org/jetbrains/kotlin/resolve/jvm/modules/JavaModuleGraph.kt} (91%)
 rename compiler/{cli/src/org/jetbrains/kotlin/cli => frontend.java/src/org/jetbrains/kotlin/resolve}/jvm/modules/JavaModuleInfo.kt (98%)

diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt
index 6b5168b89da..258c4fe9d39 100644
--- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt
+++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt
@@ -74,8 +74,6 @@ import org.jetbrains.kotlin.cli.jvm.JvmRuntimeVersionsConsistencyChecker
 import org.jetbrains.kotlin.cli.jvm.config.*
 import org.jetbrains.kotlin.cli.jvm.index.*
 import org.jetbrains.kotlin.cli.jvm.modules.CoreJrtFileSystem
-import org.jetbrains.kotlin.cli.jvm.modules.JavaModuleInfo
-import org.jetbrains.kotlin.cli.jvm.modules.ModuleGraph
 import org.jetbrains.kotlin.codegen.extensions.ClassBuilderInterceptorExtension
 import org.jetbrains.kotlin.codegen.extensions.ExpressionCodegenExtension
 import org.jetbrains.kotlin.compiler.plugin.ComponentRegistrar
@@ -98,6 +96,8 @@ import org.jetbrains.kotlin.resolve.extensions.SyntheticResolveExtension
 import org.jetbrains.kotlin.resolve.jvm.KotlinJavaPsiFacade
 import org.jetbrains.kotlin.resolve.jvm.extensions.AnalysisHandlerExtension
 import org.jetbrains.kotlin.resolve.jvm.extensions.PackageFragmentProviderExtension
+import org.jetbrains.kotlin.resolve.jvm.modules.JavaModuleGraph
+import org.jetbrains.kotlin.resolve.jvm.modules.JavaModuleInfo
 import org.jetbrains.kotlin.resolve.lazy.declarations.CliDeclarationProviderFactoryService
 import org.jetbrains.kotlin.resolve.lazy.declarations.DeclarationProviderFactoryService
 import org.jetbrains.kotlin.script.KotlinScriptDefinitionProvider
@@ -291,7 +291,7 @@ class KotlinCoreEnvironment private constructor(
     }
 
     private fun addModularJdkRoots(fileSystem: VirtualFileSystem, result: MutableList<JavaRoot>) {
-        val graph = ModuleGraph { moduleName ->
+        val graph = JavaModuleGraph { moduleName ->
             fileSystem.findFileByPath("/modules/$moduleName/module-info.class")?.let((JavaModuleInfo)::read) ?: run {
                 report(ERROR, "Module $moduleName cannot be found in the Java runtime image")
                 JavaModuleInfo(moduleName, emptyList(), emptyList())
diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/modules/ModuleGraph.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/modules/JavaModuleGraph.kt
similarity index 91%
rename from compiler/cli/src/org/jetbrains/kotlin/cli/jvm/modules/ModuleGraph.kt
rename to compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/modules/JavaModuleGraph.kt
index ca554eb9306..fe8cb16ed9b 100644
--- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/modules/ModuleGraph.kt
+++ b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/modules/JavaModuleGraph.kt
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.cli.jvm.modules
+package org.jetbrains.kotlin.resolve.jvm.modules
 
 import org.jetbrains.kotlin.storage.LockBasedStorageManager
 
-class ModuleGraph(getModuleInfo: (String) -> JavaModuleInfo) {
+class JavaModuleGraph(getModuleInfo: (String) -> JavaModuleInfo) {
     private val moduleInfo: (String) -> JavaModuleInfo = LockBasedStorageManager.NO_LOCKS.createMemoizedFunction(getModuleInfo)
 
     fun getAllReachable(rootModules: List<String>): List<String> {
diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/modules/JavaModuleInfo.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/modules/JavaModuleInfo.kt
similarity index 98%
rename from compiler/cli/src/org/jetbrains/kotlin/cli/jvm/modules/JavaModuleInfo.kt
rename to compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/modules/JavaModuleInfo.kt
index 313994cb036..bd55d0b5312 100644
--- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/modules/JavaModuleInfo.kt
+++ b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/modules/JavaModuleInfo.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.cli.jvm.modules
+package org.jetbrains.kotlin.resolve.jvm.modules
 
 import com.intellij.openapi.vfs.VirtualFile
 import org.jetbrains.kotlin.name.FqName