From 1c761c786499e8cfd9f7e32ea1259c49872df8cd Mon Sep 17 00:00:00 2001
From: "Pavel V. Talanov" <pavel.talanov@jetbrains.com>
Date: Thu, 11 Oct 2018 19:11:50 +0200
Subject: [PATCH] KotlinJUnitRunConfigurationProducer: do not manually override
 sdk

Should be correct if the module is correct
Manually setting sdk led to problem in case of android SDK
---
 .../KotlinJUnitRunConfigurationProducer.kt    | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/run/KotlinJUnitRunConfigurationProducer.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/run/KotlinJUnitRunConfigurationProducer.kt
index 27a42437f26..46378867b44 100644
--- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/run/KotlinJUnitRunConfigurationProducer.kt
+++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/run/KotlinJUnitRunConfigurationProducer.kt
@@ -12,9 +12,7 @@ import com.intellij.execution.actions.RunConfigurationProducer
 import com.intellij.execution.configurations.ModuleBasedConfiguration
 import com.intellij.execution.junit.*
 import com.intellij.execution.testframework.AbstractPatternBasedConfigurationProducer
-import com.intellij.openapi.module.Module
 import com.intellij.openapi.project.DumbService
-import com.intellij.openapi.roots.ModuleRootManager
 import com.intellij.openapi.util.Ref
 import com.intellij.psi.PsiClass
 import com.intellij.psi.PsiElement
@@ -89,7 +87,7 @@ class KotlinJUnitRunConfigurationProducer : RunConfigurationProducer<JUnitConfig
         if (methodLocation != null) {
             configuration.beMethodConfiguration(methodLocation)
             JavaRunConfigurationExtensionManager.getInstance().extendCreatedConfiguration(configuration, location)
-            configuration.setSdkAndModule(module)
+            configuration.setModule(module)
             return true
         }
 
@@ -97,26 +95,13 @@ class KotlinJUnitRunConfigurationProducer : RunConfigurationProducer<JUnitConfig
         if (testClass != null) {
             configuration.beClassConfiguration(testClass)
             JavaRunConfigurationExtensionManager.getInstance().extendCreatedConfiguration(configuration, location)
-            configuration.setSdkAndModule(module)
+            configuration.setModule(module)
             return true
         }
 
         return false
     }
 
-    private fun JUnitConfiguration.setSdkAndModule(module: Module) {
-        if (configurationModule.module == module) {
-            return
-        }
-
-        setModule(module)
-        val sdk = ModuleRootManager.getInstance(module).sdk
-        if (sdk != null) {
-            isAlternativeJrePathEnabled = true
-            alternativeJrePath = sdk.homePath
-        }
-    }
-
     override fun onFirstRun(fromContext: ConfigurationFromContext, context: ConfigurationContext, performRunnable: Runnable) {
         val leaf = fromContext.sourceElement
         getTestClass(leaf)?.let { testClass ->