From fe2a11142eb0fbc1154721013b86c12b12acf7ed Mon Sep 17 00:00:00 2001 From: Ilya Chernikov Date: Mon, 23 Jul 2018 10:53:22 +0200 Subject: [PATCH] Renaming, commenting sample --- .../examples/jvm/resolve/maven/scriptDef.kt | 6 +++++- .../experimental/api/scriptDefinition.kt | 20 +++++++++---------- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/libraries/examples/scripting/jvm-maven-deps/script/src/org/jetbrains/kotlin/script/examples/jvm/resolve/maven/scriptDef.kt b/libraries/examples/scripting/jvm-maven-deps/script/src/org/jetbrains/kotlin/script/examples/jvm/resolve/maven/scriptDef.kt index 473756ab8ed..a7ba20ed8e4 100644 --- a/libraries/examples/scripting/jvm-maven-deps/script/src/org/jetbrains/kotlin/script/examples/jvm/resolve/maven/scriptDef.kt +++ b/libraries/examples/scripting/jvm-maven-deps/script/src/org/jetbrains/kotlin/script/examples/jvm/resolve/maven/scriptDef.kt @@ -34,9 +34,13 @@ object MyScriptProperties : ScriptingProperties() { "scripting-jvm-maven-deps", // script library jar name "kotlin-script-util" // DependsOn annotation is taken from script-util ) + // variant: dependencies(collectDependenciesFromCurrentContext(... refineConfiguration { + // variant ^: dynamicConfiguration handler(MyConfigurator()) - onAnnotations(DependsOn::class, Repository::class) + triggerOnAnnotations(DependsOn::class, Repository::class) + // variants: onAnnotations, refineOnAnnotations (esp. for dynamicConfiguration), updateOnAnnotations + // other triggers: beforeParsing, onSections } } } diff --git a/libraries/scripting/common/src/kotlin/script/experimental/api/scriptDefinition.kt b/libraries/scripting/common/src/kotlin/script/experimental/api/scriptDefinition.kt index fcdc3502cf7..82b8d48eb41 100644 --- a/libraries/scripting/common/src/kotlin/script/experimental/api/scriptDefinition.kt +++ b/libraries/scripting/common/src/kotlin/script/experimental/api/scriptDefinition.kt @@ -69,31 +69,31 @@ class RefineConfigurationBuilder(props: ScriptingProperties) : PropertiesBuilder props.data[ScriptDefinitionProperties.refineConfigurationHandler] = fn } - fun beforeParsing(value: Boolean = true) { + fun triggerBeforeParsing(value: Boolean = true) { props.data[ScriptDefinitionProperties.refineConfigurationBeforeParsing] = value } - fun onAnnotations(annotations: Iterable) { + fun triggerOnAnnotations(annotations: Iterable) { props.data.addToListProperty(ScriptDefinitionProperties.refineConfigurationOnAnnotations, annotations) } - fun onAnnotations(vararg annotations: KotlinType) { - onAnnotations(annotations.asIterable()) + fun triggerOnAnnotations(vararg annotations: KotlinType) { + triggerOnAnnotations(annotations.asIterable()) } - inline fun onAnnotations() { - onAnnotations(KotlinType(T::class)) + inline fun triggerOnAnnotations() { + triggerOnAnnotations(KotlinType(T::class)) } - fun onAnnotations(vararg annotations: KClass) { - onAnnotations(annotations.map { KotlinType(it) }) + fun triggerOnAnnotations(vararg annotations: KClass) { + triggerOnAnnotations(annotations.map { KotlinType(it) }) } - fun onSections(sections: Iterable) { + fun triggerOnSections(sections: Iterable) { props.data.addToListProperty(ScriptDefinitionProperties.refineConfigurationOnSections, sections) } - fun onSections(vararg sections: String) { + fun triggerOnSections(vararg sections: String) { props.data.addToListProperty(ScriptDefinitionProperties.refineConfigurationOnSections, *sections) } }