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
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 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