From 4d378912bf9d81b7e667c4a955599257b8456004 Mon Sep 17 00:00:00 2001 From: Denis Zharkov Date: Tue, 23 Jan 2018 11:28:15 +0300 Subject: [PATCH] Minor. Reformat JVM/JS analyzer facades --- .../kotlin/resolve/jvm/JvmAnalyzerFacade.kt | 65 ++++++++++--------- .../kotlin/caches/resolve/JsAnalyzerFacade.kt | 58 ++++++++--------- 2 files changed, 62 insertions(+), 61 deletions(-) diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/JvmAnalyzerFacade.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/JvmAnalyzerFacade.kt index 8be962d643d..f9170c38687 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/JvmAnalyzerFacade.kt +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/JvmAnalyzerFacade.kt @@ -38,28 +38,28 @@ import org.jetbrains.kotlin.resolve.lazy.ResolveSession import org.jetbrains.kotlin.resolve.lazy.declarations.DeclarationProviderFactoryService class JvmPlatformParameters( - val moduleByJavaClass: (JavaClass) -> ModuleInfo? + val moduleByJavaClass: (JavaClass) -> ModuleInfo? ) : PlatformAnalysisParameters object JvmAnalyzerFacade : AnalyzerFacade() { override fun createResolverForModule( - moduleInfo: M, - moduleDescriptor: ModuleDescriptorImpl, - moduleContext: ModuleContext, - moduleContent: ModuleContent, - platformParameters: PlatformAnalysisParameters, - targetEnvironment: TargetEnvironment, - resolverForProject: ResolverForProject, - languageSettingsProvider: LanguageSettingsProvider, - packagePartProvider: PackagePartProvider + moduleInfo: M, + moduleDescriptor: ModuleDescriptorImpl, + moduleContext: ModuleContext, + moduleContent: ModuleContent, + platformParameters: PlatformAnalysisParameters, + targetEnvironment: TargetEnvironment, + resolverForProject: ResolverForProject, + languageSettingsProvider: LanguageSettingsProvider, + packagePartProvider: PackagePartProvider ): ResolverForModule { val (syntheticFiles, moduleContentScope) = moduleContent val project = moduleContext.project val declarationProviderFactory = DeclarationProviderFactoryService.createDeclarationProviderFactory( - project, moduleContext.storageManager, syntheticFiles, - if (moduleInfo.isLibrary) GlobalSearchScope.EMPTY_SCOPE else moduleContentScope, - moduleInfo + project, moduleContext.storageManager, syntheticFiles, + if (moduleInfo.isLibrary) GlobalSearchScope.EMPTY_SCOPE else moduleContentScope, + moduleInfo ) val moduleClassResolver = ModuleClassResolverImpl { javaClass -> @@ -86,34 +86,35 @@ object JvmAnalyzerFacade : AnalyzerFacade() { val lookupTracker = LookupTracker.DO_NOTHING val container = createContainerForLazyResolveWithJava( - moduleContext, - trace, - declarationProviderFactory, - moduleContentScope, - moduleClassResolver, - targetEnvironment, - lookupTracker, - ExpectActualTracker.DoNothing, - packagePartProvider, - jvmTarget, - languageVersionSettings, - useBuiltInsProvider = false // TODO: load built-ins from module dependencies in IDE + moduleContext, + trace, + declarationProviderFactory, + moduleContentScope, + moduleClassResolver, + targetEnvironment, + lookupTracker, + ExpectActualTracker.DoNothing, + packagePartProvider, + jvmTarget, + languageVersionSettings, + useBuiltInsProvider = false // TODO: load built-ins from module dependencies in IDE ) val resolveSession = container.get() val javaDescriptorResolver = container.get() val providersForModule = arrayListOf( - resolveSession.packageFragmentProvider, - javaDescriptorResolver.packageFragmentProvider) + resolveSession.packageFragmentProvider, + javaDescriptorResolver.packageFragmentProvider + ) providersForModule += PackageFragmentProviderExtension.getInstances(project) - .mapNotNull { - it.getPackageFragmentProvider( - project, moduleDescriptor, moduleContext.storageManager, trace, moduleInfo, lookupTracker - ) - } + .mapNotNull { + it.getPackageFragmentProvider( + project, moduleDescriptor, moduleContext.storageManager, trace, moduleInfo, lookupTracker + ) + } return ResolverForModule(CompositePackageFragmentProvider(providersForModule), container) } diff --git a/idea/ide-common/src/org/jetbrains/kotlin/caches/resolve/JsAnalyzerFacade.kt b/idea/ide-common/src/org/jetbrains/kotlin/caches/resolve/JsAnalyzerFacade.kt index b3c8ab5b18a..32e742241a6 100644 --- a/idea/ide-common/src/org/jetbrains/kotlin/caches/resolve/JsAnalyzerFacade.kt +++ b/idea/ide-common/src/org/jetbrains/kotlin/caches/resolve/JsAnalyzerFacade.kt @@ -40,47 +40,47 @@ import org.jetbrains.kotlin.utils.KotlinJavascriptMetadataUtils object JsAnalyzerFacade : AnalyzerFacade() { override fun createResolverForModule( - moduleInfo: M, - moduleDescriptor: ModuleDescriptorImpl, - moduleContext: ModuleContext, - moduleContent: ModuleContent, - platformParameters: PlatformAnalysisParameters, - targetEnvironment: TargetEnvironment, - resolverForProject: ResolverForProject, - languageSettingsProvider: LanguageSettingsProvider, - packagePartProvider: PackagePartProvider + moduleInfo: M, + moduleDescriptor: ModuleDescriptorImpl, + moduleContext: ModuleContext, + moduleContent: ModuleContent, + platformParameters: PlatformAnalysisParameters, + targetEnvironment: TargetEnvironment, + resolverForProject: ResolverForProject, + languageSettingsProvider: LanguageSettingsProvider, + packagePartProvider: PackagePartProvider ): ResolverForModule { val (syntheticFiles, moduleContentScope) = moduleContent val project = moduleContext.project val declarationProviderFactory = DeclarationProviderFactoryService.createDeclarationProviderFactory( - project, - moduleContext.storageManager, - syntheticFiles, - if (moduleInfo.isLibrary) GlobalSearchScope.EMPTY_SCOPE else moduleContentScope, - moduleInfo + project, + moduleContext.storageManager, + syntheticFiles, + if (moduleInfo.isLibrary) GlobalSearchScope.EMPTY_SCOPE else moduleContentScope, + moduleInfo ) val container = createContainerForLazyResolve( - moduleContext, - declarationProviderFactory, - BindingTraceContext(), - JsPlatform, - TargetPlatformVersion.NoVersion, - targetEnvironment, - languageSettingsProvider.getLanguageVersionSettings(moduleInfo, project) + moduleContext, + declarationProviderFactory, + BindingTraceContext(), + JsPlatform, + TargetPlatformVersion.NoVersion, + targetEnvironment, + languageSettingsProvider.getLanguageVersionSettings(moduleInfo, project) ) var packageFragmentProvider = container.get().packageFragmentProvider if (moduleInfo is LibraryModuleInfo && moduleInfo.platform == JsPlatform) { val providers = moduleInfo.getLibraryRoots() - .flatMap { KotlinJavascriptMetadataUtils.loadMetadata(it) } - .filter { it.version.isCompatible() } - .mapNotNull { - KotlinJavascriptSerializationUtil.readModule( - it.body, moduleContext.storageManager, moduleDescriptor, container.get(), - LookupTracker.DO_NOTHING - ).data - } + .flatMap { KotlinJavascriptMetadataUtils.loadMetadata(it) } + .filter { it.version.isCompatible() } + .mapNotNull { + KotlinJavascriptSerializationUtil.readModule( + it.body, moduleContext.storageManager, moduleDescriptor, container.get(), + LookupTracker.DO_NOTHING + ).data + } if (providers.isNotEmpty()) { packageFragmentProvider = CompositePackageFragmentProvider(listOf(packageFragmentProvider) + providers)