From 2d50bd6857f5f76f85097a1af9972ffd6e244aa7 Mon Sep 17 00:00:00 2001 From: Andrei Klunnyi Date: Thu, 13 Jul 2023 13:31:05 +0200 Subject: [PATCH] KT-60193 scripts: configuration discovery might fail silently (2) This commit covers one more case similar to what is described in the previous commit of the series (c9eebffb). --- .../kotlin/scripting/definitions/definitions.kt | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/definitions/definitions.kt b/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/definitions/definitions.kt index 37daf9002a6..72f8954cfad 100644 --- a/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/definitions/definitions.kt +++ b/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/definitions/definitions.kt @@ -61,11 +61,10 @@ fun VirtualFile.findScriptDefinition(project: Project): ScriptDefinition? { return findScriptDefinition(project, VirtualFileScriptSource(this)) } -fun findScriptDefinition(project: Project, script: SourceCode): ScriptDefinition { - val scriptDefinitionProvider = ScriptDefinitionProvider.getInstance(project) ?: return null - ?: throw IllegalStateException("Unable to get script definition: ScriptDefinitionProvider is not configured.") - - return scriptDefinitionProvider.findDefinition(script) ?: scriptDefinitionProvider.getDefaultDefinition() +fun findScriptDefinition(project: Project, script: SourceCode): ScriptDefinition? { + val scriptDefinitionProvider = ScriptDefinitionProvider.getInstance(project) + ?: error("Unable to get script definition: ScriptDefinitionProvider is not configured.") + return scriptDefinitionProvider.findDefinition(script) } private const val JAVA_CLASS_FILE_TYPE_DOT_DEFAULT_EXTENSION = ".class"