From bcabbcf3e155c0d41c3fb96b2156f3dd5709f26a Mon Sep 17 00:00:00 2001
From: Dmitry Savvinov <dmitry.savvinov@jetbrains.com>
Date: Thu, 31 Oct 2019 10:31:53 +0300
Subject: [PATCH] Add Native stdlib to intermediate source set dependencies

Also fix the dependsOn source set IDs not matcing those
in the IDE.
---
 .../KotlinMPPGradleProjectResolver.kt         |  2 +-
 .../native/KotlinNativeTargetPreset.kt        | 47 +++++++++++++++----
 2 files changed, 38 insertions(+), 11 deletions(-)

diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinMPPGradleProjectResolver.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinMPPGradleProjectResolver.kt
index 7f16dd378e8..e61035187cc 100644
--- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinMPPGradleProjectResolver.kt
+++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinMPPGradleProjectResolver.kt
@@ -910,7 +910,7 @@ open class KotlinMPPGradleProjectResolver : AbstractProjectResolverExtension() {
                 sourceSetInfo.gradleModuleId = getModuleId(resolverCtx, gradleModule)
                 sourceSetInfo.actualPlatforms.addSimplePlatforms(listOf(compilation.platform))
                 sourceSetInfo.isTestModule = compilation.isTestModule
-                sourceSetInfo.dependsOn = compilation.sourceSets.flatMap { it.dependsOnSourceSets }.map { gradleModule.name + "_" + it }.distinct().toList()
+                sourceSetInfo.dependsOn = compilation.sourceSets.flatMap { it.dependsOnSourceSets }.map { getModuleId(resolverCtx, gradleModule) + ":" + it }.distinct().toList()
                 sourceSetInfo.compilerArguments =
                     createCompilerArguments(compilation.arguments.currentArguments.toList(), compilation.platform).also {
                         it.multiPlatform = true
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeTargetPreset.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeTargetPreset.kt
index d6fade204cd..0a5c1edce91 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeTargetPreset.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeTargetPreset.kt
@@ -3,13 +3,16 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
-@file:Suppress("PackageDirectoryMismatch") // Old package for compatibility
+@file:Suppress("PackageDirectoryMismatch")
+
+// Old package for compatibility
 
 package org.jetbrains.kotlin.gradle.plugin.mpp
 
 import org.gradle.api.Project
 import org.gradle.api.artifacts.Dependency
 import org.jetbrains.kotlin.compilerRunner.konanHome
+import org.jetbrains.kotlin.gradle.dsl.kotlinExtension
 import org.jetbrains.kotlin.gradle.plugin.*
 import org.jetbrains.kotlin.gradle.plugin.PropertiesProvider
 import org.jetbrains.kotlin.gradle.targets.native.DisabledNativeTargetsReporter
@@ -69,7 +72,7 @@ abstract class AbstractKotlinNativeTargetPreset<T : KotlinNativeTarget>(
         filesList?.map { dir -> dependencies.create(files(dir)) } ?: emptyList()
     }
 
-    protected abstract fun createTargetConfigurator() : KotlinTargetConfigurator<T>
+    protected abstract fun createTargetConfigurator(): KotlinTargetConfigurator<T>
 
     protected abstract fun instantiateTarget(name: String): T
 
@@ -87,8 +90,20 @@ abstract class AbstractKotlinNativeTargetPreset<T : KotlinNativeTarget>(
 
         createTargetConfigurator().configureTarget(result)
 
-        // Allow IDE to resolve the libraries provided by the compiler by adding them into dependencies.
+        addDependenciesOnLibrariesFromDistribution(result)
 
+        if (!konanTarget.enabledOnCurrentHost) {
+            with(HostManager()) {
+                val supportedHosts = enabledByHost.filterValues { konanTarget in it }.keys
+                DisabledNativeTargetsReporter.reportDisabledTarget(project, result, supportedHosts)
+            }
+        }
+
+        return result
+    }
+
+    // Allow IDE to resolve the libraries provided by the compiler by adding them into dependencies.
+    private fun addDependenciesOnLibrariesFromDistribution(result: T) {
         result.compilations.all { compilation ->
             val target = compilation.konanTarget
             project.whenEvaluated {
@@ -103,14 +118,26 @@ abstract class AbstractKotlinNativeTargetPreset<T : KotlinNativeTarget>(
             }
         }
 
-        if (!konanTarget.enabledOnCurrentHost) {
-            with(HostManager()) {
-                val supportedHosts = enabledByHost.filterValues { konanTarget in it }.keys
-                DisabledNativeTargetsReporter.reportDisabledTarget(project, result, supportedHosts)
-            }
-        }
+        // Add dependencies to stdlib-native for intermediate single-backend source-sets (like 'allNative')
+        project.whenEvaluated {
+            val compilationsBySourceSets = CompilationSourceSetUtil.compilationsBySourceSets(this)
 
-        return result
+            fun KotlinSourceSet.isIntermediateNativeSourceSet(): Boolean {
+                val compilations = compilationsBySourceSets[this] ?: return false
+
+                if (compilations.size <= 1) return false // intermediate source-sets participate at least in two compilations
+
+                return compilations.all { it.target.platformType == KotlinPlatformType.native }
+            }
+
+            val stdlib = defaultLibs(stdlibOnly = true).single()
+
+            project.kotlinExtension.sourceSets
+                .filter { it.isIntermediateNativeSourceSet() }
+                .forEach {
+                    it.dependencies { implementation(stdlib) }
+                }
+        }
     }
 
     companion object {