Implement JSR 223 script template with eval functions, some fixes

libraries/examples/kotlin-jsr223-daemon-local-eval-example/src/test/kotlin/org/jetbrains/kotlin/script/jsr223/KotlinJsr223ScriptEngineIT.kt

@@ -111,6 +111,17 @@ obj
         })
         Assert.assertEquals(111, result2)
     }
+
+    @Test
+    fun testSimpleEvalInEval() {
+        val engine = ScriptEngineManager().getEngineByExtension("kts")!!
+        val res1 = engine.eval("val x = 3")
+        Assert.assertNull(res1)
+        val res2 = engine.eval("eval(\"\$x + 2\")")
+        Assert.assertEquals(5, res2)
+        val res3 = engine.eval("x + 4")
+        Assert.assertEquals(7, res3)
+    }
 }
 
 fun assertThrows(exceptionClass: Class<*>, body: () -> Unit) {

libraries/examples/kotlin-jsr223-local-example/src/test/kotlin/org/jetbrains/kotlin/script/jsr223/KotlinJsr223ScriptEngineIT.kt

@@ -111,6 +111,17 @@ obj
         })
         Assert.assertEquals(111, result2)
     }
+
+    @Test
+    fun testSimpleEvalInEval() {
+        val engine = ScriptEngineManager().getEngineByExtension("kts")!!
+        val res1 = engine.eval("val x = 3")
+        Assert.assertNull(res1)
+        val res2 = engine.eval("eval(\"\$x + 2\")")
+        Assert.assertEquals(5, res2)
+        val res3 = engine.eval("x + 4")
+        Assert.assertEquals(7, res3)
+    }
 }
 
 fun assertThrows(exceptionClass: Class<*>, body: () -> Unit) {

libraries/tools/kotlin-script-util/src/main/kotlin/org/jetbrains/kotlin/script/jsr223/KotlinJsr223JvmDaemonCompileScriptEngine.kt

@@ -28,6 +28,7 @@ import org.jetbrains.kotlin.daemon.common.*
 import java.io.File
 import java.io.OutputStream
 import java.io.PrintStream
+import java.util.concurrent.locks.ReentrantReadWriteLock
 import javax.script.ScriptContext
 import javax.script.ScriptEngineFactory
 import javax.script.ScriptException
@@ -68,6 +69,8 @@ class KotlinJsr223JvmDaemonCompileScriptEngine(
 
     override val state: IReplStageState<*> get() = getCurrentState(getContext())
 
+    override fun createState(lock: ReentrantReadWriteLock): IReplStageState<*> = replEvaluator.createState(lock)
+
     override fun overrideScriptArgs(context: ScriptContext): ScriptArgsWithTypes? = getScriptArgs(context, scriptArgsTypes)
 
     private fun connectToCompileService(compilerJar: File): CompileService {

libraries/tools/kotlin-script-util/src/main/kotlin/org/jetbrains/kotlin/script/jsr223/KotlinJsr223JvmLocalScriptEngine.kt

@@ -29,6 +29,7 @@ import org.jetbrains.kotlin.script.KotlinScriptDefinitionFromAnnotatedTemplate
 import org.jetbrains.kotlin.utils.PathUtil
 import java.io.File
 import java.net.URLClassLoader
+import java.util.concurrent.locks.ReentrantReadWriteLock
 import javax.script.ScriptContext
 import javax.script.ScriptEngineFactory
 import kotlin.reflect.KClass
@@ -56,6 +57,8 @@ class KotlinJsr223JvmLocalScriptEngine(
 
     override val state: IReplStageState<*> get() = getCurrentState(getContext())
 
+    override fun createState(lock: ReentrantReadWriteLock): IReplStageState<*> = replEvaluator.createState(lock)
+
     override fun overrideScriptArgs(context: ScriptContext): ScriptArgsWithTypes? = getScriptArgs(context, scriptArgsTypes)
 
     private fun makeScriptDefinition(templateClasspath: List<File>, templateClassName: String): KotlinScriptDefinition {

libraries/tools/kotlin-script-util/src/main/kotlin/org/jetbrains/kotlin/script/jsr223/KotlinJsr223ScriptEngineFactoryExamples.kt

@@ -29,6 +29,7 @@ import org.jetbrains.kotlin.script.util.manifestClassPath
 import org.jetbrains.kotlin.utils.PathUtil.*
 import java.io.File
 import java.io.FileNotFoundException
+import javax.script.Bindings
 import javax.script.ScriptContext
 import javax.script.ScriptEngine
 import kotlin.script.templates.standard.ScriptTemplateWithArgs
@@ -39,10 +40,10 @@ class KotlinJsr223JvmLocalScriptEngineFactory : KotlinJsr223JvmScriptEngineFacto
             KotlinJsr223JvmLocalScriptEngine(
                     Disposer.newDisposable(),
                     this,
-                    scriptCompilationClasspathFromContext(),
-                    "kotlin.script.templates.standard.ScriptTemplateWithBindings",
+                    scriptCompilationClasspathFromContext("kotlin-script-util.jar"),
+                    KotlinStandardJsr223ScriptTemplate::class.qualifiedName!!,
                     { ctx, types -> ScriptArgsWithTypes(arrayOf(ctx.getBindings(ScriptContext.ENGINE_SCOPE)), types ?: emptyArray()) },
-                    arrayOf(Map::class)
+                    arrayOf(Bindings::class)
             )
 }
 
@@ -53,10 +54,10 @@ class KotlinJsr223JvmDaemonLocalEvalScriptEngineFactory : KotlinJsr223JvmScriptE
                     Disposer.newDisposable(),
                     this,
                     kotlinCompilerJar,
-                    scriptCompilationClasspathFromContext(),
-                    "kotlin.script.templates.standard.ScriptTemplateWithBindings",
+                    scriptCompilationClasspathFromContext("kotlin-script-util.jar"),
+                    KotlinStandardJsr223ScriptTemplate::class.qualifiedName!!,
                     { ctx, types -> ScriptArgsWithTypes(arrayOf(ctx.getBindings(ScriptContext.ENGINE_SCOPE)), types ?: emptyArray()) },
-                    arrayOf(Map::class)
+                    arrayOf(Bindings::class)
             )
 }
 
@@ -77,9 +78,9 @@ private fun contextClasspath(keyName: String, classLoader: ClassLoader): List<Fi
         )?.toList()
 
 
-private fun scriptCompilationClasspathFromContext(classLoader: ClassLoader = Thread.currentThread().contextClassLoader): List<File> =
+private fun scriptCompilationClasspathFromContext(keyName: String, classLoader: ClassLoader = Thread.currentThread().contextClassLoader): List<File> =
         (System.getProperty("kotlin.script.classpath")?.split(File.pathSeparator)?.map(::File)
-          ?: classpathFromClassloader(classLoader)
+          ?: contextClasspath(keyName, classLoader)
         ).let {
             it?.plus(kotlinScriptStandardJars) ?: kotlinScriptStandardJars
         }

libraries/tools/kotlin-script-util/src/main/kotlin/org/jetbrains/kotlin/script/jsr223/KotlinStandardJsr223ScriptTemplate.kt

@@ -0,0 +1,41 @@
+package org.jetbrains.kotlin.script.jsr223
+
+import org.jetbrains.kotlin.cli.common.repl.KOTLIN_SCRIPT_ENGINE_BINDINGS_KEY
+import org.jetbrains.kotlin.cli.common.repl.KOTLIN_SCRIPT_STATE_BINDINGS_KEY
+import org.jetbrains.kotlin.script.ScriptTemplateDefinition
+import javax.script.Bindings
+import javax.script.ScriptEngine
+
+@Suppress("unused")
+@ScriptTemplateDefinition
+abstract class KotlinStandardJsr223ScriptTemplate(val bindings: Bindings) {
+
+    private val myEngine: ScriptEngine? get() = bindings[KOTLIN_SCRIPT_ENGINE_BINDINGS_KEY]?.let { it as? ScriptEngine }
+
+    private inline fun<T> withMyEngine(body: (ScriptEngine) -> T): T =
+            myEngine?.let(body) ?: throw IllegalStateException("Script engine for `eval` call is not found")
+
+    fun eval(script: String, newBindings: Bindings): Any? =
+            withMyEngine {
+                val savedState = newBindings[KOTLIN_SCRIPT_STATE_BINDINGS_KEY]?.takeIf { it === this.bindings[KOTLIN_SCRIPT_STATE_BINDINGS_KEY] }?.apply {
+                    newBindings[KOTLIN_SCRIPT_STATE_BINDINGS_KEY] = null
+                }
+                val res = it.eval(script, newBindings)
+                savedState?.apply {
+                    newBindings[KOTLIN_SCRIPT_STATE_BINDINGS_KEY] = savedState
+                }
+                res
+            }
+
+    fun eval(script: String): Any? =
+            withMyEngine {
+                val savedState = bindings.remove(KOTLIN_SCRIPT_STATE_BINDINGS_KEY)
+                val res = it.eval(script, bindings)
+                savedState?.apply {
+                    bindings[KOTLIN_SCRIPT_STATE_BINDINGS_KEY] = savedState
+                }
+                res
+            }
+
+    fun createBindings(): Bindings = withMyEngine { it.createBindings() }
+}