azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add a link to hostConfiguration from compilation and evaluation ones

Browse Source 
also add possibility to supply functional defaults for keys in PropertiesCollection
This commit is contained in:
Ilya Chernikov
2019-05-08 11:31:08 +02:00
parent 30c6147223
commit 7ae2054cba
4 changed files with 27 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/scripting/common/src/kotlin/script/experimental/host/configurationFromTemplate.kt
+5 -1
View File
@@ -39,6 +39,7 @@ fun createCompilationConfigurationFromTemplate(
val mainAnnotation: KotlinScript = templateClass.kotlinScriptAnnotation
return ScriptCompilationConfiguration(scriptConfigInstance(mainAnnotation.compilationConfiguration)) {
hostConfiguration(hostConfiguration)
propertiesFromTemplate(templateClass, baseClassType, mainAnnotation)
body()
}
@@ -62,7 +63,10 @@ fun createEvaluationConfigurationFromTemplate(
val mainAnnotation = templateClass.kotlinScriptAnnotation
return ScriptEvaluationConfiguration(scriptConfigInstance(mainAnnotation.evaluationConfiguration), body = body)
return ScriptEvaluationConfiguration(scriptConfigInstance(mainAnnotation.evaluationConfiguration)) {
hostConfiguration(hostConfiguration)
body()
}
}
private fun ScriptCompilationConfiguration.Builder.propertiesFromTemplate(