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

Change default for script displayName parameter to empty, generate name from base class in definition

Browse Source
This commit is contained in:
Ilya Chernikov
2019-07-11 14:57:16 +02:00
committed by Natalia Selezneva
parent 0cc40440fb
commit bd50454a73
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/scripting/common/src/kotlin/script/experimental/annotations/scriptAnnotations.kt
+2 -2
View File
@@ -21,7 +21,7 @@ import kotlin.script.experimental.api.ScriptEvaluationConfiguration
* optimal discovery and definitions loading performance. * optimal discovery and definitions loading performance.
* *
* @param displayName script definition display name, stored as {@link ScriptCompilationConfigurationKeys#displayName}, * @param displayName script definition display name, stored as {@link ScriptCompilationConfigurationKeys#displayName},
* default - "Kotlin script" * default - empty - use annotated class name
* @param fileExtension distinct filename extension for the script type being defined, stored in the configuration * @param fileExtension distinct filename extension for the script type being defined, stored in the configuration
* as {@link ScriptCompilationConfigurationKeys#fileExtension}, * as {@link ScriptCompilationConfigurationKeys#fileExtension},
* default - "kts" * default - "kts"
@@ -48,7 +48,7 @@ import kotlin.script.experimental.api.ScriptEvaluationConfiguration
@Target(AnnotationTarget.CLASS) @Target(AnnotationTarget.CLASS)
@Retention(AnnotationRetention.RUNTIME) @Retention(AnnotationRetention.RUNTIME)
annotation class KotlinScript( annotation class KotlinScript(
val displayName: String = "Kotlin script", val displayName: String = "",
val fileExtension: String = "kts", val fileExtension: String = "kts",
val filePathPattern: String = "", val filePathPattern: String = "",
val compilationConfiguration: KClass<out ScriptCompilationConfiguration> = ScriptCompilationConfiguration.Default::class, val compilationConfiguration: KClass<out ScriptCompilationConfiguration> = ScriptCompilationConfiguration.Default::class,
libraries/scripting/common/src/kotlin/script/experimental/api/scriptCompilation.kt
+1 -1
View File
@@ -55,7 +55,7 @@ fun ScriptCompilationConfiguration?.with(body: ScriptCompilationConfiguration.Bu
/** /**
* The script type display name * The script type display name
*/ */
val ScriptCompilationConfigurationKeys.displayName by PropertiesCollection.key<String>("Kotlin script") val ScriptCompilationConfigurationKeys.displayName by PropertiesCollection.key<String>()
/** /**
* The script filename extension * The script filename extension
plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/definitions/ScriptDefinition.kt
+4 -1
View File
@@ -132,7 +132,10 @@ abstract class ScriptDefinition : UserDataHolderBase() {
override val fileExtension: String get() = compilationConfiguration[ScriptCompilationConfiguration.fileExtension]!! override val fileExtension: String get() = compilationConfiguration[ScriptCompilationConfiguration.fileExtension]!!
override val name: String get() = compilationConfiguration[ScriptCompilationConfiguration.displayName]!! override val name: String
get() =
compilationConfiguration[ScriptCompilationConfiguration.displayName]?.takeIf { it.isNotBlank() }
?: compilationConfiguration[ScriptCompilationConfiguration.baseClass]!!.typeName.substringAfterLast('.')
override val definitionId: String get() = compilationConfiguration[ScriptCompilationConfiguration.baseClass]!!.typeName override val definitionId: String get() = compilationConfiguration[ScriptCompilationConfiguration.baseClass]!!.typeName