From f30b402640a23cec84bac0dde9e6bf031091f2d5 Mon Sep 17 00:00:00 2001
From: Ilya Chernikov <ilya.chernikov@jetbrains.com>
Date: Tue, 21 Jun 2016 18:34:34 +0200
Subject: [PATCH] Change a parameter "context" in script templates to
 environment: Map<String, Any?>?

---
 .../src/org/jetbrains/kotlin/script/scriptTemplate.kt       | 6 +++---
 .../kotlin/script/scriptTemplateProviderExtensionPoint.kt   | 4 ++--
 compiler/tests/org/jetbrains/kotlin/scripts/ScriptTest2.kt  | 6 +++---
 .../kotlin/idea/core/script/gradleScriptTemplateProvider.kt | 2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/compiler/frontend/src/org/jetbrains/kotlin/script/scriptTemplate.kt b/compiler/frontend/src/org/jetbrains/kotlin/script/scriptTemplate.kt
index 57909587325..8bf52e3b87d 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/script/scriptTemplate.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/script/scriptTemplate.kt
@@ -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)
     }
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/script/scriptTemplateProviderExtensionPoint.kt b/compiler/frontend/src/org/jetbrains/kotlin/script/scriptTemplateProviderExtensionPoint.kt
index 336465f676d..8435273df13 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/script/scriptTemplateProviderExtensionPoint.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/script/scriptTemplateProviderExtensionPoint.kt
@@ -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)
diff --git a/compiler/tests/org/jetbrains/kotlin/scripts/ScriptTest2.kt b/compiler/tests/org/jetbrains/kotlin/scripts/ScriptTest2.kt
index e4f8056232b..6302eaab763 100644
--- a/compiler/tests/org/jetbrains/kotlin/scripts/ScriptTest2.kt
+++ b/compiler/tests/org/jetbrains/kotlin/scripts/ScriptTest2.kt
@@ -69,10 +69,10 @@ class ScriptTest2 {
     private fun compileScript(
             scriptPath: String,
             scriptBase: KClass<out Any>,
-            context: Any? = null,
+            environment: Map<String, Any?>? = null,
             runIsolated: Boolean = true,
             suppressOutput: Boolean = false): Class<*>? =
-            compileScriptImpl("compiler/testData/script/" + scriptPath, KotlinScriptDefinitionFromTemplate(scriptBase, context), runIsolated, suppressOutput)
+            compileScriptImpl("compiler/testData/script/" + scriptPath, KotlinScriptDefinitionFromTemplate(scriptBase, environment), runIsolated, suppressOutput)
 
     private fun compileScriptImpl(
             scriptPath: String,
@@ -120,7 +120,7 @@ class TestKotlinScriptDependenciesResolver : ScriptDependenciesResolver {
 
     private val kotlinPaths by lazy { PathUtil.getKotlinPathsForCompiler() }
 
-    override fun resolve(scriptFile: File?, annotations: Iterable<Annotation>, context: Any?): KotlinScriptExternalDependencies? {
+    override fun resolve(scriptFile: File?, annotations: Iterable<Annotation>, environment: Map<String, Any?>?): KotlinScriptExternalDependencies? {
         val cp = annotations.flatMap {
             when (it) {
                 is depends -> listOf(if (it.path == "@{runtime}") kotlinPaths.runtimePath else File(it.path))
diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/gradleScriptTemplateProvider.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/gradleScriptTemplateProvider.kt
index 586223c6d9f..b2cede3f5e6 100644
--- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/gradleScriptTemplateProvider.kt
+++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/gradleScriptTemplateProvider.kt
@@ -35,7 +35,7 @@ class GradleScriptTemplateProvider(project: Project, gim: GradleInstallationMana
             gradleLibsPath?.listFiles { file -> file.extension == "jar" && depLibsPrefixes.any { file.name.startsWith(it) } }
                 ?.map { it.canonicalPath }
                 ?: emptyList()
-    override val context: Any? = gradleHome
+    override val environment: Map<String, Any?>? = kotlin.collections.mapOf("gradleHome" to gradleHome)
 
     companion object {
         private val depLibsPrefixes = listOf("gradle-script-kotlin", "gradle-core")