[Injection] Pull languageVersionSettings injection to 'configureModule'

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
@@ -21,7 +21,6 @@ import org.jetbrains.kotlin.config.LanguageVersionSettingsImpl
import org.jetbrains.kotlin.container.StorageComponentContainer
import org.jetbrains.kotlin.container.getValue
import org.jetbrains.kotlin.container.useImpl
import org.jetbrains.kotlin.container.useInstance
import org.jetbrains.kotlin.context.ModuleContext
import org.jetbrains.kotlin.descriptors.ModuleDescriptor
import org.jetbrains.kotlin.frontend.di.configureModule
@@ -35,9 +34,13 @@ import org.jetbrains.kotlin.types.expressions.FakeCallResolver
fun createContainerForTests(project: Project, module: ModuleDescriptor): ContainerForTests {
return ContainerForTests(createContainer("Tests", JvmPlatformCompilerServices) {
configureModule(ModuleContext(module, project),
JvmPlatforms.defaultJvmPlatform, JvmPlatformCompilerServices, BindingTraceContext())
useInstance(LanguageVersionSettingsImpl.DEFAULT)
configureModule(
ModuleContext(module, project),
JvmPlatforms.defaultJvmPlatform,
JvmPlatformCompilerServices,
BindingTraceContext(),
LanguageVersionSettingsImpl.DEFAULT
)
useImpl<SubstitutingScopeProviderImpl>()
useImpl<AnnotationResolverImpl>()
useImpl<ExpressionTypingServices>()