From 0c94aefb874099d803e93c60dfc8e7566d8398d8 Mon Sep 17 00:00:00 2001
From: Dmitriy Dolovov <Dmitriy.Dolovov@jetbrains.com>
Date: Tue, 11 Sep 2018 16:47:35 +0300
Subject: [PATCH] Move NativeIdePlatformKind to idea-jps-common

Issue #KT-26714 Fixed
---
 idea/idea-jps-common/build.gradle.kts                 |  1 +
 .../org/jetbrains/kotlin/platform/IdePlatformKind.kt  | 11 +++++++++--
 .../kotlin/platform/impl}/NativeIdePlatformKind.kt    |  2 +-
 .../kotlin/ide/konan/NativeIdePlatformKindTooling.kt  |  1 +
 .../kotlin/ide/konan/NativePlatformKindResolution.kt  |  1 +
 idea/src/META-INF/native.xml                          |  2 +-
 6 files changed, 14 insertions(+), 4 deletions(-)
 rename idea/{idea-native/src/org/jetbrains/kotlin/ide/konan => idea-jps-common/src/org/jetbrains/kotlin/platform/impl}/NativeIdePlatformKind.kt (97%)

diff --git a/idea/idea-jps-common/build.gradle.kts b/idea/idea-jps-common/build.gradle.kts
index 141db705077..36ebb685122 100644
--- a/idea/idea-jps-common/build.gradle.kts
+++ b/idea/idea-jps-common/build.gradle.kts
@@ -11,6 +11,7 @@ dependencies {
     compile(project(":compiler:cli-common"))
     compile(project(":compiler:frontend.java"))
     compile(project(":js:js.frontend"))
+    compile(project(":kotlin-native:kotlin-native-library-reader"))
     compileOnly(intellijDep())
     compileOnly(intellijDep("jps-standalone")) { includeJars("jps-model") }
 }
diff --git a/idea/idea-jps-common/src/org/jetbrains/kotlin/platform/IdePlatformKind.kt b/idea/idea-jps-common/src/org/jetbrains/kotlin/platform/IdePlatformKind.kt
index 395db967918..14313b80497 100644
--- a/idea/idea-jps-common/src/org/jetbrains/kotlin/platform/IdePlatformKind.kt
+++ b/idea/idea-jps-common/src/org/jetbrains/kotlin/platform/IdePlatformKind.kt
@@ -7,11 +7,12 @@
 package org.jetbrains.kotlin.platform
 
 import com.intellij.openapi.application.ApplicationManager
-import org.jetbrains.kotlin.extensions.ApplicationExtensionDescriptor
 import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments
+import org.jetbrains.kotlin.extensions.ApplicationExtensionDescriptor
 import org.jetbrains.kotlin.platform.impl.CommonIdePlatformKind
 import org.jetbrains.kotlin.platform.impl.JsIdePlatformKind
 import org.jetbrains.kotlin.platform.impl.JvmIdePlatformKind
+import org.jetbrains.kotlin.platform.impl.NativeIdePlatformKind
 import org.jetbrains.kotlin.resolve.TargetPlatform
 import org.jetbrains.kotlin.utils.addToStdlib.firstNotNullResult
 
@@ -39,7 +40,13 @@ abstract class IdePlatformKind<Kind : IdePlatformKind<Kind>> {
         }
 
         // For using only in JPS
-        private val JPS_KINDS get() = listOf(JvmIdePlatformKind, JsIdePlatformKind, CommonIdePlatformKind)
+        private val JPS_KINDS
+            get() = listOf(
+                JvmIdePlatformKind,
+                JsIdePlatformKind,
+                CommonIdePlatformKind,
+                NativeIdePlatformKind
+            )
 
         val ALL_KINDS by lazy {
             val kinds = extension?.getInstances() ?: return@lazy JPS_KINDS
diff --git a/idea/idea-native/src/org/jetbrains/kotlin/ide/konan/NativeIdePlatformKind.kt b/idea/idea-jps-common/src/org/jetbrains/kotlin/platform/impl/NativeIdePlatformKind.kt
similarity index 97%
rename from idea/idea-native/src/org/jetbrains/kotlin/ide/konan/NativeIdePlatformKind.kt
rename to idea/idea-jps-common/src/org/jetbrains/kotlin/platform/impl/NativeIdePlatformKind.kt
index 423749ae539..f0ea3b01d34 100644
--- a/idea/idea-native/src/org/jetbrains/kotlin/ide/konan/NativeIdePlatformKind.kt
+++ b/idea/idea-jps-common/src/org/jetbrains/kotlin/platform/impl/NativeIdePlatformKind.kt
@@ -3,7 +3,7 @@
  * that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.ide.konan
+package org.jetbrains.kotlin.platform.impl
 
 import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments
 import org.jetbrains.kotlin.config.TargetPlatformVersion
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 23745e3d871..263750807a8 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
@@ -16,6 +16,7 @@ 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
 import org.jetbrains.kotlin.psi.KtFunction
 import org.jetbrains.kotlin.psi.KtNamedDeclaration
 import org.jetbrains.kotlin.resolve.TargetPlatform
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 50a49373b65..37097cab3d7 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
@@ -22,6 +22,7 @@ import org.jetbrains.kotlin.konan.library.KLIB_METADATA_FILE_EXTENSION
 import org.jetbrains.kotlin.konan.library.KONAN_STDLIB_NAME
 import org.jetbrains.kotlin.konan.library.createKonanLibrary
 import org.jetbrains.kotlin.konan.util.KonanFactories.DefaultDeserializedDescriptorFactory
+import org.jetbrains.kotlin.platform.impl.NativeIdePlatformKind
 import org.jetbrains.kotlin.resolve.konan.platform.KonanPlatform
 
 class NativePlatformKindResolution : IdePlatformKindResolution {
diff --git a/idea/src/META-INF/native.xml b/idea/src/META-INF/native.xml
index 2029f365b36..6062cdd42c7 100644
--- a/idea/src/META-INF/native.xml
+++ b/idea/src/META-INF/native.xml
@@ -21,7 +21,7 @@
 
     <extensions defaultExtensionNs="org.jetbrains.kotlin">
         <binaryExtension implementation="org.jetbrains.kotlin.ide.konan.decompiler.KotlinNativeMetaBinary"/>
-        <idePlatformKind implementation="org.jetbrains.kotlin.ide.konan.NativeIdePlatformKind"/>
+        <idePlatformKind implementation="org.jetbrains.kotlin.platform.impl.NativeIdePlatformKind"/>
         <idePlatformKindTooling implementation="org.jetbrains.kotlin.ide.konan.NativeIdePlatformKindTooling"/>
         <idePlatformKindResolution implementation="org.jetbrains.kotlin.ide.konan.NativePlatformKindResolution"/>
         <projectConfigurator implementation="org.jetbrains.kotlin.ide.konan.KotlinNativeModuleConfigurator"/>