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

Change a parameter "context" in script templates to environment: Map<String, Any?>?

Browse Source
This commit is contained in:
Ilya Chernikov
2016-06-21 18:34:34 +02:00
committed by Pavel V. Talanov
parent bf683a63fb
commit f30b402640
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/script/scriptTemplate.kt
+3 -3
View File
@@ -41,7 +41,7 @@ import kotlin.reflect.memberProperties
annotation class ScriptFilePattern(val pattern: String)
interface ScriptDependenciesResolver {
fun resolve(scriptFile: File?, annotations: Iterable<Annotation>, context: Any?): KotlinScriptExternalDependencies? = null
fun resolve(scriptFile: File?, annotations: Iterable<Annotation>, environment: Map<String, Any?>?): KotlinScriptExternalDependencies? = null
}
@Target(AnnotationTarget.CLASS)
@@ -49,7 +49,7 @@ interface ScriptDependenciesResolver {
annotation class ScriptDependenciesResolverClass(val resolver: KClass<out ScriptDependenciesResolver>,
vararg val supportedAnnotationClasses: KClass<out Any>)
data class KotlinScriptDefinitionFromTemplate(val template: KClass<out Any>, val context: Any?) : KotlinScriptDefinition {
data class KotlinScriptDefinitionFromTemplate(val template: KClass<out Any>, val environment: Map<String, Any?>?) : KotlinScriptDefinition {
override val name = template.simpleName!!
override fun getScriptParameters(scriptDescriptor: ScriptDescriptor): List<ScriptParameter> =
@@ -111,7 +111,7 @@ data class KotlinScriptDefinitionFromTemplate(val template: KClass<out Any>, val
val annFQN = ann.first.qualifiedName
if (resolver.first.supportedAnnotationClasses.asIterable2().any { it.qualifiedName == annFQN }) ann.second else null
}
resolver.second.resolve(getFile(file), supportedAnnotations, context)
resolver.second.resolve(getFile(file), supportedAnnotations, environment)
}
return KotlinScriptExternalDependenciesUnion(fileDeps)
}
compiler/frontend/src/org/jetbrains/kotlin/script/scriptTemplateProviderExtensionPoint.kt
+2 -2
View File
@@ -34,7 +34,7 @@ interface ScriptTemplateProvider {
val dependenciesClasspath: Iterable<String>
val context: Any?
val environment: Map<String, Any?>?
companion object {
val EP_NAME = ExtensionPointName.create<ScriptTemplateProvider>("org.jetbrains.kotlin.scriptTemplateProvider")
@@ -56,7 +56,7 @@ fun makeScriptDefsFromTemplateProviders(providers: Iterable<ScriptTemplateProvid
val loader = URLClassLoader(it.dependenciesClasspath.map { File(it).toURI().toURL() }.toTypedArray(), ScriptTemplateProvider::class.java.classLoader)
val cl = loader.loadClass(it.templateClassName)
idToVersion.put(it.id, it.version)
KotlinScriptDefinitionFromTemplate(cl.kotlin, it.context)
KotlinScriptDefinitionFromTemplate(cl.kotlin, it.environment)
}
catch (ex: Exception) {
errorsHandler(it, ex)