From d4070cc4d7ae98d25730e5e957e1ad9b1bf5a294 Mon Sep 17 00:00:00 2001 From: Ilya Chernikov Date: Wed, 2 May 2018 20:03:08 +0200 Subject: [PATCH] Return null on directories in script definition wrappers for files --- .../script/KotlinScriptDefinitionProvider.kt | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/compiler/psi/src/org/jetbrains/kotlin/script/KotlinScriptDefinitionProvider.kt b/compiler/psi/src/org/jetbrains/kotlin/script/KotlinScriptDefinitionProvider.kt index 02a22242b40..86ff5a3349e 100644 --- a/compiler/psi/src/org/jetbrains/kotlin/script/KotlinScriptDefinitionProvider.kt +++ b/compiler/psi/src/org/jetbrains/kotlin/script/KotlinScriptDefinitionProvider.kt @@ -36,16 +36,18 @@ interface ScriptDefinitionProvider { } } -fun ScriptDefinitionProvider.findScriptDefinition(file: VirtualFile): KotlinScriptDefinition? { - assert(!file.isDirectory) { "Do not expect directory in findScriptDefinition call: $file" } - return findScriptDefinition(file.name) -} +fun ScriptDefinitionProvider.findScriptDefinition(file: VirtualFile): KotlinScriptDefinition? = + if (file.isDirectory) null + else findScriptDefinition(file.name) + fun getScriptDefinition(file: VirtualFile, project: Project): KotlinScriptDefinition? = - ScriptDefinitionProvider.getInstance(project).findScriptDefinition(file) + if (file.isDirectory) null + else ScriptDefinitionProvider.getInstance(project).findScriptDefinition(file) fun getScriptDefinition(psiFile: PsiFile): KotlinScriptDefinition? = - ScriptDefinitionProvider.getInstance(psiFile.project).findScriptDefinition(psiFile.name) + if (psiFile.isDirectory) null + else ScriptDefinitionProvider.getInstance(psiFile.project).findScriptDefinition(psiFile.name) abstract class LazyScriptDefinitionProvider : ScriptDefinitionProvider {