Rename *AnalyzerFacade to *ResolverForModuleFactory to prevent confusion with other similar names

2019-03-29 17:13:04 +03:00
parent 082c337faa
commit 520e871280
16 changed files with 29 additions and 30 deletions
@@ -16,7 +16,7 @@

 package org.jetbrains.kotlin.cli.metadata

-import org.jetbrains.kotlin.analyzer.common.CommonAnalyzerFacade
+import org.jetbrains.kotlin.analyzer.common.CommonResolverForModuleFactory
 import org.jetbrains.kotlin.cli.common.CLIConfigurationKeys
 import org.jetbrains.kotlin.cli.common.messages.AnalyzerWithCompilerReport
 import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity
@@ -68,7 +68,7 @@ open class MetadataSerializer(

        val analyzer = AnalyzerWithCompilerReport(messageCollector, configuration.languageVersionSettings)
        analyzer.analyzeAndReport(files) {
-            CommonAnalyzerFacade.analyzeFiles(files, moduleName, dependOnOldBuiltIns, configuration.languageVersionSettings) { content ->
+            CommonResolverForModuleFactory.analyzeFiles(files, moduleName, dependOnOldBuiltIns, configuration.languageVersionSettings) { content ->
                environment.createPackagePartProvider(content.moduleContentScope)
            }
        }
@@ -44,7 +44,7 @@ class JvmPlatformParameters(
 ) : PlatformAnalysisParameters


-object JvmAnalyzerFacade : ResolverForModuleFactory() {
+object JvmResolverForModuleFactory : ResolverForModuleFactory() {
    override fun <M : ModuleInfo> createResolverForModule(
        moduleDescriptor: ModuleDescriptorImpl,
        moduleContext: ModuleContext,
@@ -55,7 +55,7 @@ class CommonAnalysisParameters(
 * A facade that is used to analyze common (platform-independent) modules in multi-platform projects.
 * See [CommonPlatform]
 */
-object CommonAnalyzerFacade : ResolverForModuleFactory() {
+object CommonResolverForModuleFactory : ResolverForModuleFactory() {
    private class SourceModuleInfo(
        override val name: Name,
        override val capabilities: Map<ModuleDescriptor.Capability<*>, Any?>,
@@ -99,7 +99,7 @@ object CommonAnalyzerFacade : ResolverForModuleFactory() {
                    project: Project
                ) = TargetPlatformVersion.NoVersion
            },
-            resolverForModuleFactoryByPlatform = { CommonAnalyzerFacade },
+            resolverForModuleFactoryByPlatform = { CommonResolverForModuleFactory },
            platformParameters = { _ -> CommonAnalysisParameters(metadataPartProviderFactory) }
        )

@@ -12,7 +12,7 @@ import com.intellij.psi.search.GlobalSearchScope
 import junit.framework.TestCase
 import org.jetbrains.kotlin.TestsCompilerError
 import org.jetbrains.kotlin.analyzer.AnalysisResult
-import org.jetbrains.kotlin.analyzer.common.CommonAnalyzerFacade
+import org.jetbrains.kotlin.analyzer.common.CommonResolverForModuleFactory
 import org.jetbrains.kotlin.builtins.jvm.JvmBuiltIns
 import org.jetbrains.kotlin.cli.jvm.compiler.NoScopeRecordCliBindingTrace
 import org.jetbrains.kotlin.cli.jvm.compiler.TopDownAnalyzerFacadeForJVM
@@ -358,7 +358,7 @@ abstract class AbstractDiagnosticsTest : BaseDiagnosticsTest() {

        val platform = moduleDescriptor.getMultiTargetPlatform()
        if (platform == MultiTargetPlatform.Common) {
-            return CommonAnalyzerFacade.analyzeFiles(
+            return CommonResolverForModuleFactory.analyzeFiles(
                files, moduleDescriptor.name, true, languageVersionSettings,
                mapOf(
                    MultiTargetPlatform.CAPABILITY to MultiTargetPlatform.Common,
@@ -27,7 +27,7 @@ import org.jetbrains.kotlin.context.ProjectContext
 import org.jetbrains.kotlin.load.kotlin.PackagePartProvider
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.psi.KtFile
-import org.jetbrains.kotlin.resolve.jvm.JvmAnalyzerFacade
+import org.jetbrains.kotlin.resolve.jvm.JvmResolverForModuleFactory
 import org.jetbrains.kotlin.resolve.jvm.JvmPlatformParameters

 fun createResolveSessionForFiles(
@@ -42,7 +42,7 @@ fun createResolveSessionForFiles(
        projectContext, listOf(testModule),
        { ModuleContent(it, syntheticFiles, GlobalSearchScope.allScope(project)) },
        moduleLanguageSettingsProvider = LanguageSettingsProvider.Default,
-        resolverForModuleFactoryByPlatform = { JvmAnalyzerFacade },
+        resolverForModuleFactoryByPlatform = { JvmResolverForModuleFactory },
        platformParameters = { _ ->
            JvmPlatformParameters(
                packagePartProviderFactory = { PackagePartProvider.Empty },
@@ -37,7 +37,7 @@ import org.jetbrains.kotlin.psi.KtFile
 import org.jetbrains.kotlin.resolve.constants.EnumValue
 import org.jetbrains.kotlin.resolve.descriptorUtil.annotationClass
 import org.jetbrains.kotlin.resolve.descriptorUtil.module
-import org.jetbrains.kotlin.resolve.jvm.JvmAnalyzerFacade
+import org.jetbrains.kotlin.resolve.jvm.JvmResolverForModuleFactory
 import org.jetbrains.kotlin.resolve.jvm.JvmPlatformParameters
 import org.jetbrains.kotlin.test.ConfigurationKind
 import org.jetbrains.kotlin.test.KotlinTestUtils
@@ -69,7 +69,7 @@ class MultiModuleJavaAnalysisCustomTest : KtUsefulTestCase() {
            projectContext, modules,
            modulesContent = { module -> ModuleContent(module, module.kotlinFiles, module.javaFilesScope) },
            moduleLanguageSettingsProvider = LanguageSettingsProvider.Default,
-            resolverForModuleFactoryByPlatform = { JvmAnalyzerFacade },
+            resolverForModuleFactoryByPlatform = { JvmResolverForModuleFactory },
            platformParameters = { _ ->
                JvmPlatformParameters(
                    packagePartProviderFactory = { PackagePartProvider.Empty },
@@ -8,7 +8,7 @@ package org.jetbrains.kotlin.caches.resolve
 import com.intellij.openapi.roots.libraries.PersistentLibraryKind
 import com.intellij.openapi.vfs.VirtualFile
 import org.jetbrains.kotlin.analyzer.ResolverForModuleFactory
-import org.jetbrains.kotlin.analyzer.common.CommonAnalyzerFacade
+import org.jetbrains.kotlin.analyzer.common.CommonResolverForModuleFactory
 import org.jetbrains.kotlin.builtins.DefaultBuiltIns
 import org.jetbrains.kotlin.builtins.KotlinBuiltIns
 import org.jetbrains.kotlin.context.ProjectContext
@@ -28,7 +28,7 @@ class CommonPlatformKindResolution : IdePlatformKindResolution {
    override val kind get() = CommonIdePlatformKind

    override val resolverForModuleFactory: ResolverForModuleFactory
-        get() = CommonAnalyzerFacade
+        get() = CommonResolverForModuleFactory

    override fun createBuiltIns(settings: PlatformAnalysisSettings, projectContext: ProjectContext): KotlinBuiltIns {
        return DefaultBuiltIns.Instance
@@ -12,7 +12,7 @@ import org.jetbrains.kotlin.builtins.KotlinBuiltIns
 import org.jetbrains.kotlin.context.ProjectContext
 import org.jetbrains.kotlin.idea.caches.resolve.PlatformAnalysisSettings
 import org.jetbrains.kotlin.idea.framework.JSLibraryKind
-import org.jetbrains.kotlin.js.resolve.JsAnalyzerFacade
+import org.jetbrains.kotlin.js.resolve.JsResolverForModuleFactory
 import org.jetbrains.kotlin.js.resolve.JsPlatform
 import org.jetbrains.kotlin.platform.impl.JsIdePlatformKind

@@ -27,7 +27,7 @@ class JsPlatformKindResolution : IdePlatformKindResolution {
    override val kind get() = JsIdePlatformKind

    override val resolverForModuleFactory: ResolverForModuleFactory
-        get() = JsAnalyzerFacade
+        get() = JsResolverForModuleFactory

    override fun createBuiltIns(settings: PlatformAnalysisSettings, projectContext: ProjectContext): KotlinBuiltIns {
        return JsPlatform.builtIns
@@ -14,7 +14,7 @@ import org.jetbrains.kotlin.builtins.jvm.JvmBuiltIns
 import org.jetbrains.kotlin.context.ProjectContext
 import org.jetbrains.kotlin.idea.caches.resolve.PlatformAnalysisSettings
 import org.jetbrains.kotlin.platform.impl.JvmIdePlatformKind
-import org.jetbrains.kotlin.resolve.jvm.JvmAnalyzerFacade
+import org.jetbrains.kotlin.resolve.jvm.JvmResolverForModuleFactory

 class JvmPlatformKindResolution : IdePlatformKindResolution {
    override fun isLibraryFileForPlatform(virtualFile: VirtualFile): Boolean {
@@ -27,7 +27,7 @@ class JvmPlatformKindResolution : IdePlatformKindResolution {
    override val kind get() = JvmIdePlatformKind

    override val resolverForModuleFactory: ResolverForModuleFactory
-        get() = JvmAnalyzerFacade
+        get() = JvmResolverForModuleFactory

    override fun createBuiltIns(settings: PlatformAnalysisSettings, projectContext: ProjectContext): KotlinBuiltIns =
        if (settings.sdk != null)
@@ -8,7 +8,7 @@ package org.jetbrains.kotlin.idea.core.platform.impl
 import com.intellij.icons.AllIcons
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.roots.libraries.Library
-import org.jetbrains.kotlin.analyzer.common.CommonAnalyzerFacade
+import org.jetbrains.kotlin.analyzer.common.CommonResolverForModuleFactory
 import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments
 import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
 import org.jetbrains.kotlin.gradle.KotlinPlatform
@@ -33,7 +33,7 @@ object CommonIdePlatformKindTooling : IdePlatformKindTooling() {

    override fun compilerArgumentsForProject(project: Project): CommonCompilerArguments? = null

-    override val resolverForModuleFactory = CommonAnalyzerFacade
+    override val resolverForModuleFactory = CommonResolverForModuleFactory

    override val mavenLibraryIds = listOf(MAVEN_COMMON_STDLIB_ID)
    override val gradlePluginId = "kotlin-platform-common"
@@ -24,7 +24,7 @@ import org.jetbrains.kotlin.idea.js.KotlinJSRunConfigurationDataProvider
 import org.jetbrains.kotlin.idea.platform.IdePlatformKindTooling
 import org.jetbrains.kotlin.idea.run.multiplatform.KotlinMultiplatformRunLocationsProvider
 import org.jetbrains.kotlin.idea.util.string.joinWithEscape
-import org.jetbrains.kotlin.js.resolve.JsAnalyzerFacade
+import org.jetbrains.kotlin.js.resolve.JsResolverForModuleFactory
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.platform.impl.JsIdePlatformKind
 import org.jetbrains.kotlin.psi.KtClassOrObject
@@ -49,7 +49,7 @@ class JsIdePlatformKindTooling : IdePlatformKindTooling() {

    override fun compilerArgumentsForProject(project: Project) = Kotlin2JsCompilerArgumentsHolder.getInstance(project).settings

-    override val resolverForModuleFactory = JsAnalyzerFacade
+    override val resolverForModuleFactory = JsResolverForModuleFactory

    override val mavenLibraryIds = listOf(PathUtil.JS_LIB_NAME, MAVEN_OLD_JS_STDLIB_ID)
    override val gradlePluginId = "kotlin-platform-js"
@@ -24,7 +24,7 @@ import org.jetbrains.kotlin.psi.KtClassOrObject
 import org.jetbrains.kotlin.psi.KtFunction
 import org.jetbrains.kotlin.psi.KtNamedDeclaration
 import org.jetbrains.kotlin.psi.KtNamedFunction
-import org.jetbrains.kotlin.resolve.jvm.JvmAnalyzerFacade
+import org.jetbrains.kotlin.resolve.jvm.JvmResolverForModuleFactory
 import org.jetbrains.kotlin.utils.PathUtil
 import javax.swing.Icon

@@ -33,7 +33,7 @@ class JvmIdePlatformKindTooling : IdePlatformKindTooling() {

    override fun compilerArgumentsForProject(project: Project) = Kotlin2JvmCompilerArgumentsHolder.getInstance(project).settings

-    override val resolverForModuleFactory = JvmAnalyzerFacade
+    override val resolverForModuleFactory = JvmResolverForModuleFactory

    override val mavenLibraryIds = listOf(
        PathUtil.KOTLIN_JAVA_STDLIB_NAME,
@@ -10,11 +10,10 @@ import com.intellij.openapi.roots.libraries.DummyLibraryProperties
 import com.intellij.openapi.roots.libraries.Library
 import com.intellij.openapi.roots.libraries.PersistentLibraryKind
 import com.intellij.openapi.roots.ui.configuration.libraries.CustomLibraryDescription
-import org.jetbrains.kotlin.ide.konan.analyzer.NativeAnalyzerFacade
+import org.jetbrains.kotlin.ide.konan.analyzer.NativeResolverForModuleFactory
 import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments
 import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
 import org.jetbrains.kotlin.gradle.KotlinPlatform
-import org.jetbrains.kotlin.idea.framework.CustomLibraryDescriptorWithDeferredConfig
 import org.jetbrains.kotlin.idea.framework.KotlinLibraryKind
 import org.jetbrains.kotlin.idea.platform.IdePlatformKindTooling
 import org.jetbrains.kotlin.platform.impl.NativeIdePlatformKind
@@ -29,7 +28,7 @@ class NativeIdePlatformKindTooling : IdePlatformKindTooling() {

    override fun compilerArgumentsForProject(project: Project): CommonCompilerArguments? = null

-    override val resolverForModuleFactory get() = NativeAnalyzerFacade
+    override val resolverForModuleFactory get() = NativeResolverForModuleFactory

    override val mavenLibraryIds: List<String> get() = emptyList()
    override val gradlePluginId: String get() = ""
@@ -20,7 +20,7 @@ import org.jetbrains.kotlin.context.ProjectContext
 import org.jetbrains.kotlin.descriptors.ModuleDescriptor
 import org.jetbrains.kotlin.descriptors.impl.CompositePackageFragmentProvider
 import org.jetbrains.kotlin.descriptors.konan.DeserializedKonanModuleOrigin
-import org.jetbrains.kotlin.ide.konan.analyzer.NativeAnalyzerFacade
+import org.jetbrains.kotlin.ide.konan.analyzer.NativeResolverForModuleFactory
 import org.jetbrains.kotlin.idea.caches.project.IdeaModuleInfo
 import org.jetbrains.kotlin.idea.caches.project.LibraryInfo
 import org.jetbrains.kotlin.idea.caches.project.getModuleInfosFromIdeaModel
@@ -69,7 +69,7 @@ class NativePlatformKindResolution : IdePlatformKindResolution {

    override val kind get() = NativeIdePlatformKind

-    override val resolverForModuleFactory get() = NativeAnalyzerFacade
+    override val resolverForModuleFactory get() = NativeResolverForModuleFactory

    override fun createBuiltIns(settings: PlatformAnalysisSettings, projectContext: ProjectContext) =
        createKotlinNativeBuiltIns(settings, projectContext)
@@ -22,7 +22,7 @@ import org.jetbrains.kotlin.resolve.konan.platform.KonanPlatform
 import org.jetbrains.kotlin.resolve.lazy.ResolveSession
 import org.jetbrains.kotlin.resolve.lazy.declarations.DeclarationProviderFactoryService.Companion.createDeclarationProviderFactory

-object NativeAnalyzerFacade : ResolverForModuleFactory() {
+object NativeResolverForModuleFactory : ResolverForModuleFactory() {
    override val targetPlatform: TargetPlatform
        get() = KonanPlatform

@@ -34,7 +34,7 @@ import org.jetbrains.kotlin.serialization.js.KotlinJavascriptSerializationUtil
 import org.jetbrains.kotlin.serialization.js.createKotlinJavascriptPackageFragmentProvider
 import org.jetbrains.kotlin.utils.KotlinJavascriptMetadataUtils

-object JsAnalyzerFacade : ResolverForModuleFactory() {
+object JsResolverForModuleFactory : ResolverForModuleFactory() {
    override fun <M : ModuleInfo> createResolverForModule(
        moduleDescriptor: ModuleDescriptorImpl,
        moduleContext: ModuleContext,