From bb8f8578097a99cfa01ab7609757caac6da99093 Mon Sep 17 00:00:00 2001
From: Yaroslav Chernyshev <yaroslav.chernyshev@jetbrains.com>
Date: Thu, 9 Jul 2020 19:04:44 +0300
Subject: [PATCH] [Gradle, Import] Added externalSystemId into facet for mpp
 projects

#KT-39803 Fixed
---
 .../idea/configuration/KotlinSourceSetDataService.kt     | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinSourceSetDataService.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinSourceSetDataService.kt
index f2cec44643b..a0d5119756d 100644
--- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinSourceSetDataService.kt
+++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinSourceSetDataService.kt
@@ -37,6 +37,7 @@ import org.jetbrains.kotlin.platform.jvm.JvmPlatforms
 import org.jetbrains.kotlin.platform.konan.NativePlatforms
 import org.jetbrains.plugins.gradle.model.data.BuildScriptClasspathData
 import org.jetbrains.plugins.gradle.model.data.GradleSourceSetData
+import org.jetbrains.plugins.gradle.util.GradleConstants
 
 class KotlinSourceSetDataService : AbstractProjectDataService<GradleSourceSetData, Void>() {
     override fun getTargetDataKey() = GradleSourceSetData.KEY
@@ -122,8 +123,11 @@ class KotlinSourceSetDataService : AbstractProjectDataService<GradleSourceSetDat
             val coroutinesProperty = CoroutineSupport.byCompilerArgument(
                 mainModuleNode.coroutines ?: findKotlinCoroutinesProperty(ideModule.project)
             )
-
-            val kotlinFacet = ideModule.getOrCreateFacet(modelsProvider, false)
+            val compilerArguments = kotlinSourceSet.compilerArguments
+            // Used ID is the same as used in org/jetbrains/kotlin/idea/configuration/KotlinGradleSourceSetDataService.kt:280
+            // because this DataService was separated from KotlinGradleSourceSetDataService for MPP projects only
+            val id = if (compilerArguments?.multiPlatform == true) GradleConstants.SYSTEM_ID.id else null
+            val kotlinFacet = ideModule.getOrCreateFacet(modelsProvider, false, id)
             kotlinFacet.configureFacet(
                 compilerVersion,
                 coroutinesProperty,
@@ -134,7 +138,6 @@ class KotlinSourceSetDataService : AbstractProjectDataService<GradleSourceSetDat
                 kotlinSourceSet.dependsOn
             )
 
-            val compilerArguments = kotlinSourceSet.compilerArguments
             val defaultCompilerArguments = kotlinSourceSet.defaultCompilerArguments
             if (compilerArguments != null) {
                 applyCompilerArgumentsToFacet(