Convert usages of existing generated injectors to dynamic injectors

Rewrite RuntimeModuleData to use hand-written code as we do not pack container module into runtime
This change introduces some overhead (up to 10% for the tests I ran) in some scenarios in IDE, that should be addressed later

compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/ReplInterpreter.java

@@ -36,6 +36,8 @@ import org.jetbrains.kotlin.cli.common.messages.AnalyzerWithCompilerReport;
 import org.jetbrains.kotlin.cli.jvm.compiler.CliLightClassGenerationSupport;
 import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles;
 import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment;
+import org.jetbrains.kotlin.cli.jvm.repl.di.ContainerForReplWithJava;
+import org.jetbrains.kotlin.cli.jvm.repl.di.DiPackage;
 import org.jetbrains.kotlin.codegen.ClassBuilderFactories;
 import org.jetbrains.kotlin.codegen.CompilationErrorHandler;
 import org.jetbrains.kotlin.codegen.KotlinCodegenFacade;
@@ -45,7 +47,6 @@ import org.jetbrains.kotlin.context.MutableModuleContext;
 import org.jetbrains.kotlin.descriptors.ScriptDescriptor;
 import org.jetbrains.kotlin.descriptors.impl.CompositePackageFragmentProvider;
 import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl;
-import org.jetbrains.kotlin.di.InjectorForReplWithJava;
 import org.jetbrains.kotlin.idea.JetLanguage;
 import org.jetbrains.kotlin.name.FqName;
 import org.jetbrains.kotlin.parsing.JetParserDefinition;
@@ -118,7 +119,7 @@ public class ReplInterpreter {
             }
         };
 
-        InjectorForReplWithJava injector = new InjectorForReplWithJava(
+        ContainerForReplWithJava container = DiPackage.createContainerForReplWithJava(
                 moduleContext,
                 trace,
                 scriptDeclarationFactory,
@@ -127,13 +128,13 @@ public class ReplInterpreter {
         );
 
         this.topDownAnalysisContext = new TopDownAnalysisContext(TopDownAnalysisMode.LocalDeclarations, DataFlowInfo.EMPTY);
-        this.topDownAnalyzer = injector.getLazyTopDownAnalyzerForTopLevel();
-        this.resolveSession = injector.getResolveSession();
+        this.topDownAnalyzer = container.getLazyTopDownAnalyzerForTopLevel();
+        this.resolveSession = container.getResolveSession();
 
         moduleContext.initializeModuleContents(new CompositePackageFragmentProvider(
                 Arrays.asList(
-                        injector.getResolveSession().getPackageFragmentProvider(),
-                        injector.getJavaDescriptorResolver().getPackageFragmentProvider()
+                        container.getResolveSession().getPackageFragmentProvider(),
+                        container.getJavaDescriptorResolver().getPackageFragmentProvider()
                 )
         ));
 

compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/di/injection.kt

@@ -0,0 +1,58 @@
+/*
+ * 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.cli.jvm.repl.di
+
+import com.intellij.psi.search.GlobalSearchScope
+import org.jetbrains.kotlin.container.*
+import org.jetbrains.kotlin.context.ModuleContext
+import org.jetbrains.kotlin.frontend.di.configureModule
+import org.jetbrains.kotlin.frontend.java.di.configureJavaTopDownAnalysis
+import org.jetbrains.kotlin.load.java.JavaClassFinderImpl
+import org.jetbrains.kotlin.load.java.lazy.SingleModuleClassResolver
+import org.jetbrains.kotlin.load.kotlin.KotlinJvmCheckerProvider
+import org.jetbrains.kotlin.resolve.BindingTrace
+import org.jetbrains.kotlin.resolve.LazyTopDownAnalyzerForTopLevel
+import org.jetbrains.kotlin.resolve.jvm.JavaClassFinderPostConstruct
+import org.jetbrains.kotlin.resolve.jvm.JavaDescriptorResolver
+import org.jetbrains.kotlin.resolve.lazy.ResolveSession
+import org.jetbrains.kotlin.resolve.lazy.ScopeProvider
+import org.jetbrains.kotlin.resolve.lazy.declarations.DeclarationProviderFactory
+
+public fun createContainerForReplWithJava(
+        moduleContext: ModuleContext, bindingTrace: BindingTrace, declarationProviderFactory: DeclarationProviderFactory,
+        moduleContentScope: GlobalSearchScope, additionalFileScopeProvider: ScopeProvider.AdditionalFileScopeProvider
+): ContainerForReplWithJava = createContainer("ReplWithJava") {
+    configureModule(moduleContext, KotlinJvmCheckerProvider, bindingTrace)
+    configureJavaTopDownAnalysis(moduleContentScope, moduleContext.project)
+
+
+    useInstance(additionalFileScopeProvider)
+    useInstance(declarationProviderFactory)
+
+    useImpl<ScopeProvider>()
+    useImpl<SingleModuleClassResolver>()
+}.let {
+    it.get<JavaClassFinderImpl>().initialize()
+    it.get<JavaClassFinderPostConstruct>().postCreate()
+    ContainerForReplWithJava(it)
+}
+
+public class ContainerForReplWithJava(container: StorageComponentContainer) {
+    val resolveSession: ResolveSession by container
+    val lazyTopDownAnalyzerForTopLevel: LazyTopDownAnalyzerForTopLevel by container
+    val javaDescriptorResolver: JavaDescriptorResolver by container
+}