azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Introduce TargetEnvironment and CompilerEnvironment

Browse Source
This commit is contained in:
Pavel V. Talanov
2015-07-24 18:38:24 +03:00
parent b3adf27b81
commit 2ef5e03f27
6 changed files with 71 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/kotlin/frontend/java/di/injection.kt
+6 -6
View File
@@ -32,10 +32,7 @@ import org.jetbrains.kotlin.load.java.sam.SamConversionResolverImpl
import org.jetbrains.kotlin.load.java.structure.impl.JavaPropertyInitializerEvaluatorImpl
import org.jetbrains.kotlin.load.kotlin.DeserializationComponentsForJava
import org.jetbrains.kotlin.load.kotlin.JvmVirtualFileFinderFactory
import org.jetbrains.kotlin.resolve.BindingTrace
import org.jetbrains.kotlin.resolve.BodyResolveCache
import org.jetbrains.kotlin.resolve.LazyTopDownAnalyzer
import org.jetbrains.kotlin.resolve.LazyTopDownAnalyzerForTopLevel
import org.jetbrains.kotlin.resolve.*
import org.jetbrains.kotlin.resolve.jvm.JavaClassFinderPostConstruct
import org.jetbrains.kotlin.resolve.jvm.JavaDescriptorResolver
import org.jetbrains.kotlin.resolve.jvm.JavaLazyAnalyzerPostConstruct
@@ -80,7 +77,9 @@ public fun createContainerForLazyResolveWithJava(
useInstance(moduleClassResolver)
useInstance(declarationProviderFactory)
useInstance(BodyResolveCache.ThrowException)
CompilerEnvironment.configure(this)
useImpl<FileScopeProviderImpl>()
useImpl<LazyResolveToken>()
}.let {
@@ -101,7 +100,8 @@ public fun createContainerForTopDownAnalyzerForJvm(
configureJavaTopDownAnalysis(moduleContentScope, moduleContext.project, lookupTracker)
useInstance(declarationProviderFactory)
useInstance(BodyResolveCache.ThrowException)
CompilerEnvironment.configure(this)
useImpl<SingleModuleClassResolver>()
useImpl<FileScopeProviderImpl>()