diff --git a/compiler/util/src/org/jetbrains/kotlin/utils/KotlinPaths.kt b/compiler/util/src/org/jetbrains/kotlin/utils/KotlinPaths.kt index 487927520a9..fc0d0f96d57 100644 --- a/compiler/util/src/org/jetbrains/kotlin/utils/KotlinPaths.kt +++ b/compiler/util/src/org/jetbrains/kotlin/utils/KotlinPaths.kt @@ -92,11 +92,15 @@ interface KotlinPaths { SamWithReceiver(PathUtil.SAM_WITH_RECEIVER_PLUGIN_NAME), Trove4j(PathUtil.TROVE4J_NAME), Compiler(PathUtil.KOTLIN_COMPILER_NAME), + ScriptingPlugin(PathUtil.KOTLIN_SCRIPTING_COMPILER_PLUGIN_NAME), + ScriptingLib(PathUtil.KOTLIN_SCRIPTING_COMMON_NAME), + ScriptingJvmLib(PathUtil.KOTLIN_SCRIPTING_JVM_NAME), } enum class ClassPaths(val contents: List = emptyList()) { Empty(), - Compiler(Jars.Compiler, Jars.StdLib, Jars.Reflect, Jars.ScriptRuntime, Jars.Trove4j), + Compiler(Jar.Compiler, Jar.StdLib, Jar.Reflect, Jar.ScriptRuntime, Jar.Trove4j), + CompilerWithScripting(Compiler, Jar.ScriptingPlugin, Jar.ScriptingLib, Jar.ScriptingJvmLib) ; constructor(vararg jars: Jar) : this(jars.asList()) diff --git a/idea/idea-repl/src/org/jetbrains/kotlin/jsr223/KotlinJsr223JvmScriptEngine4Idea.kt b/idea/idea-repl/src/org/jetbrains/kotlin/jsr223/KotlinJsr223JvmScriptEngine4Idea.kt index 205411566df..22c73969c59 100644 --- a/idea/idea-repl/src/org/jetbrains/kotlin/jsr223/KotlinJsr223JvmScriptEngine4Idea.kt +++ b/idea/idea-repl/src/org/jetbrains/kotlin/jsr223/KotlinJsr223JvmScriptEngine4Idea.kt @@ -25,6 +25,7 @@ import org.jetbrains.kotlin.daemon.client.DaemonReportingTargets import org.jetbrains.kotlin.daemon.client.KotlinCompilerClient import org.jetbrains.kotlin.daemon.client.KotlinRemoteReplCompilerClient import org.jetbrains.kotlin.daemon.common.* +import org.jetbrains.kotlin.utils.KotlinPaths import org.jetbrains.kotlin.utils.PathUtil import java.io.File import java.util.concurrent.locks.ReentrantReadWriteLock @@ -44,9 +45,9 @@ class KotlinJsr223JvmScriptEngine4Idea( ) : KotlinJsr223JvmScriptEngineBase(factory) { private val daemon by lazy { - val path = PathUtil.kotlinPathsForIdeaPlugin.compilerPath - assert(path.exists()) - val compilerId = CompilerId.makeCompilerId(path) + val classPath = PathUtil.kotlinPathsForIdeaPlugin.classPath(KotlinPaths.ClassPaths.CompilerWithScripting) + assert(classPath.all { it.exists() }) + val compilerId = CompilerId.makeCompilerId(classPath) val daemonOptions = configureDaemonOptions() val daemonJVMOptions = DaemonJVMOptions()