Use custom ScriptingHostConfiguration for DSL script templates

fwcd · fwcd · commit f57c52284989 · 2019-09-05T02:20:12.000+02:00
diff --git a/server/src/main/kotlin/org/javacs/kt/Compiler.kt b/server/src/main/kotlin/org/javacs/kt/Compiler.kt
@@ -121,7 +121,7 @@ private class CompilationEnvironment(
                     configurationDependencies(JvmDependency(fileClassPath))
                 }
                 scriptDefinitions = scriptTemplates
-                    .map { object : ScriptDefinition.FromLegacy(defaultJvmScriptingHostConfiguration, KotlinScriptDefinition(scriptClassLoader.loadClass(it).kotlin)) {
+                    .map { object : ScriptDefinition.FromLegacy(scriptHostConfig, KotlinScriptDefinition(scriptClassLoader.loadClass(it).kotlin)) {
                         override val isDefault = true
                     } }
             } catch (e: Exception) {

Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,7 @@ private class CompilationEnvironment(`
`121`	`121`	`configurationDependencies(JvmDependency(fileClassPath))`
`122`	`122`	`}`
`123`	`123`	`scriptDefinitions = scriptTemplates`
`124`		`- .map { object : ScriptDefinition.FromLegacy(defaultJvmScriptingHostConfiguration, KotlinScriptDefinition(scriptClassLoader.loadClass(it).kotlin)) {`
	`124`	`+ .map { object : ScriptDefinition.FromLegacy(scriptHostConfig, KotlinScriptDefinition(scriptClassLoader.loadClass(it).kotlin)) {`
`125`	`125`	`override val isDefault = true`
`126`	`126`	`} }`
`127`	`127`	`} catch (e: Exception) {`