From aacb9a437a4fc9d61a99daf8e6662d37f710b010 Mon Sep 17 00:00:00 2001
From: "Pavel V. Talanov" <talanov.pavel@gmail.com>
Date: Fri, 14 Jul 2017 19:02:20 +0300
Subject: [PATCH] Rename: dependenciesClasspath -> templateClasspath

Clearer distinction from additionalResolverClasspath
---
 .../kotlin/script/scriptTemplateProviderExtensionPoint.kt     | 4 ++--
 .../kotlin/idea/core/script/GradleScriptTemplateProvider.kt   | 2 +-
 .../idea/script/StandardKotlinScriptTemplateProvider.kt       | 2 +-
 .../kotlin/idea/script/scriptTemplatesFromCompilerSettings.kt | 2 +-
 .../kotlin/idea/script/AbstractScriptConfigurationTest.kt     | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/compiler/frontend.script/src/org/jetbrains/kotlin/script/scriptTemplateProviderExtensionPoint.kt b/compiler/frontend.script/src/org/jetbrains/kotlin/script/scriptTemplateProviderExtensionPoint.kt
index c5149c4ec08..4e6c7984c5c 100644
--- a/compiler/frontend.script/src/org/jetbrains/kotlin/script/scriptTemplateProviderExtensionPoint.kt
+++ b/compiler/frontend.script/src/org/jetbrains/kotlin/script/scriptTemplateProviderExtensionPoint.kt
@@ -42,7 +42,7 @@ interface ScriptTemplatesProvider {
 
     val filePattern: String? get() = null
 
-    val dependenciesClasspath: List<File>
+    val templateClasspath: List<File>
 
     // TODO: need to provide a way to specify this in compiler/repl .. etc
     /*
@@ -83,7 +83,7 @@ fun makeScriptDefsFromTemplatesProviders(providers: Iterable<ScriptTemplatesProv
 }
 
 private fun createClassLoader(provider: ScriptTemplatesProvider): ClassLoader {
-    val classpath = provider.dependenciesClasspath + provider.additionalResolverClasspath
+    val classpath = provider.templateClasspath + provider.additionalResolverClasspath
     LOG.info("[kts] loading script definitions ${provider.templateClassNames} using cp: ${classpath.joinToString(File.pathSeparator)}")
     val baseLoader = ScriptTemplatesProvider::class.java.classLoader
     return if (classpath.isEmpty()) baseLoader else URLClassLoader(classpath.map { it.toURI().toURL() }.toTypedArray(), baseLoader)
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 1276b4a7b1d..c4bef3ce5e1 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
@@ -68,7 +68,7 @@ abstract class AbstractGradleScriptTemplatesProvider(
 
     override val templateClassNames get() = listOf(templateClass)
 
-    override val dependenciesClasspath: List<File> get() {
+    override val templateClasspath: List<File> get() {
         return gradleLibDir.listFiles { it ->
             /* an inference problem without explicit 'it', TODO: remove when fixed */
             dependencySelector.matches(it.name)
diff --git a/idea/src/org/jetbrains/kotlin/idea/script/StandardKotlinScriptTemplateProvider.kt b/idea/src/org/jetbrains/kotlin/idea/script/StandardKotlinScriptTemplateProvider.kt
index 23e0db9fe02..cb88e8cb613 100644
--- a/idea/src/org/jetbrains/kotlin/idea/script/StandardKotlinScriptTemplateProvider.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/script/StandardKotlinScriptTemplateProvider.kt
@@ -33,7 +33,7 @@ class StandardKotlinScriptTemplateProvider(val project: Project) : ScriptTemplat
     override val isValid: Boolean = true
 
     override val templateClassNames: Iterable<String> get() = listOf(ScriptTemplateWithArgs::class.qualifiedName!!)
-    override val dependenciesClasspath get() = emptyList<File>()
+    override val templateClasspath get() = emptyList<File>()
 
     override val environment: Map<String, Any?>? get() {
         return mapOf(
diff --git a/idea/src/org/jetbrains/kotlin/idea/script/scriptTemplatesFromCompilerSettings.kt b/idea/src/org/jetbrains/kotlin/idea/script/scriptTemplatesFromCompilerSettings.kt
index f05d88af0f4..ae5f806403a 100644
--- a/idea/src/org/jetbrains/kotlin/idea/script/scriptTemplatesFromCompilerSettings.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/script/scriptTemplatesFromCompilerSettings.kt
@@ -29,7 +29,7 @@ class ScriptTemplatesFromCompilerSettingsProvider(project: Project): ScriptTempl
     override val isValid: Boolean = kotlinSettings.scriptTemplates.isNotBlank()
 
     override val templateClassNames: Iterable<String> get() = kotlinSettings.scriptTemplates.split(',', ' ')
-    override val dependenciesClasspath get() = kotlinSettings.scriptTemplatesClasspath.split(File.pathSeparator).map(::File)
+    override val templateClasspath get() = kotlinSettings.scriptTemplatesClasspath.split(File.pathSeparator).map(::File)
     override val environment: Map<String, Any?>? by lazy { mapOf(
             "projectRoot" to (project.basePath ?: project.baseDir.canonicalPath)?.let(::File))
     }
diff --git a/idea/tests/org/jetbrains/kotlin/idea/script/AbstractScriptConfigurationTest.kt b/idea/tests/org/jetbrains/kotlin/idea/script/AbstractScriptConfigurationTest.kt
index fc071a3524f..0905b2a53f7 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/script/AbstractScriptConfigurationTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/script/AbstractScriptConfigurationTest.kt
@@ -143,5 +143,5 @@ class TestScriptTemplateProvider(
     override val id = "Test"
     override val isValid = true
     override val templateClassNames = listOf("custom.scriptDefinition.Template")
-    override val dependenciesClasspath = listOf(compiledTemplateDir)
+    override val templateClasspath = listOf(compiledTemplateDir)
 }