From a3217982f7414eb54aefdee7f8045efbb2d653be Mon Sep 17 00:00:00 2001 From: Ilya Chernikov Date: Fri, 14 Dec 2018 17:58:51 +0100 Subject: [PATCH] Fix script filename extension discovery from asm-readed class and improve diagnostics on definition loading failure --- .../plugin/LazyScriptDefinitionFromDiscoveredClass.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/scripting/scripting-cli/src/org/jetbrains/kotlin/scripting/compiler/plugin/LazyScriptDefinitionFromDiscoveredClass.kt b/plugins/scripting/scripting-cli/src/org/jetbrains/kotlin/scripting/compiler/plugin/LazyScriptDefinitionFromDiscoveredClass.kt index a9d90fb421e..aa741da96d7 100644 --- a/plugins/scripting/scripting-cli/src/org/jetbrains/kotlin/scripting/compiler/plugin/LazyScriptDefinitionFromDiscoveredClass.kt +++ b/plugins/scripting/scripting-cli/src/org/jetbrains/kotlin/scripting/compiler/plugin/LazyScriptDefinitionFromDiscoveredClass.kt @@ -58,7 +58,7 @@ class LazyScriptDefinitionFromDiscoveredClass internal constructor( } catch (ex: Exception) { messageCollector.report( CompilerMessageSeverity.ERROR, - "Error processing script definition class $className: ${ex.message}" + "Error processing script definition class $className: ${ex.message}\nclasspath:\n${classpath.joinToString("\n", " ")}" ) InvalidScriptDefinition } @@ -66,7 +66,7 @@ class LazyScriptDefinitionFromDiscoveredClass internal constructor( override val fileExtension: String by lazy(LazyThreadSafetyMode.PUBLICATION) { annotationsFromAsm.find { it.name == KotlinScript::class.simpleName }?.args - ?.find { it.name == "extension" }?.value + ?.find { it.name == "fileExtension" }?.value ?: scriptCompilationConfiguration.let { it[ScriptCompilationConfiguration.fileExtension] ?: super.fileExtension }