[Platform API] Introduce fundamental abstraction of Platform

This is a large commit, which introduces general API for working with abstraction of Platform. - Add new abstraction to 'core' - SimplePlatform - which represents exactly one platform - Clients are strongly prohibited to create instances of SimplePlatform by hand, instead, corresponding *Platforms abstraction should be used (e.g. JvmPlatforms, JsPlatforms, KonanPlatforms) - Move TargetPlatform to 'core', it represents now a collection of SimplePlatforms - Clients are strongly encouraged to use TargetPlatform (not SimplePlatform) in API, to enforce checks for multiplatform - Provide a helper-extensions to work with TargetPlatform (in particular, for getting a specific component platform) - Remove MultiTargetPlatform in favour of TargetPlatform - Notably, this commit leaves another widely used duplicated abstraction, namely, IdePlatform. For the sake sanity, removal of IdePlatform is extracted in the separate commit.
2019-04-24 11:59:07 +03:00
parent 451d14e504
commit d5fbe59a3e
162 changed files with 832 additions and 711 deletions
@@ -39,6 +39,11 @@ import org.jetbrains.kotlin.load.java.lazy.SingleModuleClassResolver
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.name.SpecialNames
+import org.jetbrains.kotlin.platform.CommonPlatforms
+import org.jetbrains.kotlin.platform.isCommon
+import org.jetbrains.kotlin.platform.js.JsPlatforms
+import org.jetbrains.kotlin.platform.jvm.JvmPlatforms
+import org.jetbrains.kotlin.platform.konan.KonanPlatforms
 import org.jetbrains.kotlin.psi.KtFile
 import org.jetbrains.kotlin.resolve.*
 import org.jetbrains.kotlin.resolve.calls.model.MutableResolvedCall
@@ -166,13 +171,13 @@ abstract class AbstractDiagnosticsTest : BaseDiagnosticsTest() {
        val actualText = StringBuilder()
        for (testFile in files) {
            val module = testFile.module
-            val isCommonModule = modules[module]!!.getMultiTargetPlatform() == MultiTargetPlatform.Common
+            val isCommonModule = modules[module]!!.platform.isCommon()
            val implementingModules =
                if (!isCommonModule) emptyList()
                else modules.entries.filter { (testModule) -> module in testModule?.getDependencies().orEmpty() }
            val implementingModulesBindings = implementingModules.mapNotNull { (testModule, moduleDescriptor) ->
-                val platform = moduleDescriptor.getCapability(MultiTargetPlatform.CAPABILITY)
-                if (platform is MultiTargetPlatform.Specific) platform to moduleBindings[testModule]!!
+                val platform = moduleDescriptor.platform
+                if (platform != null && !platform.isCommon()) platform to moduleBindings[testModule]!!
                else null
            }
            val moduleDescriptor = modules[module]!!
@@ -356,12 +361,11 @@ abstract class AbstractDiagnosticsTest : BaseDiagnosticsTest() {

        val moduleDescriptor = moduleContext.module as ModuleDescriptorImpl

-        val platform = moduleDescriptor.getMultiTargetPlatform()
-        if (platform == MultiTargetPlatform.Common) {
+        val platform = moduleDescriptor.platform
+        if (platform.isCommon()) {
            return CommonResolverForModuleFactory.analyzeFiles(
                files, moduleDescriptor.name, true, languageVersionSettings,
                mapOf(
-                    MultiTargetPlatform.CAPABILITY to MultiTargetPlatform.Common,
                    MODULE_FILES to files
                )
            ) { _ ->
@@ -377,6 +381,7 @@ abstract class AbstractDiagnosticsTest : BaseDiagnosticsTest() {
        val moduleClassResolver = SingleModuleClassResolver()

        val container = createContainerForTopDownAnalyzerForJvm(
+            JvmPlatforms.jvmPlatformByTargetVersion(jvmTarget), // TODO(dsavvinov): do not pass JvmTarget around
            moduleContext,
            moduleTrace,
            FileBasedDeclarationProviderFactory(moduleContext.storageManager, files),
@@ -386,7 +391,6 @@ abstract class AbstractDiagnosticsTest : BaseDiagnosticsTest() {
            environment.createPackagePartProvider(moduleContentScope),
            moduleClassResolver,
            CompilerEnvironment,
-            jvmTarget,
            languageVersionSettings
        )

@@ -417,7 +421,7 @@ abstract class AbstractDiagnosticsTest : BaseDiagnosticsTest() {
        // E.g. "<!JVM:ACTUAL_WITHOUT_EXPECT!>...<!>
        val result = ArrayList<KtFile>(0)
        for (dependency in dependencies) {
-            if (dependency.getCapability(MultiTargetPlatform.CAPABILITY) == MultiTargetPlatform.Common) {
+            if (dependency.platform.isCommon()) {
                val files = dependency.getCapability(MODULE_FILES)
                        ?: error("MODULE_FILES should have been set for the common module: $dependency")
                result.addAll(files)
@@ -585,10 +589,16 @@ abstract class AbstractDiagnosticsTest : BaseDiagnosticsTest() {
        emptyList()

    protected open fun createModule(moduleName: String, storageManager: StorageManager): ModuleDescriptorImpl {
-        val nameSuffix = moduleName.substringAfterLast("-", "")
+        val nameSuffix = moduleName.substringAfterLast("-", "").toUpperCase()
        val platform =
-            if (nameSuffix.isEmpty()) null
-            else if (nameSuffix == "common") MultiTargetPlatform.Common else MultiTargetPlatform.Specific(nameSuffix.toUpperCase())
+            when {
+                nameSuffix.isEmpty() -> null // TODO(dsavvinov): this leads to 'null'-platform in ModuleDescriptor
+                nameSuffix == "COMMON" -> CommonPlatforms.defaultCommonPlatform
+                nameSuffix == "JVM" -> JvmPlatforms.defaultJvmPlatform // TODO(dsavvinov): determine JvmTarget precisely
+                nameSuffix == "JS" -> JsPlatforms.defaultJsPlatform
+                nameSuffix == "NATIVE" -> KonanPlatforms.defaultKonanPlatform
+                else -> throw IllegalStateException("Can't determine platform by name $nameSuffix")
+            }
        val builtIns = JvmBuiltIns(storageManager, JvmBuiltIns.Kind.FROM_CLASS_LOADER)
        return ModuleDescriptorImpl(Name.special("<$moduleName>"), storageManager, builtIns, platform)
    }
@@ -45,7 +45,7 @@ import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.psi.KtDeclaration
 import org.jetbrains.kotlin.psi.KtFile
 import org.jetbrains.kotlin.resolve.BindingContext
-import org.jetbrains.kotlin.resolve.MultiTargetPlatform
+import org.jetbrains.kotlin.platform.TargetPlatform
 import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowValueFactoryImpl
 import org.jetbrains.kotlin.test.KotlinTestUtils
 import org.jetbrains.kotlin.utils.addIfNotNull
@@ -223,7 +223,7 @@ abstract class BaseDiagnosticsTest : KotlinMultiFileTestWithJava<TestModule, Tes

        fun getActualText(
            bindingContext: BindingContext,
-            implementingModulesBindings: List<Pair<MultiTargetPlatform, BindingContext>>,
+            implementingModulesBindings: List<Pair<TargetPlatform, BindingContext>>,
            actualText: StringBuilder,
            skipJvmSignatureDiagnostics: Boolean,
            languageVersionSettings: LanguageVersionSettings,
@@ -7,15 +7,15 @@ package org.jetbrains.kotlin.fir

 import org.jetbrains.kotlin.analyzer.ModuleInfo
 import org.jetbrains.kotlin.name.Name
+import org.jetbrains.kotlin.platform.jvm.JvmPlatforms
 import org.jetbrains.kotlin.resolve.PlatformDependentCompilerServices
-import org.jetbrains.kotlin.resolve.TargetPlatform
-import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform
+import org.jetbrains.kotlin.platform.TargetPlatform
 import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatformCompilerServices

 class FirTestModuleInfo(
    override val name: Name = Name.identifier("TestModule"),
    val dependencies: MutableList<ModuleInfo> = mutableListOf(),
-    override val platform: TargetPlatform = JvmPlatform,
+    override val platform: TargetPlatform = JvmPlatforms.defaultJvmPlatform,
    override val compilerServices: PlatformDependentCompilerServices = JvmPlatformCompilerServices
 ) : ModuleInfo {
    override fun dependencies(): List<ModuleInfo> = dependencies
@@ -22,17 +22,17 @@ import org.jetbrains.kotlin.analyzer.LanguageSettingsProvider
 import org.jetbrains.kotlin.analyzer.ModuleContent
 import org.jetbrains.kotlin.analyzer.ModuleInfo
 import org.jetbrains.kotlin.analyzer.ResolverForProjectImpl
-import org.jetbrains.kotlin.analyzer.common.CommonPlatform
-import org.jetbrains.kotlin.analyzer.common.CommonPlatformCompilerServices
 import org.jetbrains.kotlin.container.get
 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.PlatformDependentCompilerServices
-import org.jetbrains.kotlin.resolve.TargetPlatform
+import org.jetbrains.kotlin.platform.TargetPlatform
+import org.jetbrains.kotlin.platform.jvm.JvmPlatforms
 import org.jetbrains.kotlin.resolve.jvm.JvmResolverForModuleFactory
 import org.jetbrains.kotlin.resolve.jvm.JvmPlatformParameters
+import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatformCompilerServices

 fun createResolveSessionForFiles(
        project: Project,
@@ -67,8 +67,8 @@ private class TestModule(val dependsOnBuiltIns: Boolean) : ModuleInfo {
                ModuleInfo.DependencyOnBuiltIns.NONE

    override val platform: TargetPlatform
-        get() = CommonPlatform
+        get() = JvmPlatforms.defaultJvmPlatform

    override val compilerServices: PlatformDependentCompilerServices?
-        get() = CommonPlatformCompilerServices
+        get() = JvmPlatformCompilerServices
 }
@@ -28,10 +28,10 @@ import org.jetbrains.kotlin.descriptors.*;
 import org.jetbrains.kotlin.descriptors.impl.SubpackagesScope;
 import org.jetbrains.kotlin.jvm.compiler.ExpectedLoadErrorsUtil;
 import org.jetbrains.kotlin.name.FqName;
+import org.jetbrains.kotlin.platform.TargetPlatformKt;
 import org.jetbrains.kotlin.renderer.*;
 import org.jetbrains.kotlin.resolve.DescriptorUtils;
 import org.jetbrains.kotlin.resolve.MemberComparator;
-import org.jetbrains.kotlin.resolve.MultiTargetPlatform;
 import org.jetbrains.kotlin.resolve.scopes.ChainedMemberScope;
 import org.jetbrains.kotlin.resolve.scopes.MemberScope;
 import org.jetbrains.kotlin.test.KotlinTestUtils;
@@ -243,7 +243,7 @@ public class RecursiveDescriptorComparator {

        // 'expected' declarations do not belong to the platform-specific module, even though they participate in the analysis
        if (descriptor instanceof MemberDescriptor && ((MemberDescriptor) descriptor).isExpect() &&
-            module.getCapability(MultiTargetPlatform.CAPABILITY) != MultiTargetPlatform.Common.INSTANCE) return false;
+            !TargetPlatformKt.isCommon(module.getPlatform())) return false;

        return module.equals(DescriptorUtils.getContainingModule(descriptor));
    }
@@ -17,7 +17,6 @@
 package org.jetbrains.kotlin.tests.di

 import com.intellij.openapi.project.Project
-import org.jetbrains.kotlin.config.JvmTarget
 import org.jetbrains.kotlin.config.LanguageVersionSettingsImpl
 import org.jetbrains.kotlin.container.StorageComponentContainer
 import org.jetbrains.kotlin.container.getValue
@@ -26,9 +25,9 @@ import org.jetbrains.kotlin.container.useInstance
 import org.jetbrains.kotlin.context.ModuleContext
 import org.jetbrains.kotlin.descriptors.ModuleDescriptor
 import org.jetbrains.kotlin.frontend.di.configureModule
+import org.jetbrains.kotlin.platform.jvm.JvmPlatforms
 import org.jetbrains.kotlin.resolve.*
 import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowValueFactory
-import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform
 import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatformCompilerServices
 import org.jetbrains.kotlin.types.SubstitutingScopeProviderImpl
 import org.jetbrains.kotlin.types.expressions.ExpressionTypingServices
@@ -36,7 +35,8 @@ import org.jetbrains.kotlin.types.expressions.FakeCallResolver

 fun createContainerForTests(project: Project, module: ModuleDescriptor): ContainerForTests {
    return ContainerForTests(createContainer("Tests", JvmPlatformCompilerServices) {
-        configureModule(ModuleContext(module, project), JvmPlatform, JvmTarget.DEFAULT, JvmPlatformCompilerServices)
+        configureModule(ModuleContext(module, project),
+                        JvmPlatforms.defaultJvmPlatform, JvmPlatformCompilerServices)
        useInstance(LanguageVersionSettingsImpl.DEFAULT)
        useImpl<SubstitutingScopeProviderImpl>()
        useImpl<AnnotationResolverImpl>()