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 f1ea49c1e4f..6ae3d29723c 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 @@ -41,7 +41,7 @@ class JvmPlatformParameters( ) : PlatformAnalysisParameters -object JvmAnalyzerFacade : AnalyzerFacade() { +object JvmAnalyzerFacade : ResolverForModuleFactory() { override fun createResolverForModule( moduleInfo: M, moduleDescriptor: ModuleDescriptorImpl, diff --git a/compiler/frontend/src/org/jetbrains/kotlin/analyzer/AnalyzerFacade.kt b/compiler/frontend/src/org/jetbrains/kotlin/analyzer/AnalyzerFacade.kt index 42350171304..d343b0e566f 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/analyzer/AnalyzerFacade.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/analyzer/AnalyzerFacade.kt @@ -85,7 +85,7 @@ class ResolverForProjectImpl( private val debugName: String, private val projectContext: ProjectContext, modules: Collection, - private val analyzerFacade: (M) -> AnalyzerFacade, + private val resolverForModuleFactory: (M) -> ResolverForModuleFactory, private val modulesContent: (M) -> ModuleContent, private val platformParameters: PlatformAnalysisParameters, private val targetEnvironment: TargetEnvironment = CompilerEnvironment, @@ -170,7 +170,7 @@ class ResolverForProjectImpl( ResolverForModuleComputationTracker.getInstance(projectContext.project)?.onResolverComputed(module) - analyzerFacade(module).createResolverForModule( + resolverForModuleFactory(module).createResolverForModule( module, descriptor as ModuleDescriptorImpl, projectContext.withModule(descriptor), modulesContent(module), platformParameters, targetEnvironment, this@ResolverForProjectImpl, languageSettingsProvider, @@ -281,7 +281,7 @@ interface TrackableModuleInfo : ModuleInfo { fun createModificationTracker(): ModificationTracker } -abstract class AnalyzerFacade { +abstract class ResolverForModuleFactory { abstract fun createResolverForModule( moduleInfo: M, moduleDescriptor: ModuleDescriptorImpl, diff --git a/compiler/frontend/src/org/jetbrains/kotlin/analyzer/common/CommonAnalyzerFacade.kt b/compiler/frontend/src/org/jetbrains/kotlin/analyzer/common/CommonAnalyzerFacade.kt index 27f243fa041..55addb101e3 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/analyzer/common/CommonAnalyzerFacade.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/analyzer/common/CommonAnalyzerFacade.kt @@ -49,7 +49,7 @@ import org.jetbrains.kotlin.serialization.deserialization.MetadataPackageFragmen * A facade that is used to analyze common (platform-independent) modules in multi-platform projects. * See [TargetPlatform.Common] */ -object CommonAnalyzerFacade : AnalyzerFacade() { +object CommonAnalyzerFacade : ResolverForModuleFactory() { private class SourceModuleInfo( override val name: Name, override val capabilities: Map, Any?>, @@ -78,9 +78,11 @@ object CommonAnalyzerFacade : AnalyzerFacade() { @Suppress("NAME_SHADOWING") val resolver = ResolverForProjectImpl( "sources for metadata serializer", - ProjectContext(project), listOf(moduleInfo), { CommonAnalyzerFacade }, - { ModuleContent(files, GlobalSearchScope.allScope(project)) }, - object : PlatformAnalysisParameters {}, + ProjectContext(project), + listOf(moduleInfo), + resolverForModuleFactory = { CommonAnalyzerFacade }, + modulesContent = { ModuleContent(files, GlobalSearchScope.allScope(project)) }, + platformParameters = object : PlatformAnalysisParameters {}, languageSettingsProvider = object : LanguageSettingsProvider { override fun getLanguageVersionSettings(moduleInfo: ModuleInfo, project: Project) = multiplatformLanguageSettings override fun getTargetPlatform(moduleInfo: ModuleInfo) = TargetPlatformVersion.NoVersion diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/MultiModuleJavaAnalysisCustomTest.kt b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/MultiModuleJavaAnalysisCustomTest.kt index f2911552b98..e85d14d3941 100644 --- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/MultiModuleJavaAnalysisCustomTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/MultiModuleJavaAnalysisCustomTest.kt @@ -71,8 +71,8 @@ class MultiModuleJavaAnalysisCustomTest : KtUsefulTestCase() { val resolverForProject = ResolverForProjectImpl( "test", projectContext, modules, { JvmAnalyzerFacade }, - { module -> ModuleContent(module.kotlinFiles, module.javaFilesScope) }, - JvmPlatformParameters { + modulesContent = { module -> ModuleContent(module.kotlinFiles, module.javaFilesScope) }, + platformParameters = JvmPlatformParameters { javaClass -> val moduleName = javaClass.name.asString().toLowerCase().first().toString() modules.first { it._name == moduleName } 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 fcd7215b8e9..57dfa6dc33f 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 @@ -36,7 +36,7 @@ import org.jetbrains.kotlin.serialization.deserialization.DeserializationConfigu import org.jetbrains.kotlin.serialization.js.KotlinJavascriptSerializationUtil import org.jetbrains.kotlin.utils.KotlinJavascriptMetadataUtils -object JsAnalyzerFacade : AnalyzerFacade() { +object JsAnalyzerFacade : ResolverForModuleFactory() { override fun createResolverForModule( moduleInfo: M, diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/caches/resolve/IdePlatformSupport.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/caches/resolve/IdePlatformSupport.kt index 13d028bccc1..a28f51465af 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/caches/resolve/IdePlatformSupport.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/caches/resolve/IdePlatformSupport.kt @@ -20,7 +20,7 @@ import com.intellij.openapi.extensions.ExtensionPointName import com.intellij.openapi.extensions.Extensions import com.intellij.openapi.module.Module import com.intellij.openapi.roots.libraries.PersistentLibraryKind -import org.jetbrains.kotlin.analyzer.AnalyzerFacade +import org.jetbrains.kotlin.analyzer.ResolverForModuleFactory import org.jetbrains.kotlin.analyzer.common.CommonAnalyzerFacade import org.jetbrains.kotlin.builtins.DefaultBuiltIns import org.jetbrains.kotlin.builtins.KotlinBuiltIns @@ -39,7 +39,7 @@ import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform abstract class IdePlatformSupport { abstract val platform: TargetPlatform - abstract val analyzerFacade: AnalyzerFacade + abstract val resolverForModuleFactory: ResolverForModuleFactory abstract val libraryKind: PersistentLibraryKind<*>? abstract fun createBuiltIns(settings: PlatformAnalysisSettings, sdkContext: GlobalContextImpl): KotlinBuiltIns @@ -54,7 +54,7 @@ abstract class IdePlatformSupport { } val facades by lazy { - Extensions.getExtensions(EP_NAME).map { it.platform to it.analyzerFacade }.toMap() + Extensions.getExtensions(EP_NAME).map { it.platform to it.resolverForModuleFactory }.toMap() } @JvmStatic @@ -69,7 +69,7 @@ class JvmPlatformSupport : IdePlatformSupport() { override val platform: TargetPlatform get() = JvmPlatform - override val analyzerFacade: AnalyzerFacade + override val resolverForModuleFactory: ResolverForModuleFactory get() = JvmAnalyzerFacade override val libraryKind: PersistentLibraryKind<*>? @@ -89,7 +89,7 @@ class JsPlatformSupport : IdePlatformSupport() { override val platform: TargetPlatform get() = JsPlatform - override val analyzerFacade: AnalyzerFacade + override val resolverForModuleFactory: ResolverForModuleFactory get() = JsAnalyzerFacade override val libraryKind: PersistentLibraryKind<*>? @@ -109,7 +109,7 @@ class CommonPlatformSupport : IdePlatformSupport() { override val platform: TargetPlatform get() = TargetPlatform.Common - override val analyzerFacade: AnalyzerFacade + override val resolverForModuleFactory: ResolverForModuleFactory get() = CommonAnalyzerFacade override val libraryKind: PersistentLibraryKind<*>?