Skip to content

Commit 02a95fe

Browse files
committed
Clean-up commented out code in KotlinScriptLanguage
1 parent 9286124 commit 02a95fe

File tree

1 file changed

+1
-32
lines changed

1 file changed

+1
-32
lines changed

src/main/kotlin/org/scijava/plugins/scripting/kotlin/KotlinScriptLanguage.kt

Lines changed: 1 addition & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -53,38 +53,7 @@ class KotlinScriptLanguage : AdaptedScriptLanguage(Factory()) {
5353
override fun getExtensions() = listOf("kt", "kts")
5454

5555
class Factory : KotlinJsr223JvmScriptEngineFactoryBase() {
56-
override fun getScriptEngine(): ScriptEngine {
57-
return SynchronizedScriptEngine(
58-
// KotlinJsr223JvmDaemonCompileScriptEngine(
59-
// this,
60-
// KotlinJars.compilerWithScriptingClasspath,
61-
// scriptCompilationClasspathFromContext("kotlin-script-util.jar", wholeClasspath = true),
62-
// KotlinStandardJsr223ScriptTemplate::class.qualifiedName!!,
63-
// { ctx, types -> ScriptArgsWithTypes(arrayOf(ctx.getBindings(ScriptContext.ENGINE_SCOPE)), types ?: emptyArray()) },
64-
// arrayOf(Bindings::class)
65-
// )
66-
// KotlinJsr223JvmLocalScriptEngine(
67-
// this,
68-
// scriptCompilationClasspathFromContext("kotlin-script-util.jar", wholeClasspath = true),
69-
// KotlinStandardJsr223ScriptTemplate::class.qualifiedName!!,
70-
// { ctx, types -> ScriptArgsWithTypes(arrayOf(ctx.getBindings(ScriptContext.ENGINE_SCOPE)), types ?: emptyArray()) },
71-
// arrayOf(Bindings::class))
72-
// KotlinJsr223ScriptEngineImpl(
73-
// this,
74-
// scriptDefinition.compilationConfiguration.with {
75-
// jvm {
76-
// if (System.getProperty(KOTLIN_JSR223_RESOLVE_FROM_CLASSLOADER_PROPERTY) == "true") {
77-
// dependencies(JvmDependencyFromClassLoader { Thread.currentThread().contextClassLoader })
78-
// } else {
79-
// dependenciesFromCurrentContext()
80-
// }
81-
// }
82-
// },
83-
// scriptDefinition.evaluationConfiguration
84-
// ) { ScriptArgsWithTypes(arrayOf(it.getBindings(ScriptContext.ENGINE_SCOPE).orEmpty()), arrayOf(Bindings::class)) }
85-
KotlinJsr223DefaultScriptEngineFactory().scriptEngine
86-
)
87-
}
56+
override fun getScriptEngine() = SynchronizedScriptEngine(KotlinJsr223DefaultScriptEngineFactory().scriptEngine)
8857
}
8958

9059
class SynchronizedScriptEngine(private val delegate: ScriptEngine) : ScriptEngine {

0 commit comments

Comments
 (0)