Make sure template classpath is always among script dependencies

compiler/frontend.script/src/org/jetbrains/kotlin/script/KotlinScriptDefinitionFromAnnotatedTemplate.kt

@@ -23,6 +23,7 @@ import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.name.NameUtils
 import org.jetbrains.kotlin.psi.KtScript
 import org.jetbrains.kotlin.utils.addToStdlib.firstIsInstanceOrNull
+import java.io.File
 import kotlin.reflect.KClass
 import kotlin.reflect.KFunction
 import kotlin.reflect.KParameter
@@ -36,7 +37,8 @@ open class KotlinScriptDefinitionFromAnnotatedTemplate(
         template: KClass<out Any>,
         providedResolver: DependenciesResolver? = null,
         providedScriptFilePattern: String? = null,
-        val environment: Map<String, Any?>? = null
+        val environment: Map<String, Any?>? = null,
+        val templateClasspath: List<File> = emptyList()
 ) : KotlinScriptDefinition(template) {
 
     val scriptFilePattern by lazy {

compiler/frontend.script/src/org/jetbrains/kotlin/script/ScriptContentLoader.kt

@@ -67,10 +67,18 @@ class ScriptContentLoader(private val project: Project) {
                 getEnvironment(scriptDef)
         )
         ServiceManager.getService(project, ScriptReportSink::class.java)?.attachReports(file, result.reports)
-        return result.dependencies
+        return result.dependencies?.adjustByDefinition(scriptDef)
     }
 
     fun getEnvironment(scriptDef: KotlinScriptDefinition) =
             (scriptDef as? KotlinScriptDefinitionFromAnnotatedTemplate)?.environment.orEmpty()
 }
 
+fun ScriptDependencies.adjustByDefinition(
+        scriptDef: KotlinScriptDefinition
+): ScriptDependencies {
+    val additionalClasspath = (scriptDef as? KotlinScriptDefinitionFromAnnotatedTemplate)?.templateClasspath ?: return this
+    if (additionalClasspath.isEmpty()) return this
+    return copy(classpath = additionalClasspath + classpath)
+}
+

compiler/frontend.script/src/org/jetbrains/kotlin/script/scriptTemplateProviderExtensionPoint.kt

@@ -72,7 +72,10 @@ fun makeScriptDefsFromTemplatesProviders(providers: Iterable<ScriptTemplatesProv
     try {
         val loader = createClassLoader(provider)
         provider.templateClassNames.map {
-            KotlinScriptDefinitionFromAnnotatedTemplate(loader.loadClass(it).kotlin, provider.resolver, provider.filePattern, provider.environment)
+            KotlinScriptDefinitionFromAnnotatedTemplate(
+                    loader.loadClass(it).kotlin, provider.resolver,
+                    provider.filePattern, provider.environment, provider.templateClasspath
+            )
         }
     }
     catch (ex: Throwable) {