From c1eb93ba14f522f4e4ab7bb9edd43ec0ee364f32 Mon Sep 17 00:00:00 2001
From: Dmitry Savvinov <dmitry.savvinov@jetbrains.com>
Date: Tue, 28 May 2019 15:43:23 +0300
Subject: [PATCH] Rename platform to targetPlatform in KotlinFacetSettings to
 avoid ambiguity in Java

Original commit: aeb7f8400ae688b82f7b5774d54b1d0660ab5a14
---
 .../src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt  | 4 ++--
 .../src/org/jetbrains/kotlin/config/facetSerialization.kt   | 3 +--
 .../kotlin/jps/build/AbstractIncrementalJpsTest.kt          | 2 +-
 .../jetbrains/kotlin/jps/build/dependeciestxt/ModulesTxt.kt | 6 ++----
 .../src/org/jetbrains/kotlin/jps/model/ModuleSettings.kt    | 2 +-
 5 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt b/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt
index 6ca28bd8443..27306845427 100644
--- a/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt
+++ b/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt
@@ -189,7 +189,7 @@ class KotlinFacetSettings {
             compilerArguments!!.apiVersion = value?.versionString
         }
 
-    val platform: TargetPlatform?
+    val targetPlatform: TargetPlatform?
         get() {
             val compilerArguments = this.compilerArguments ?: return null
             return IdePlatformKind.platformByCompilerArguments(compilerArguments)
@@ -202,7 +202,7 @@ class KotlinFacetSettings {
         level = DeprecationLevel.ERROR
     )
     fun getPlatform(): org.jetbrains.kotlin.platform.IdePlatform<*, *>? {
-        return platform?.toIdePlatform()
+        return targetPlatform?.toIdePlatform()
     }
 
     var coroutineSupport: LanguageFeature.State?
diff --git a/jps/jps-common/src/org/jetbrains/kotlin/config/facetSerialization.kt b/jps/jps-common/src/org/jetbrains/kotlin/config/facetSerialization.kt
index 31ac6783852..b3c3b92dfc2 100644
--- a/jps/jps-common/src/org/jetbrains/kotlin/config/facetSerialization.kt
+++ b/jps/jps-common/src/org/jetbrains/kotlin/config/facetSerialization.kt
@@ -35,7 +35,6 @@ import org.jetbrains.kotlin.platform.jvm.JvmPlatform
 import org.jetbrains.kotlin.platform.konan.KonanPlatform
 import org.jetbrains.kotlin.platform.oldFashionedDescription
 import org.jetbrains.kotlin.platform.orDefault
-import org.jetbrains.kotlin.resolve.*
 import java.lang.reflect.Modifier
 import kotlin.reflect.KClass
 import kotlin.reflect.full.superclasses
@@ -288,7 +287,7 @@ private fun buildChildElement(element: Element, tag: String, bean: Any, filter:
 private fun KotlinFacetSettings.writeLatestConfig(element: Element) {
     val filter = SkipDefaultsSerializationFilter()
 
-    platform?.let {
+    targetPlatform?.let {
         element.setAttribute("platform", it.oldFashionedDescription)
     }
     if (!useProjectSettings) {
diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt
index 09e9fc3020a..d0b7eada4ac 100644
--- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt
+++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt
@@ -469,7 +469,7 @@ abstract class AbstractIncrementalJpsTest(
 
     private fun configureRequiredLibraries() {
         myProject.modules.forEach { module ->
-            val platformKind = module.kotlinFacet?.settings?.platform?.idePlatformKind.orDefault()
+            val platformKind = module.kotlinFacet?.settings?.targetPlatform?.idePlatformKind.orDefault()
 
             when {
                 platformKind.isJvm -> {
diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/dependeciestxt/ModulesTxt.kt b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/dependeciestxt/ModulesTxt.kt
index 0d6ee77ac47..1a0dc91ae0e 100644
--- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/dependeciestxt/ModulesTxt.kt
+++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/dependeciestxt/ModulesTxt.kt
@@ -16,8 +16,6 @@ import org.jetbrains.kotlin.config.KotlinModuleKind.COMPILATION_AND_SOURCE_SET_H
 import org.jetbrains.kotlin.config.KotlinModuleKind.SOURCE_SET_HOLDER
 import org.jetbrains.kotlin.jps.build.dependeciestxt.ModulesTxt.Dependency.Kind.*
 import org.jetbrains.kotlin.platform.impl.FakeK2NativeCompilerArguments
-import org.jetbrains.kotlin.platform.impl.isCommon
-import org.jetbrains.kotlin.platform.impl.isJvm
 import org.jetbrains.kotlin.platform.isCommon
 import org.jetbrains.kotlin.platform.jvm.isJvm
 import java.io.File
@@ -54,11 +52,11 @@ data class ModulesTxt(
 
         val isCommonModule
             get() =
-                kotlinFacetSettings?.platform.isCommon() ||
+                kotlinFacetSettings?.targetPlatform.isCommon() ||
                         kotlinFacetSettings?.kind == SOURCE_SET_HOLDER
 
         val isJvmModule
-            get() = kotlinFacetSettings?.platform.isJvm()
+            get() = kotlinFacetSettings?.targetPlatform.isJvm()
 
         val expectedBy
             get() = dependencies.filter {
diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/ModuleSettings.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/ModuleSettings.kt
index 52458e2db0b..1e8deea43fe 100644
--- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/ModuleSettings.kt
+++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/ModuleSettings.kt
@@ -17,7 +17,7 @@ val JpsModule.kotlinFacet: JpsKotlinFacetModuleExtension?
     get() = container.getChild(JpsKotlinFacetModuleExtension.KIND)
 
 val JpsModule.platform: TargetPlatform?
-    get() = kotlinFacet?.settings?.platform
+    get() = kotlinFacet?.settings?.targetPlatform
 
 val JpsModule.kotlinKind: KotlinModuleKind
     get() = kotlinFacet?.settings?.kind ?: KotlinModuleKind.DEFAULT