Move CompilerEnvironment from 'frontend' to 'cli'

This is needed in order to have a single convenient place where to
register frontend services implemented _outside_ of the 'frontend'
module, such as the control flow analysis, extracted to a separate
module in a subsequent commit.

compiler/frontend/src/org/jetbrains/kotlin/analyzer/AbstractAnalyzerWithCompilerReport.kt

@@ -6,8 +6,11 @@
 package org.jetbrains.kotlin.analyzer
 
 import org.jetbrains.kotlin.psi.KtFile
+import org.jetbrains.kotlin.resolve.TargetEnvironment
 
 interface AbstractAnalyzerWithCompilerReport {
+    val targetEnvironment: TargetEnvironment
+
     val analysisResult: AnalysisResult
 
     fun analyzeAndReport(files: Collection<KtFile>, analyze: () -> AnalysisResult)

compiler/frontend/src/org/jetbrains/kotlin/analyzer/common/CommonResolverForModuleFactory.kt

@@ -118,6 +118,7 @@ class CommonResolverForModuleFactory(
         fun analyzeFiles(
             files: Collection<KtFile>, moduleName: Name, dependOnBuiltIns: Boolean, languageVersionSettings: LanguageVersionSettings,
             targetPlatform: TargetPlatform,
+            targetEnvironment: TargetEnvironment,
             capabilities: Map<ModuleCapability<*>, Any?> = emptyMap(),
             dependenciesContainer: CommonDependenciesContainer? = null,
             metadataPartProviderFactory: (ModuleContent<ModuleInfo>) -> MetadataPartProvider
@@ -141,7 +142,7 @@ class CommonResolverForModuleFactory(
 
             val resolverForModuleFactory = CommonResolverForModuleFactory(
                 CommonAnalysisParameters(metadataPartProviderFactory),
-                CompilerEnvironment,
+                targetEnvironment,
                 targetPlatform,
                 shouldCheckExpectActual = false,
                 dependenciesContainer

compiler/frontend/src/org/jetbrains/kotlin/frontend/di/injection.kt

@@ -197,7 +197,7 @@ fun createContainerForLazyLocalClassifierAnalyzer(
 
     useInstance(NoTopLevelDescriptorProvider)
 
-    CompilerEnvironment.configure(this)
+    TargetEnvironment.configureCompilerEnvironment(this)
 
     useInstance(FileScopeProvider.ThrowException)
     useImpl<AnnotationResolverImpl>()

compiler/frontend/src/org/jetbrains/kotlin/resolve/CompilerEnvironment.kt

@@ -1,34 +0,0 @@
-/*
- * Copyright 2010-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jetbrains.kotlin.resolve
-
-import org.jetbrains.kotlin.container.StorageComponentContainer
-import org.jetbrains.kotlin.container.useImpl
-import org.jetbrains.kotlin.container.useInstance
-import org.jetbrains.kotlin.idea.MainFunctionDetector
-import org.jetbrains.kotlin.resolve.lazy.CompilerLocalDescriptorResolver
-import org.jetbrains.kotlin.resolve.lazy.BasicAbsentDescriptorHandler
-
-object CompilerEnvironment : TargetEnvironment("Compiler") {
-    override fun configure(container: StorageComponentContainer) {
-        container.useInstance(BodyResolveCache.ThrowException)
-        container.useImpl<CompilerLocalDescriptorResolver>()
-        container.useImpl<BasicAbsentDescriptorHandler>()
-        container.useInstance(ModuleStructureOracle.SingleModule)
-        container.useImpl<MainFunctionDetector.Factory.Ordinary>()
-    }
-}

compiler/frontend/src/org/jetbrains/kotlin/resolve/TargetEnvironment.kt

@@ -17,9 +17,24 @@
 package org.jetbrains.kotlin.resolve
 
 import org.jetbrains.kotlin.container.StorageComponentContainer
+import org.jetbrains.kotlin.container.useImpl
+import org.jetbrains.kotlin.container.useInstance
+import org.jetbrains.kotlin.idea.MainFunctionDetector
+import org.jetbrains.kotlin.resolve.lazy.BasicAbsentDescriptorHandler
+import org.jetbrains.kotlin.resolve.lazy.CompilerLocalDescriptorResolver
 
 abstract class TargetEnvironment(private val name: String) {
     abstract fun configure(container: StorageComponentContainer)
 
     override fun toString() = name
-}
+
+    companion object {
+        fun configureCompilerEnvironment(container: StorageComponentContainer) {
+            container.useInstance(BodyResolveCache.ThrowException)
+            container.useImpl<CompilerLocalDescriptorResolver>()
+            container.useImpl<BasicAbsentDescriptorHandler>()
+            container.useInstance(ModuleStructureOracle.SingleModule)
+            container.useImpl<MainFunctionDetector.Factory.Ordinary>()
+        }
+    }
+}