[minor] Rename too long named functions
This commit is contained in:
+2
-2
@@ -56,7 +56,7 @@ import kotlin.script.experimental.dependencies.ScriptDependencies
|
|||||||
import kotlin.script.experimental.dependencies.asSuccess
|
import kotlin.script.experimental.dependencies.asSuccess
|
||||||
import kotlin.script.experimental.host.ScriptingHostConfiguration
|
import kotlin.script.experimental.host.ScriptingHostConfiguration
|
||||||
import kotlin.script.experimental.host.configurationDependencies
|
import kotlin.script.experimental.host.configurationDependencies
|
||||||
import kotlin.script.experimental.host.createScriptCompilationConfigurationFromAnnotatedBaseClass
|
import kotlin.script.experimental.host.createCompilationConfigurationFromTemplate
|
||||||
import kotlin.script.experimental.jvm.JvmDependency
|
import kotlin.script.experimental.jvm.JvmDependency
|
||||||
import kotlin.script.experimental.jvm.defaultJvmScriptingEnvironment
|
import kotlin.script.experimental.jvm.defaultJvmScriptingEnvironment
|
||||||
import kotlin.script.experimental.location.ScriptExpectedLocation
|
import kotlin.script.experimental.location.ScriptExpectedLocation
|
||||||
@@ -214,7 +214,7 @@ fun loadDefinitionsFromTemplates(
|
|||||||
configurationDependencies(JvmDependency(classpath))
|
configurationDependencies(JvmDependency(classpath))
|
||||||
}
|
}
|
||||||
KotlinScriptDefinitionAdapterFromNewAPI(
|
KotlinScriptDefinitionAdapterFromNewAPI(
|
||||||
createScriptCompilationConfigurationFromAnnotatedBaseClass(
|
createCompilationConfigurationFromTemplate(
|
||||||
KotlinType(
|
KotlinType(
|
||||||
template
|
template
|
||||||
), hostConfiguration, KotlinScriptDefinition::class
|
), hostConfiguration, KotlinScriptDefinition::class
|
||||||
|
|||||||
+2
-2
@@ -11,11 +11,11 @@ import kotlin.script.experimental.api.EvaluationResult
|
|||||||
import kotlin.script.experimental.api.ResultWithDiagnostics
|
import kotlin.script.experimental.api.ResultWithDiagnostics
|
||||||
import kotlin.script.experimental.host.toScriptSource
|
import kotlin.script.experimental.host.toScriptSource
|
||||||
import kotlin.script.experimental.jvmhost.BasicJvmScriptingHost
|
import kotlin.script.experimental.jvmhost.BasicJvmScriptingHost
|
||||||
import kotlin.script.experimental.jvmhost.createBasicScriptCompilationConfigurationFromAnnotatedBaseClass
|
import kotlin.script.experimental.jvmhost.createCompilationConfigurationFromTemplate
|
||||||
|
|
||||||
fun evalFile(scriptFile: File): ResultWithDiagnostics<EvaluationResult> {
|
fun evalFile(scriptFile: File): ResultWithDiagnostics<EvaluationResult> {
|
||||||
|
|
||||||
val compilationConfiguration = createBasicScriptCompilationConfigurationFromAnnotatedBaseClass<ScriptWithMavenDeps>()
|
val compilationConfiguration = createCompilationConfigurationFromTemplate<ScriptWithMavenDeps>()
|
||||||
|
|
||||||
return BasicJvmScriptingHost().eval(scriptFile.toScriptSource(), compilationConfiguration, null)
|
return BasicJvmScriptingHost().eval(scriptFile.toScriptSource(), compilationConfiguration, null)
|
||||||
}
|
}
|
||||||
|
|||||||
+2
-2
@@ -13,10 +13,10 @@ import kotlin.script.experimental.host.toScriptSource
|
|||||||
import kotlin.script.experimental.jvm.dependenciesFromCurrentContext
|
import kotlin.script.experimental.jvm.dependenciesFromCurrentContext
|
||||||
import kotlin.script.experimental.jvm.jvm
|
import kotlin.script.experimental.jvm.jvm
|
||||||
import kotlin.script.experimental.jvmhost.BasicJvmScriptingHost
|
import kotlin.script.experimental.jvmhost.BasicJvmScriptingHost
|
||||||
import kotlin.script.experimental.jvmhost.createBasicScriptCompilationConfigurationFromAnnotatedBaseClass
|
import kotlin.script.experimental.jvmhost.createCompilationConfigurationFromTemplate
|
||||||
|
|
||||||
fun evalFile(scriptFile: File): ResultWithDiagnostics<EvaluationResult> {
|
fun evalFile(scriptFile: File): ResultWithDiagnostics<EvaluationResult> {
|
||||||
val compilationConfiguration = createBasicScriptCompilationConfigurationFromAnnotatedBaseClass<SimpleScript> {
|
val compilationConfiguration = createCompilationConfigurationFromTemplate<SimpleScript> {
|
||||||
jvm {
|
jvm {
|
||||||
dependenciesFromCurrentContext(
|
dependenciesFromCurrentContext(
|
||||||
"scripting-jvm-simple-script" /* script library jar name */
|
"scripting-jvm-simple-script" /* script library jar name */
|
||||||
|
|||||||
+1
-1
@@ -14,7 +14,7 @@ private const val ERROR_MSG_PREFIX = "Unable to construct script definition: "
|
|||||||
private const val ILLEGAL_CONFIG_ANN_ARG =
|
private const val ILLEGAL_CONFIG_ANN_ARG =
|
||||||
"Illegal argument compilationConfiguration of the KotlinScript annotation: expecting an object or default-constructed class derived from ScriptCompilationConfiguration"
|
"Illegal argument compilationConfiguration of the KotlinScript annotation: expecting an object or default-constructed class derived from ScriptCompilationConfiguration"
|
||||||
|
|
||||||
fun createScriptCompilationConfigurationFromAnnotatedBaseClass(
|
fun createCompilationConfigurationFromTemplate(
|
||||||
baseClassType: KotlinType,
|
baseClassType: KotlinType,
|
||||||
hostConfiguration: ScriptingHostConfiguration,
|
hostConfiguration: ScriptingHostConfiguration,
|
||||||
contextClass: KClass<*> = ScriptCompilationConfiguration::class,
|
contextClass: KClass<*> = ScriptCompilationConfiguration::class,
|
||||||
|
|||||||
+3
-3
@@ -9,7 +9,7 @@ import kotlin.script.experimental.api.KotlinType
|
|||||||
import kotlin.script.experimental.api.ScriptCompilationConfiguration
|
import kotlin.script.experimental.api.ScriptCompilationConfiguration
|
||||||
import kotlin.script.experimental.api.ScriptEvaluator
|
import kotlin.script.experimental.api.ScriptEvaluator
|
||||||
import kotlin.script.experimental.host.ScriptingHostConfiguration
|
import kotlin.script.experimental.host.ScriptingHostConfiguration
|
||||||
import kotlin.script.experimental.host.createScriptCompilationConfigurationFromAnnotatedBaseClass
|
import kotlin.script.experimental.host.createCompilationConfigurationFromTemplate
|
||||||
import kotlin.script.experimental.host.BasicScriptingHost
|
import kotlin.script.experimental.host.BasicScriptingHost
|
||||||
import kotlin.script.experimental.jvm.defaultJvmScriptingEnvironment
|
import kotlin.script.experimental.jvm.defaultJvmScriptingEnvironment
|
||||||
|
|
||||||
@@ -20,10 +20,10 @@ open class BasicJvmScriptingHost(
|
|||||||
) : BasicScriptingHost(compiler, evaluator)
|
) : BasicScriptingHost(compiler, evaluator)
|
||||||
|
|
||||||
|
|
||||||
inline fun <reified T : Any> createBasicScriptCompilationConfigurationFromAnnotatedBaseClass(
|
inline fun <reified T : Any> createCompilationConfigurationFromTemplate(
|
||||||
hostConfiguration: ScriptingHostConfiguration = defaultJvmScriptingEnvironment,
|
hostConfiguration: ScriptingHostConfiguration = defaultJvmScriptingEnvironment,
|
||||||
noinline body: ScriptCompilationConfiguration.Builder.() -> Unit = {}
|
noinline body: ScriptCompilationConfiguration.Builder.() -> Unit = {}
|
||||||
): ScriptCompilationConfiguration = createScriptCompilationConfigurationFromAnnotatedBaseClass(
|
): ScriptCompilationConfiguration = createCompilationConfigurationFromTemplate(
|
||||||
KotlinType(T::class),
|
KotlinType(T::class),
|
||||||
hostConfiguration,
|
hostConfiguration,
|
||||||
ScriptCompilationConfiguration::class,
|
ScriptCompilationConfiguration::class,
|
||||||
|
|||||||
+2
-2
@@ -17,7 +17,7 @@ import kotlin.script.experimental.annotations.KotlinScript
|
|||||||
import kotlin.script.experimental.api.*
|
import kotlin.script.experimental.api.*
|
||||||
import kotlin.script.experimental.host.ScriptingHostConfiguration
|
import kotlin.script.experimental.host.ScriptingHostConfiguration
|
||||||
import kotlin.script.experimental.host.configurationDependencies
|
import kotlin.script.experimental.host.configurationDependencies
|
||||||
import kotlin.script.experimental.host.createScriptCompilationConfigurationFromAnnotatedBaseClass
|
import kotlin.script.experimental.host.createCompilationConfigurationFromTemplate
|
||||||
import kotlin.script.experimental.jvm.JvmDependency
|
import kotlin.script.experimental.jvm.JvmDependency
|
||||||
import kotlin.script.experimental.jvm.defaultJvmScriptingEnvironment
|
import kotlin.script.experimental.jvm.defaultJvmScriptingEnvironment
|
||||||
|
|
||||||
@@ -47,7 +47,7 @@ class LazyScriptDefinitionFromDiscoveredClass internal constructor(
|
|||||||
"Configure scripting: loading script definition class $className using classpath $classpath\n. ${Thread.currentThread().stackTrace}"
|
"Configure scripting: loading script definition class $className using classpath $classpath\n. ${Thread.currentThread().stackTrace}"
|
||||||
)
|
)
|
||||||
try {
|
try {
|
||||||
createScriptCompilationConfigurationFromAnnotatedBaseClass(
|
createCompilationConfigurationFromTemplate(
|
||||||
KotlinType(className),
|
KotlinType(className),
|
||||||
hostConfiguration,
|
hostConfiguration,
|
||||||
LazyScriptDefinitionFromDiscoveredClass::class
|
LazyScriptDefinitionFromDiscoveredClass::class
|
||||||
|
|||||||
+2
-2
@@ -18,7 +18,7 @@ import java.util.jar.JarFile
|
|||||||
import kotlin.coroutines.experimental.buildSequence
|
import kotlin.coroutines.experimental.buildSequence
|
||||||
import kotlin.script.experimental.annotations.KotlinScript
|
import kotlin.script.experimental.annotations.KotlinScript
|
||||||
import kotlin.script.experimental.api.KotlinType
|
import kotlin.script.experimental.api.KotlinType
|
||||||
import kotlin.script.experimental.host.createScriptCompilationConfigurationFromAnnotatedBaseClass
|
import kotlin.script.experimental.host.createCompilationConfigurationFromTemplate
|
||||||
import kotlin.script.experimental.jvm.defaultJvmScriptingEnvironment
|
import kotlin.script.experimental.jvm.defaultJvmScriptingEnvironment
|
||||||
import kotlin.script.templates.ScriptTemplateDefinition
|
import kotlin.script.templates.ScriptTemplateDefinition
|
||||||
|
|
||||||
@@ -274,7 +274,7 @@ private fun loadScriptDefinition(
|
|||||||
if (cls.annotations.firstIsInstanceOrNull<KotlinScript>() != null) {
|
if (cls.annotations.firstIsInstanceOrNull<KotlinScript>() != null) {
|
||||||
val environment = defaultJvmScriptingEnvironment
|
val environment = defaultJvmScriptingEnvironment
|
||||||
KotlinScriptDefinitionAdapterFromNewAPI(
|
KotlinScriptDefinitionAdapterFromNewAPI(
|
||||||
createScriptCompilationConfigurationFromAnnotatedBaseClass(
|
createCompilationConfigurationFromTemplate(
|
||||||
KotlinType(cls.kotlin),
|
KotlinType(cls.kotlin),
|
||||||
environment,
|
environment,
|
||||||
KotlinScriptDefinition::class
|
KotlinScriptDefinition::class
|
||||||
|
|||||||
Reference in New Issue
Block a user