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

Rename: dependenciesClasspath -> templateClasspath

Browse Source 
Clearer distinction from additionalResolverClasspath
This commit is contained in:
Pavel V. Talanov
2017-07-14 19:02:20 +03:00
parent 96d8f685e9
commit aacb9a437a
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.script/src/org/jetbrains/kotlin/script/scriptTemplateProviderExtensionPoint.kt
+2 -2
View File
@@ -42,7 +42,7 @@ interface ScriptTemplatesProvider {
val filePattern: String? get() = null 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 // 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 { 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)}") LOG.info("[kts] loading script definitions ${provider.templateClassNames} using cp: ${classpath.joinToString(File.pathSeparator)}")
val baseLoader = ScriptTemplatesProvider::class.java.classLoader val baseLoader = ScriptTemplatesProvider::class.java.classLoader
return if (classpath.isEmpty()) baseLoader else URLClassLoader(classpath.map { it.toURI().toURL() }.toTypedArray(), baseLoader) return if (classpath.isEmpty()) baseLoader else URLClassLoader(classpath.map { it.toURI().toURL() }.toTypedArray(), baseLoader)
idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/GradleScriptTemplateProvider.kt
+1 -1
View File
@@ -68,7 +68,7 @@ abstract class AbstractGradleScriptTemplatesProvider(
override val templateClassNames get() = listOf(templateClass) override val templateClassNames get() = listOf(templateClass)
override val dependenciesClasspath: List<File> get() { override val templateClasspath: List<File> get() {
return gradleLibDir.listFiles { it -> return gradleLibDir.listFiles { it ->
/* an inference problem without explicit 'it', TODO: remove when fixed */ /* an inference problem without explicit 'it', TODO: remove when fixed */
dependencySelector.matches(it.name) dependencySelector.matches(it.name)
idea/src/org/jetbrains/kotlin/idea/script/StandardKotlinScriptTemplateProvider.kt
+1 -1
View File
@@ -33,7 +33,7 @@ class StandardKotlinScriptTemplateProvider(val project: Project) : ScriptTemplat
override val isValid: Boolean = true override val isValid: Boolean = true
override val templateClassNames: Iterable<String> get() = listOf(ScriptTemplateWithArgs::class.qualifiedName!!) 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() { override val environment: Map<String, Any?>? get() {
return mapOf( return mapOf(
idea/src/org/jetbrains/kotlin/idea/script/scriptTemplatesFromCompilerSettings.kt
+1 -1
View File
@@ -29,7 +29,7 @@ class ScriptTemplatesFromCompilerSettingsProvider(project: Project): ScriptTempl
override val isValid: Boolean = kotlinSettings.scriptTemplates.isNotBlank() override val isValid: Boolean = kotlinSettings.scriptTemplates.isNotBlank()
override val templateClassNames: Iterable<String> get() = kotlinSettings.scriptTemplates.split(',', ' ') 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( override val environment: Map<String, Any?>? by lazy { mapOf(
"projectRoot" to (project.basePath ?: project.baseDir.canonicalPath)?.let(::File)) "projectRoot" to (project.basePath ?: project.baseDir.canonicalPath)?.let(::File))
} }
idea/tests/org/jetbrains/kotlin/idea/script/AbstractScriptConfigurationTest.kt
+1 -1
View File
@@ -143,5 +143,5 @@ class TestScriptTemplateProvider(
override val id = "Test" override val id = "Test"
override val isValid = true override val isValid = true
override val templateClassNames = listOf("custom.scriptDefinition.Template") override val templateClassNames = listOf("custom.scriptDefinition.Template")
override val dependenciesClasspath = listOf(compiledTemplateDir) override val templateClasspath = listOf(compiledTemplateDir)
} }