Refactoring: get module language settings in ResolverForProjectImpl

This commit is contained in:
Nikolay Krasko
2018-03-16 13:27:21 +03:00
parent 525d90540a
commit 0b0eb210b6
4 changed files with 19 additions and 10 deletions
@@ -174,6 +174,9 @@ class ResolverForProjectImpl<M : ModuleInfo>(
val packagePartProvider = packagePartProviderFactory(moduleContent)
val resolverForModuleFactory = resolverForModuleFactoryByPlatform(module.platform)
val languageVersionSettings = languageSettingsProvider.getLanguageVersionSettings(module, projectContext.project)
val targetPlatformVersion = languageSettingsProvider.getTargetPlatform(module)
resolverForModuleFactory.createResolverForModule(
descriptor as ModuleDescriptorImpl,
projectContext.withModule(descriptor),
@@ -181,7 +184,8 @@ class ResolverForProjectImpl<M : ModuleInfo>(
platformParameters,
targetEnvironment,
this@ResolverForProjectImpl,
languageSettingsProvider,
languageVersionSettings,
targetPlatformVersion,
packagePartProvider
)
}
@@ -298,7 +302,8 @@ abstract class ResolverForModuleFactory {
platformParameters: PlatformAnalysisParameters,
targetEnvironment: TargetEnvironment,
resolverForProject: ResolverForProject<M>,
languageSettingsProvider: LanguageSettingsProvider,
languageVersionSettings: LanguageVersionSettings,
targetPlatformVersion: TargetPlatformVersion,
packagePartProvider: PackagePartProvider
): ResolverForModule
@@ -106,7 +106,8 @@ object CommonAnalyzerFacade : ResolverForModuleFactory() {
platformParameters: PlatformAnalysisParameters,
targetEnvironment: TargetEnvironment,
resolverForProject: ResolverForProject<M>,
languageSettingsProvider: LanguageSettingsProvider,
languageVersionSettings: LanguageVersionSettings,
targetPlatformVersion: TargetPlatformVersion,
packagePartProvider: PackagePartProvider
): ResolverForModule {
val (moduleInfo, syntheticFiles, moduleContentScope) = moduleContent
@@ -120,7 +121,7 @@ object CommonAnalyzerFacade : ResolverForModuleFactory() {
val trace = CodeAnalyzerInitializer.getInstance(project).createTrace()
val container = createContainerToResolveCommonCode(
moduleContext, trace, declarationProviderFactory, moduleContentScope, targetEnvironment, packagePartProvider,
languageSettingsProvider.getLanguageVersionSettings(moduleInfo, project)
languageVersionSettings
)
val packageFragmentProviders = listOf(