[Injection] Pull languageVersionSettings injection to 'configureModule'

2019-03-13 11:05:18 +03:00
parent 89603327c5
commit c97138c0eb
6 changed files with 21 additions and 22 deletions
@@ -309,14 +309,14 @@ internal object IDELightClassContexts {
            val jvmTarget = IDELanguageSettingsProvider.getTargetPlatform(moduleInfo, project) as? JvmTarget ?: JvmTarget.DEFAULT
            configureModule(
                ModuleContext(moduleDescriptor, project), JvmPlatforms.jvmPlatformByTargetVersion(jvmTarget),
-                JvmPlatformCompilerServices, trace
+                JvmPlatformCompilerServices, trace,
+                IDELanguageSettingsProvider.getLanguageVersionSettings(moduleInfo, project)
            )

            useInstance(GlobalSearchScope.EMPTY_SCOPE)
            useInstance(LookupTracker.DO_NOTHING)
            useInstance(ExpectActualTracker.DoNothing)
            useImpl<FileScopeProviderImpl>()
-            useInstance(IDELanguageSettingsProvider.getLanguageVersionSettings(moduleInfo, project))
            useInstance(FileBasedDeclarationProviderFactory(sm, files))

            useInstance(CodegenAffectingAnnotations(realWorldModule))