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

Fix creating of the script definition from legacy template

Browse Source 
adding classpath needed to load template and related class to the
appropriate host configuration
fixes tests
This commit is contained in:
Ilya Chernikov
2019-07-05 14:25:21 +02:00
parent d3810bfcae
commit a96a938f87
3 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptDefinitionsManager.kt
+4 -4
View File
@@ -240,14 +240,14 @@ fun loadDefinitionsFromTemplates(
// TODO: drop class loading here - it should be handled downstream
// as a compatibility measure, the asm based reading of annotations should be implemented to filter classes before classloading
val template = loader.loadClass(templateClassName).kotlin
val hostConfiguration = ScriptingHostConfiguration(baseHostConfiguration) {
configurationDependencies(JvmDependency(classpath))
}
when {
template.annotations.firstIsInstanceOrNull<kotlin.script.templates.ScriptTemplateDefinition>() != null -> {
ScriptDefinition.FromLegacyTemplate(baseHostConfiguration, template, templateClasspath)
ScriptDefinition.FromLegacyTemplate(hostConfiguration, template, templateClasspath)
}
template.annotations.firstIsInstanceOrNull<kotlin.script.experimental.annotations.KotlinScript>() != null -> {
val hostConfiguration = ScriptingHostConfiguration(baseHostConfiguration) {
configurationDependencies(JvmDependency(classpath))
}
ScriptDefinition.FromTemplate(hostConfiguration, template, ScriptDefinition::class)
}
else -> {