From 213b0a37d130bb3dea63b11ced9b1295094e7e48 Mon Sep 17 00:00:00 2001 From: Natalia Selezneva Date: Mon, 10 Jun 2019 12:56:35 +0300 Subject: [PATCH] Do not include jdks dependencies into run configuration of script ^KT-25187 Fixed --- .../standalone/KotlinStandaloneScriptRunConfiguration.kt | 2 +- .../kotlin/idea/run/StandaloneScriptRunConfigurationTest.kt | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/run/script/standalone/KotlinStandaloneScriptRunConfiguration.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/run/script/standalone/KotlinStandaloneScriptRunConfiguration.kt index 88a56e22a2f..f3b2af4bdef 100644 --- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/run/script/standalone/KotlinStandaloneScriptRunConfiguration.kt +++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/run/script/standalone/KotlinStandaloneScriptRunConfiguration.kt @@ -219,7 +219,7 @@ private class ScriptCommandLineState( val module = scriptVFile.module(environment.project) if (module != null) { - val orderEnumerator = OrderEnumerator.orderEntries(module).recursively().let { + val orderEnumerator = OrderEnumerator.orderEntries(module).withoutSdk().recursively().let { if (!ProjectRootsUtil.isInTestSource(scriptVFile, environment.project)) it.productionOnly() else it } diff --git a/idea/tests/org/jetbrains/kotlin/idea/run/StandaloneScriptRunConfigurationTest.kt b/idea/tests/org/jetbrains/kotlin/idea/run/StandaloneScriptRunConfigurationTest.kt index 2b570554cdb..8a824662f56 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/run/StandaloneScriptRunConfigurationTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/run/StandaloneScriptRunConfigurationTest.kt @@ -39,6 +39,9 @@ class StandaloneScriptRunConfigurationTest : KotlinCodeInsightTestCase() { programParametersList.checkParameter("-script") { it.contains("simpleScript.kts") } programParametersList.checkParameter("-kotlin-home") { it == PathUtil.kotlinPathsForIdeaPlugin.homePath.path } + + Assert.assertTrue(!programParametersList.contains("-cp")) + } fun testOnFileRename() {