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

KT-60193 scripts: configuration discovery might fail silently (2)

Browse Source 
This commit covers one more case similar to what is described
in the previous commit of the series (c9eebffb).
This commit is contained in:
Andrei Klunnyi
2023-07-13 13:31:05 +02:00
parent 5596c3ae80
commit 2d50bd6857
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/definitions/definitions.kt
+4 -5
View File
@@ -61,11 +61,10 @@ fun VirtualFile.findScriptDefinition(project: Project): ScriptDefinition? {
return findScriptDefinition(project, VirtualFileScriptSource(this)) return findScriptDefinition(project, VirtualFileScriptSource(this))
} }
fun findScriptDefinition(project: Project, script: SourceCode): ScriptDefinition { fun findScriptDefinition(project: Project, script: SourceCode): ScriptDefinition? {
val scriptDefinitionProvider = ScriptDefinitionProvider.getInstance(project) ?: return null val scriptDefinitionProvider = ScriptDefinitionProvider.getInstance(project)
?: throw IllegalStateException("Unable to get script definition: ScriptDefinitionProvider is not configured.") ?: error("Unable to get script definition: ScriptDefinitionProvider is not configured.")
return scriptDefinitionProvider.findDefinition(script)
return scriptDefinitionProvider.findDefinition(script) ?: scriptDefinitionProvider.getDefaultDefinition()
} }
private const val JAVA_CLASS_FILE_TYPE_DOT_DEFAULT_EXTENSION = ".class" private const val JAVA_CLASS_FILE_TYPE_DOT_DEFAULT_EXTENSION = ".class"