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

SamWithReceiver: Call onContainerComposed() properly for module dependencies as well. Inject SamWithReceiverResolver by instance.

Browse Source
This commit is contained in:
Yan Zhulanow
2017-01-17 12:03:36 +09:00
committed by Yan Zhulanow
parent 75e76dda54
commit 5adc3bacff
2 changed files with 4 additions and 3 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
+1 -1
View File
@@ -69,7 +69,7 @@ fun StorageComponentContainer.configureJavaTopDownAnalysis(
useImpl<TraceBasedErrorReporter>() useImpl<TraceBasedErrorReporter>()
useImpl<PsiBasedExternalAnnotationResolver>() useImpl<PsiBasedExternalAnnotationResolver>()
useImpl<JavaPropertyInitializerEvaluatorImpl>() useImpl<JavaPropertyInitializerEvaluatorImpl>()
useImpl<SamWithReceiverResolver>() useInstance(SamWithReceiverResolver())
useImpl<SamConversionResolverImpl>() useImpl<SamConversionResolverImpl>()
useImpl<JavaSourceElementFactoryImpl>() useImpl<JavaSourceElementFactoryImpl>()
useInstance(InternalFlexibleTypeTransformer) useInstance(InternalFlexibleTypeTransformer)
compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/TopDownAnalyzerFacadeForJVM.kt
+3 -2
View File
@@ -82,8 +82,6 @@ object TopDownAnalyzerFacadeForJVM {
project, files, trace, configuration, packagePartProvider, declarationProviderFactory, sourceModuleSearchScope project, files, trace, configuration, packagePartProvider, declarationProviderFactory, sourceModuleSearchScope
) )
StorageComponentContainerContributor.getInstances(project).forEach { it.onContainerComposed(container, null) }
val module = container.get<ModuleDescriptor>() val module = container.get<ModuleDescriptor>()
val moduleContext = container.get<ModuleContext>() val moduleContext = container.get<ModuleContext>()
@@ -162,6 +160,8 @@ object TopDownAnalyzerFacadeForJVM {
packagePartProvider(dependencyScope), languageVersionSettings, moduleClassResolver packagePartProvider(dependencyScope), languageVersionSettings, moduleClassResolver
) )
StorageComponentContainerContributor.getInstances(project).forEach { it.onContainerComposed(dependenciesContainer, null) }
moduleClassResolver.compiledCodeResolver = dependenciesContainer.get<JavaDescriptorResolver>() moduleClassResolver.compiledCodeResolver = dependenciesContainer.get<JavaDescriptorResolver>()
dependenciesContext.setDependencies(listOfNotNull(dependenciesContext.module, optionalBuiltInsModule)) dependenciesContext.setDependencies(listOfNotNull(dependenciesContext.module, optionalBuiltInsModule))
@@ -185,6 +185,7 @@ object TopDownAnalyzerFacadeForJVM {
languageVersionSettings, moduleClassResolver languageVersionSettings, moduleClassResolver
).apply { ).apply {
initJvmBuiltInsForTopDownAnalysis(module, languageVersionSettings) initJvmBuiltInsForTopDownAnalysis(module, languageVersionSettings)
StorageComponentContainerContributor.getInstances(project).forEach { it.onContainerComposed(this, null) }
} }
moduleClassResolver.sourceCodeResolver = container.get<JavaDescriptorResolver>() moduleClassResolver.sourceCodeResolver = container.get<JavaDescriptorResolver>()