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

[Injection] Pull languageVersionSettings injection to 'configureModule'

Browse Source
This commit is contained in:
Dmitry Savvinov
2019-03-13 11:05:18 +03:00
parent 89603327c5
commit c97138c0eb
6 changed files with 21 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/frontend/di/injection.kt
+7 -9
View File
@@ -45,7 +45,8 @@ fun StorageComponentContainer.configureModule(
moduleContext: ModuleContext,
platform: TargetPlatform,
compilerServices: PlatformDependentCompilerServices,
trace: BindingTrace
trace: BindingTrace,
languageVersionSettings: LanguageVersionSettings
) {
useInstance(moduleContext)
useInstance(moduleContext.module)
@@ -53,6 +54,7 @@ fun StorageComponentContainer.configureModule(
useInstance(moduleContext.storageManager)
useInstance(moduleContext.module.builtIns)
useInstance(trace)
useInstance(languageVersionSettings)
useInstance(platform)
useInstance(compilerServices)
@@ -87,12 +89,11 @@ fun createContainerForBodyResolve(
compilerServices: PlatformDependentCompilerServices,
languageVersionSettings: LanguageVersionSettings
): StorageComponentContainer = createContainer("BodyResolve", compilerServices) {
configureModule(moduleContext, platform, compilerServices, bindingTrace)
configureModule(moduleContext, platform, compilerServices, bindingTrace, languageVersionSettings)
useInstance(statementFilter)
useInstance(BodyResolveCache.ThrowException)
useInstance(languageVersionSettings)
useImpl<AnnotationResolverImpl>()
useImpl<BodyResolver>()
@@ -108,12 +109,11 @@ fun createContainerForLazyBodyResolve(
compilerServices: PlatformDependentCompilerServices,
languageVersionSettings: LanguageVersionSettings
): StorageComponentContainer = createContainer("LazyBodyResolve", compilerServices) {
configureModule(moduleContext, platform, compilerServices, bindingTrace)
configureModule(moduleContext, platform, compilerServices, bindingTrace, languageVersionSettings)
useInstance(kotlinCodeAnalyzer)
useInstance(kotlinCodeAnalyzer.fileScopeProvider)
useInstance(bodyResolveCache)
useInstance(languageVersionSettings)
useImpl<AnnotationResolverImpl>()
useImpl<LazyTopDownAnalyzer>()
useImpl<BasicAbsentDescriptorHandler>()
@@ -130,7 +130,7 @@ fun createContainerForLazyLocalClassifierAnalyzer(
localClassDescriptorHolder: LocalClassDescriptorHolder,
compilerServices: PlatformDependentCompilerServices
): StorageComponentContainer = createContainer("LocalClassifierAnalyzer", compilerServices) {
configureModule(moduleContext, platform, compilerServices, bindingTrace)
configureModule(moduleContext, platform, compilerServices, bindingTrace, languageVersionSettings)
useInstance(localClassDescriptorHolder)
useInstance(lookupTracker)
@@ -148,7 +148,6 @@ fun createContainerForLazyLocalClassifierAnalyzer(
useImpl<DeclarationScopeProviderForLocalClassifierAnalyzer>()
useImpl<LocalLazyDeclarationResolver>()
useInstance(languageVersionSettings)
useImpl<SubstitutingScopeProviderImpl>()
useInstance(statementFilter)
}
@@ -162,10 +161,9 @@ fun createContainerForLazyResolve(
targetEnvironment: TargetEnvironment,
languageVersionSettings: LanguageVersionSettings
): StorageComponentContainer = createContainer("LazyResolve", compilerServices) {
configureModule(moduleContext, platform, compilerServices, bindingTrace)
configureModule(moduleContext, platform, compilerServices, bindingTrace, languageVersionSettings)
useInstance(declarationProviderFactory)
useInstance(languageVersionSettings)
useImpl<AnnotationResolverImpl>()
useImpl<CompilerDeserializationConfiguration>()