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

Return null on directories in script definition wrappers for files

Browse Source
This commit is contained in:
Ilya Chernikov
2018-05-02 20:03:08 +02:00
parent 9eab7a627d
commit d4070cc4d7
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/psi/src/org/jetbrains/kotlin/script/KotlinScriptDefinitionProvider.kt
+8 -6
View File
@@ -36,16 +36,18 @@ interface ScriptDefinitionProvider {
} }
} }
fun ScriptDefinitionProvider.findScriptDefinition(file: VirtualFile): KotlinScriptDefinition? { fun ScriptDefinitionProvider.findScriptDefinition(file: VirtualFile): KotlinScriptDefinition? =
assert(!file.isDirectory) { "Do not expect directory in findScriptDefinition call: $file" } if (file.isDirectory) null
return findScriptDefinition(file.name) else findScriptDefinition(file.name)
}
fun getScriptDefinition(file: VirtualFile, project: Project): KotlinScriptDefinition? = 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? = 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 { abstract class LazyScriptDefinitionProvider : ScriptDefinitionProvider {