From 6d8439e9fb9d4800bb095a1ca6118039eb01b268 Mon Sep 17 00:00:00 2001
From: Vadim Brilyantov <v.brilyantov@yandex.ru>
Date: Wed, 26 Dec 2018 19:46:36 +0300
Subject: [PATCH] add kotlinTarget field to non-mpp kotlin gradle model

---
 .../configuration/KotlinGradleProjectResolverExtension.kt  | 2 +-
 idea/kotlin-gradle-tooling/src/KotlinGradleModelBuilder.kt | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleProjectResolverExtension.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleProjectResolverExtension.kt
index 975fa354840..55b487a80cf 100644
--- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleProjectResolverExtension.kt
+++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleProjectResolverExtension.kt
@@ -219,7 +219,7 @@ class KotlinGradleProjectResolverExtension : AbstractProjectResolverExtension()
 
         KotlinStatisticsTrigger.trigger(
                 KotlinTargetTrigger::class.java,
-                gradleModel.platformPluginId ?: "unknown"
+                gradleModel.kotlinTarget ?: "unknown"
         )
 
         addImplementedModuleNames(gradleModule, ideModule, ideProject, gradleModel)
diff --git a/idea/kotlin-gradle-tooling/src/KotlinGradleModelBuilder.kt b/idea/kotlin-gradle-tooling/src/KotlinGradleModelBuilder.kt
index 4c5d3c9c002..1f4ac5d0231 100644
--- a/idea/kotlin-gradle-tooling/src/KotlinGradleModelBuilder.kt
+++ b/idea/kotlin-gradle-tooling/src/KotlinGradleModelBuilder.kt
@@ -48,6 +48,7 @@ interface KotlinGradleModel : Serializable {
     val coroutines: String?
     val platformPluginId: String?
     val implements: List<String>
+    val kotlinTarget: String?
 }
 
 class KotlinGradleModelImpl(
@@ -55,7 +56,8 @@ class KotlinGradleModelImpl(
         override val compilerArgumentsBySourceSet: CompilerArgumentsBySourceSet,
         override val coroutines: String?,
         override val platformPluginId: String?,
-        override val implements: List<String>
+        override val implements: List<String>,
+        override val kotlinTarget: String? = null
 ) : KotlinGradleModel
 
 abstract class AbstractKotlinGradleModelBuilder : ModelBuilderService {
@@ -170,7 +172,8 @@ class KotlinGradleModelBuilder : AbstractKotlinGradleModelBuilder() {
                 compilerArgumentsBySourceSet,
                 getCoroutines(project),
                 platform,
-                implementedProjects.map { it.pathOrName() }
+                implementedProjects.map { it.pathOrName() },
+                platform ?: kotlinPluginId
         )
     }
 }