From 520e8712801e544f936f68bd8a29814ced95a4d6 Mon Sep 17 00:00:00 2001 From: Dmitry Savvinov Date: Fri, 29 Mar 2019 17:13:04 +0300 Subject: [PATCH] Rename *AnalyzerFacade to *ResolverForModuleFactory to prevent confusion with other similar names --- .../org/jetbrains/kotlin/cli/metadata/MetadataSerializer.kt | 4 ++-- .../{JvmAnalyzerFacade.kt => JvmResolverForModuleFactory.kt} | 2 +- ...onAnalyzerFacade.kt => CommonResolverForModuleFactory.kt} | 4 ++-- .../org/jetbrains/kotlin/checkers/AbstractDiagnosticsTest.kt | 4 ++-- .../jetbrains/kotlin/resolve/lazy/lazyResolveTestUtils.kt | 4 ++-- .../kotlin/jvm/compiler/MultiModuleJavaAnalysisCustomTest.kt | 4 ++-- .../kotlin/caches/resolve/CommonPlatformKindResolution.kt | 4 ++-- .../kotlin/caches/resolve/JsPlatformKindResolution.kt | 4 ++-- .../kotlin/caches/resolve/JvmPlatformKindResolution.kt | 4 ++-- .../kotlin/idea/platform/CommonIdePlatformKindTooling.kt | 4 ++-- .../kotlin/idea/platform/JsIdePlatformKindTooling.kt | 4 ++-- .../kotlin/idea/platform/JvmIdePlatformKindTooling.kt | 4 ++-- .../kotlin/ide/konan/NativeIdePlatformKindTooling.kt | 5 ++--- .../kotlin/ide/konan/NativePlatformKindResolution.kt | 4 ++-- ...veAnalyzerFacade.kt => NativeResolverForModuleFactory.kt} | 2 +- .../{JsAnalyzerFacade.kt => JsResolverForModuleFactory.kt} | 2 +- 16 files changed, 29 insertions(+), 30 deletions(-) rename compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/{JvmAnalyzerFacade.kt => JvmResolverForModuleFactory.kt} (98%) rename compiler/frontend/src/org/jetbrains/kotlin/analyzer/common/{CommonAnalyzerFacade.kt => CommonResolverForModuleFactory.kt} (98%) rename idea/idea-native/src/org/jetbrains/kotlin/ide/konan/analyzer/{NativeAnalyzerFacade.kt => NativeResolverForModuleFactory.kt} (97%) rename js/js.frontend/src/org/jetbrains/kotlin/js/resolve/{JsAnalyzerFacade.kt => JsResolverForModuleFactory.kt} (98%) diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/metadata/MetadataSerializer.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/metadata/MetadataSerializer.kt index 0d3eb1dbe3a..81eec77264b 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/metadata/MetadataSerializer.kt +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/metadata/MetadataSerializer.kt @@ -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) } } diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/JvmAnalyzerFacade.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/JvmResolverForModuleFactory.kt similarity index 98% rename from compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/JvmAnalyzerFacade.kt rename to compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/JvmResolverForModuleFactory.kt index 5d08aed6243..7c26f955ea3 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/JvmAnalyzerFacade.kt +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/JvmResolverForModuleFactory.kt @@ -44,7 +44,7 @@ class JvmPlatformParameters( ) : PlatformAnalysisParameters -object JvmAnalyzerFacade : ResolverForModuleFactory() { +object JvmResolverForModuleFactory : ResolverForModuleFactory() { override fun createResolverForModule( moduleDescriptor: ModuleDescriptorImpl, moduleContext: ModuleContext, diff --git a/compiler/frontend/src/org/jetbrains/kotlin/analyzer/common/CommonAnalyzerFacade.kt b/compiler/frontend/src/org/jetbrains/kotlin/analyzer/common/CommonResolverForModuleFactory.kt similarity index 98% rename from compiler/frontend/src/org/jetbrains/kotlin/analyzer/common/CommonAnalyzerFacade.kt rename to compiler/frontend/src/org/jetbrains/kotlin/analyzer/common/CommonResolverForModuleFactory.kt index 652c50c77f2..47c5d9d62be 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/analyzer/common/CommonAnalyzerFacade.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/analyzer/common/CommonResolverForModuleFactory.kt @@ -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, Any?>, @@ -99,7 +99,7 @@ object CommonAnalyzerFacade : ResolverForModuleFactory() { project: Project ) = TargetPlatformVersion.NoVersion }, - resolverForModuleFactoryByPlatform = { CommonAnalyzerFacade }, + resolverForModuleFactoryByPlatform = { CommonResolverForModuleFactory }, platformParameters = { _ -> CommonAnalysisParameters(metadataPartProviderFactory) } ) diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/AbstractDiagnosticsTest.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/AbstractDiagnosticsTest.kt index 9e186b51e07..fddddb7c790 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/AbstractDiagnosticsTest.kt +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/AbstractDiagnosticsTest.kt @@ -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, diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/resolve/lazy/lazyResolveTestUtils.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/resolve/lazy/lazyResolveTestUtils.kt index 1c9dc082eb5..61bcb4f4d5c 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/resolve/lazy/lazyResolveTestUtils.kt +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/resolve/lazy/lazyResolveTestUtils.kt @@ -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 }, diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/MultiModuleJavaAnalysisCustomTest.kt b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/MultiModuleJavaAnalysisCustomTest.kt index ed47e2668db..f2e4d4014d7 100644 --- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/MultiModuleJavaAnalysisCustomTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/MultiModuleJavaAnalysisCustomTest.kt @@ -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 }, diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/caches/resolve/CommonPlatformKindResolution.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/caches/resolve/CommonPlatformKindResolution.kt index 96fc124ee4a..661ecb25f8f 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/caches/resolve/CommonPlatformKindResolution.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/caches/resolve/CommonPlatformKindResolution.kt @@ -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 diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/caches/resolve/JsPlatformKindResolution.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/caches/resolve/JsPlatformKindResolution.kt index 235cc295b8d..6ea25d7601c 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/caches/resolve/JsPlatformKindResolution.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/caches/resolve/JsPlatformKindResolution.kt @@ -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 diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/caches/resolve/JvmPlatformKindResolution.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/caches/resolve/JvmPlatformKindResolution.kt index 17c2c34d7cc..4dfd83cf775 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/caches/resolve/JvmPlatformKindResolution.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/caches/resolve/JvmPlatformKindResolution.kt @@ -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) diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/platform/CommonIdePlatformKindTooling.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/platform/CommonIdePlatformKindTooling.kt index 73afde53ef9..99afed64ee4 100644 --- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/platform/CommonIdePlatformKindTooling.kt +++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/platform/CommonIdePlatformKindTooling.kt @@ -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" diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/platform/JsIdePlatformKindTooling.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/platform/JsIdePlatformKindTooling.kt index 917f3cf10ae..0b94284756e 100644 --- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/platform/JsIdePlatformKindTooling.kt +++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/platform/JsIdePlatformKindTooling.kt @@ -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" diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/platform/JvmIdePlatformKindTooling.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/platform/JvmIdePlatformKindTooling.kt index 4bfd70fa8c3..1acf1ca5a39 100644 --- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/platform/JvmIdePlatformKindTooling.kt +++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/platform/JvmIdePlatformKindTooling.kt @@ -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, diff --git a/idea/idea-native/src/org/jetbrains/kotlin/ide/konan/NativeIdePlatformKindTooling.kt b/idea/idea-native/src/org/jetbrains/kotlin/ide/konan/NativeIdePlatformKindTooling.kt index 1ccfff3dfe0..3253948487e 100644 --- a/idea/idea-native/src/org/jetbrains/kotlin/ide/konan/NativeIdePlatformKindTooling.kt +++ b/idea/idea-native/src/org/jetbrains/kotlin/ide/konan/NativeIdePlatformKindTooling.kt @@ -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 get() = emptyList() override val gradlePluginId: String get() = "" diff --git a/idea/idea-native/src/org/jetbrains/kotlin/ide/konan/NativePlatformKindResolution.kt b/idea/idea-native/src/org/jetbrains/kotlin/ide/konan/NativePlatformKindResolution.kt index d74ef05df8d..8cca62e0a09 100644 --- a/idea/idea-native/src/org/jetbrains/kotlin/ide/konan/NativePlatformKindResolution.kt +++ b/idea/idea-native/src/org/jetbrains/kotlin/ide/konan/NativePlatformKindResolution.kt @@ -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) diff --git a/idea/idea-native/src/org/jetbrains/kotlin/ide/konan/analyzer/NativeAnalyzerFacade.kt b/idea/idea-native/src/org/jetbrains/kotlin/ide/konan/analyzer/NativeResolverForModuleFactory.kt similarity index 97% rename from idea/idea-native/src/org/jetbrains/kotlin/ide/konan/analyzer/NativeAnalyzerFacade.kt rename to idea/idea-native/src/org/jetbrains/kotlin/ide/konan/analyzer/NativeResolverForModuleFactory.kt index 3770d6e0840..c9d062202b3 100644 --- a/idea/idea-native/src/org/jetbrains/kotlin/ide/konan/analyzer/NativeAnalyzerFacade.kt +++ b/idea/idea-native/src/org/jetbrains/kotlin/ide/konan/analyzer/NativeResolverForModuleFactory.kt @@ -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 diff --git a/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/JsAnalyzerFacade.kt b/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/JsResolverForModuleFactory.kt similarity index 98% rename from js/js.frontend/src/org/jetbrains/kotlin/js/resolve/JsAnalyzerFacade.kt rename to js/js.frontend/src/org/jetbrains/kotlin/js/resolve/JsResolverForModuleFactory.kt index e972d570f31..a86a49e3919 100644 --- a/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/JsAnalyzerFacade.kt +++ b/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/JsResolverForModuleFactory.kt @@ -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 createResolverForModule( moduleDescriptor: ModuleDescriptorImpl, moduleContext: ModuleContext,