diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptDefinitionsManager.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptDefinitionsManager.kt index 81fe45e6ed6..171cfff183c 100644 --- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptDefinitionsManager.kt +++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptDefinitionsManager.kt @@ -58,7 +58,7 @@ import kotlin.script.experimental.host.configurationDependencies import kotlin.script.experimental.host.createCompilationConfigurationFromTemplate import kotlin.script.experimental.jvm.JvmDependency import kotlin.script.experimental.jvm.defaultJvmScriptingHostConfiguration -import kotlin.script.experimental.jvm.util.scriptCompilationClasspathFromContextOrStlib +import kotlin.script.experimental.jvm.util.scriptCompilationClasspathFromContextOrStdlib import kotlin.script.templates.standard.ScriptTemplateWithArgs class ScriptDefinitionsManager(private val project: Project) : LazyScriptDefinitionProvider() { @@ -304,7 +304,7 @@ class BundledKotlinScriptDependenciesResolver(private val project: Project) : De listOf(reflectPath, stdlibPath, scriptRuntimePath) } if (ScratchFileService.getInstance().getRootType(virtualFile) is IdeConsoleRootType) { - classpath = scriptCompilationClasspathFromContextOrStlib(wholeClasspath = true) + classpath + classpath = scriptCompilationClasspathFromContextOrStdlib(wholeClasspath = true) + classpath } return ScriptDependencies(javaHome = javaHome?.let(::File), classpath = classpath).asSuccess() diff --git a/libraries/scripting/jvm/src/kotlin/script/experimental/jvm/util/jvmClasspathUtil.kt b/libraries/scripting/jvm/src/kotlin/script/experimental/jvm/util/jvmClasspathUtil.kt index 4bc8e17e97a..fb5a77c74eb 100644 --- a/libraries/scripting/jvm/src/kotlin/script/experimental/jvm/util/jvmClasspathUtil.kt +++ b/libraries/scripting/jvm/src/kotlin/script/experimental/jvm/util/jvmClasspathUtil.kt @@ -124,7 +124,7 @@ fun scriptCompilationClasspathFromContextOrNull( ?: classpathFromClasspathProperty()?.takeAndFilter() } -fun scriptCompilationClasspathFromContextOrStlib( +fun scriptCompilationClasspathFromContextOrStdlib( vararg keyNames: String, classLoader: ClassLoader = Thread.currentThread().contextClassLoader, wholeClasspath: Boolean = false diff --git a/libraries/tools/kotlin-script-util/src/main/kotlin/org/jetbrains/kotlin/script/util/context.kt b/libraries/tools/kotlin-script-util/src/main/kotlin/org/jetbrains/kotlin/script/util/context.kt index 8ed465b4db4..ec8742f7acd 100644 --- a/libraries/tools/kotlin-script-util/src/main/kotlin/org/jetbrains/kotlin/script/util/context.kt +++ b/libraries/tools/kotlin-script-util/src/main/kotlin/org/jetbrains/kotlin/script/util/context.kt @@ -43,7 +43,7 @@ fun scriptCompilationClasspathFromContextOrStlib( classLoader: ClassLoader = Thread.currentThread().contextClassLoader, wholeClasspath: Boolean = false ): List = - kotlin.script.experimental.jvm.util.scriptCompilationClasspathFromContextOrStlib( + kotlin.script.experimental.jvm.util.scriptCompilationClasspathFromContextOrStdlib( *keyNames, classLoader = classLoader, wholeClasspath = wholeClasspath )