[Injection] Minor: inline configureModule overload without trace
This commit is contained in:
@@ -47,13 +47,15 @@ import org.jetbrains.kotlin.types.expressions.LocalLazyDeclarationResolver
|
|||||||
fun StorageComponentContainer.configureModule(
|
fun StorageComponentContainer.configureModule(
|
||||||
moduleContext: ModuleContext,
|
moduleContext: ModuleContext,
|
||||||
platform: TargetPlatform,
|
platform: TargetPlatform,
|
||||||
compilerServices: PlatformDependentCompilerServices
|
compilerServices: PlatformDependentCompilerServices,
|
||||||
|
trace: BindingTrace
|
||||||
) {
|
) {
|
||||||
useInstance(moduleContext)
|
useInstance(moduleContext)
|
||||||
useInstance(moduleContext.module)
|
useInstance(moduleContext.module)
|
||||||
useInstance(moduleContext.project)
|
useInstance(moduleContext.project)
|
||||||
useInstance(moduleContext.storageManager)
|
useInstance(moduleContext.storageManager)
|
||||||
useInstance(moduleContext.module.builtIns)
|
useInstance(moduleContext.module.builtIns)
|
||||||
|
useInstance(trace)
|
||||||
|
|
||||||
useInstance(platform)
|
useInstance(platform)
|
||||||
useInstance(compilerServices)
|
useInstance(compilerServices)
|
||||||
@@ -80,16 +82,6 @@ private fun StorageComponentContainer.configurePlatformIndependentComponents() {
|
|||||||
useImpl<ClassicTypeSystemContextForCS>()
|
useImpl<ClassicTypeSystemContextForCS>()
|
||||||
}
|
}
|
||||||
|
|
||||||
fun StorageComponentContainer.configureModule(
|
|
||||||
moduleContext: ModuleContext,
|
|
||||||
platform: TargetPlatform,
|
|
||||||
compilerServices: PlatformDependentCompilerServices,
|
|
||||||
trace: BindingTrace
|
|
||||||
) {
|
|
||||||
configureModule(moduleContext, platform, compilerServices)
|
|
||||||
useInstance(trace)
|
|
||||||
}
|
|
||||||
|
|
||||||
fun createContainerForBodyResolve(
|
fun createContainerForBodyResolve(
|
||||||
moduleContext: ModuleContext,
|
moduleContext: ModuleContext,
|
||||||
bindingTrace: BindingTrace,
|
bindingTrace: BindingTrace,
|
||||||
|
|||||||
@@ -36,7 +36,7 @@ import org.jetbrains.kotlin.types.expressions.FakeCallResolver
|
|||||||
fun createContainerForTests(project: Project, module: ModuleDescriptor): ContainerForTests {
|
fun createContainerForTests(project: Project, module: ModuleDescriptor): ContainerForTests {
|
||||||
return ContainerForTests(createContainer("Tests", JvmPlatformCompilerServices) {
|
return ContainerForTests(createContainer("Tests", JvmPlatformCompilerServices) {
|
||||||
configureModule(ModuleContext(module, project),
|
configureModule(ModuleContext(module, project),
|
||||||
JvmPlatforms.defaultJvmPlatform, JvmPlatformCompilerServices)
|
JvmPlatforms.defaultJvmPlatform, JvmPlatformCompilerServices, BindingTraceContext())
|
||||||
useInstance(LanguageVersionSettingsImpl.DEFAULT)
|
useInstance(LanguageVersionSettingsImpl.DEFAULT)
|
||||||
useImpl<SubstitutingScopeProviderImpl>()
|
useImpl<SubstitutingScopeProviderImpl>()
|
||||||
useImpl<AnnotationResolverImpl>()
|
useImpl<AnnotationResolverImpl>()
|
||||||
|
|||||||
Reference in New Issue
Block a user