jlengrand/kotlin
1
0
Fork 0
mirror of https://github.com/jlengrand/kotlin.git synced 2026-05-18 00:21:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Grand refactoring of the scripting DSL + many minor usability refactorings around it

Browse Source
This commit is contained in:
Ilya Chernikov
2018-07-30 17:55:13 +02:00
parent 45eaca1290
commit 74f8a541c0
41 changed files with 655 additions and 619 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
plugins/scripting/scripting-cli/src/org/jetbrains/kotlin/scripting/compiler/plugin/KotlinScriptDefinitionAdapterFromNewAPI.kt
View File

@@ -18,6 +18,8 @@ import kotlin.script.experimental.api.*
import kotlin.script.experimental.dependencies.DependenciesResolver
import kotlin.script.experimental.jvm.impl.BridgeDependenciesResolver
import kotlin.script.experimental.location.ScriptExpectedLocation
import kotlin.script.experimental.util.getOrError
import kotlin.script.experimental.util.getOrNull
// temporary trick with passing Any as a template and overwriting it below, TODO: fix after introducing new script definitions hierarchy
abstract class KotlinScriptDefinitionAdapterFromNewAPIBase : KotlinScriptDefinition(Any::class) {
@@ -29,13 +31,13 @@ abstract class KotlinScriptDefinitionAdapterFromNewAPIBase : KotlinScriptDefinit
abstract val scriptFileExtensionWithDot: String
open val baseClass: KClass<*> by lazy(LazyThreadSafetyMode.PUBLICATION) {
getScriptingClass(scriptDefinition[ScriptDefinitionProperties.baseClass])
getScriptingClass(scriptDefinition.getOrError(ScriptDefinition.baseClass))
}
override val template: KClass<*> get() = baseClass
override val name: String
get() = scriptDefinition.getOrNull(ScriptDefinitionProperties.name) ?: "Kotlin Script"
get() = scriptDefinition.getOrNull(ScriptDefinition.name) ?: "Kotlin Script"
override val fileType: LanguageFileType = KotlinFileType.INSTANCE
@@ -51,28 +53,28 @@ abstract class KotlinScriptDefinitionAdapterFromNewAPIBase : KotlinScriptDefinit
get() = emptyList()
override val dependencyResolver: DependenciesResolver by lazy(LazyThreadSafetyMode.PUBLICATION) {
BridgeDependenciesResolver(scriptDefinition, scriptDefinition)
BridgeDependenciesResolver(scriptDefinition, null)
}
override val acceptedAnnotations: List<KClass<out Annotation>> by lazy(LazyThreadSafetyMode.PUBLICATION) {
scriptDefinition.getOrNull(ScriptDefinitionProperties.refineConfigurationOnAnnotations)
scriptDefinition.getOrNull(ScriptDefinition.refineConfigurationOnAnnotations)
.orEmpty()
.map { getScriptingClass(it) as KClass<out Annotation> }
}
override val implicitReceivers: List<KType> by lazy(LazyThreadSafetyMode.PUBLICATION) {
scriptDefinition.getOrNull(ScriptDefinitionProperties.scriptImplicitReceivers)
scriptDefinition.getOrNull(ScriptDefinition.scriptImplicitReceivers)
.orEmpty()
.map { getScriptingClass(it).starProjectedType }
}
override val environmentVariables: List<Pair<String, KType>> by lazy(LazyThreadSafetyMode.PUBLICATION) {
scriptDefinition.getOrNull(ScriptDefinitionProperties.contextVariables)
scriptDefinition.getOrNull(ScriptDefinition.contextVariables)
?.map { (k, v) -> k to getScriptingClass(v).starProjectedType }.orEmpty()
}
override val additionalCompilerArguments: List<String>
get() = scriptDefinition.getOrNull(ScriptDefinitionProperties.compilerOptions)
get() = scriptDefinition.getOrNull(ScriptDefinition.compilerOptions)
.orEmpty()
override val scriptExpectedLocations: List<ScriptExpectedLocation> =
@@ -82,15 +84,15 @@ abstract class KotlinScriptDefinitionAdapterFromNewAPIBase : KotlinScriptDefinit
)
override val targetClassAnnotations: List<Annotation>
get() = scriptDefinition.getOrNull(ScriptDefinitionProperties.generatedClassAnnotations)
get() = scriptDefinition.getOrNull(ScriptDefinition.generatedClassAnnotations)
.orEmpty()
override val targetMethodAnnotations: List<Annotation>
get() = scriptDefinition.getOrNull(ScriptDefinitionProperties.generatedMethodAnnotations)
get() = scriptDefinition.getOrNull(ScriptDefinition.generatedMethodAnnotations)
.orEmpty()
private val scriptingClassGetter by lazy(LazyThreadSafetyMode.PUBLICATION) {
hostEnvironment.getOrNull(ScriptingEnvironmentProperties.getScriptingClass)
hostEnvironment.getOrNull(ScriptingEnvironment.getScriptingClass)
?: throw IllegalArgumentException("Expecting 'getScriptingClass' property in the scripting environment")
}
@@ -98,7 +100,7 @@ abstract class KotlinScriptDefinitionAdapterFromNewAPIBase : KotlinScriptDefinit
scriptingClassGetter(
type,
KotlinScriptDefinition::class, // Assuming that the KotlinScriptDefinition class is loaded in the proper classloader
scriptDefinition
hostEnvironment
)
}
@@ -108,8 +110,8 @@ class KotlinScriptDefinitionAdapterFromNewAPI(
override val hostEnvironment: ScriptingEnvironment
) : KotlinScriptDefinitionAdapterFromNewAPIBase() {
override val name: String get() = scriptDefinition.getOrNull(ScriptDefinitionProperties.name) ?: super.name
override val name: String get() = scriptDefinition.getOrNull(ScriptDefinition.name) ?: super.name
override val scriptFileExtensionWithDot =
"." + (scriptDefinition.getOrNull(ScriptDefinitionProperties.fileExtension) ?: "kts")
"." + (scriptDefinition.getOrNull(ScriptDefinition.fileExtension) ?: "kts")
}

13
plugins/scripting/scripting-cli/src/org/jetbrains/kotlin/scripting/compiler/plugin/LazyScriptDefinitionFromDiscoveredClass.kt
View File

@@ -19,6 +19,7 @@ import kotlin.script.experimental.api.*
import kotlin.script.experimental.definitions.createScriptDefinitionFromAnnotatedBaseClass
import kotlin.script.experimental.jvm.JvmDependency
import kotlin.script.experimental.jvm.defaultJvmScriptingEnvironment
import kotlin.script.experimental.util.getOrNull
class LazyScriptDefinitionFromDiscoveredClass internal constructor(
private val annotationsFromAsm: ArrayList<BinAnnData>,
@@ -35,10 +36,10 @@ class LazyScriptDefinitionFromDiscoveredClass internal constructor(
) : this(loadAnnotationsFromClass(classBytes), className, classpath, messageCollector)
override val hostEnvironment: ScriptingEnvironment by lazy(LazyThreadSafetyMode.PUBLICATION) {
ScriptingEnvironment(
defaultJvmScriptingEnvironment,
ScriptingEnvironmentProperties.configurationDependencies to listOf(JvmDependency(classpath))
)
ScriptingEnvironment.create {
include(defaultJvmScriptingEnvironment)
configurationDependencies(JvmDependency(classpath))
}
}
override val scriptDefinition: ScriptDefinition by lazy(LazyThreadSafetyMode.PUBLICATION) {
@@ -69,7 +70,7 @@ class LazyScriptDefinitionFromDiscoveredClass internal constructor(
// TODO: check whether it actually works
?: annotationsFromAsm.find { it.name == KotlinScript::class.simpleName }?.args?.get(1)
?: scriptDefinition.let {
it.getOrNull(ScriptDefinitionProperties.fileExtension) ?: "kts"
it.getOrNull(ScriptDefinition.fileExtension) ?: "kts"
}
".$ext"
}
@@ -80,4 +81,4 @@ class LazyScriptDefinitionFromDiscoveredClass internal constructor(
}
}
object InvalidScriptDefinition : ScriptDefinition()
object InvalidScriptDefinition : ScriptDefinition