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

Minor: reformat and rearrange code

Browse Source
This commit is contained in:
Natalia Selezneva
2018-10-12 12:29:46 +03:00
parent a5bcd3495e
commit daa6e9b562
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/psi/src/org/jetbrains/kotlin/script/KotlinScriptDefinitionProvider.kt
+7 -3
View File
@@ -43,8 +43,12 @@ interface ScriptDefinitionProvider {
} }
fun findScriptDefinition(file: VirtualFile, project: Project): KotlinScriptDefinition? { fun findScriptDefinition(file: VirtualFile, project: Project): KotlinScriptDefinition? {
if (file.isDirectory) return null if (file.isDirectory ||
if (file.extension == KotlinFileType.EXTENSION || file.extension == JavaClassFileType.INSTANCE.defaultExtension) return null file.extension == KotlinFileType.EXTENSION ||
file.extension == JavaClassFileType.INSTANCE.defaultExtension
) {
return null
}
val psiFile = PsiManager.getInstance(project).findFile(file) val psiFile = PsiManager.getInstance(project).findFile(file)
if (psiFile != null) { if (psiFile != null) {
@@ -85,7 +89,7 @@ abstract class LazyScriptDefinitionProvider : ScriptDefinitionProvider {
} }
protected open fun nonScriptFileName(fileName: String) = nonScriptFilenameSuffixes.any { protected open fun nonScriptFileName(fileName: String) = nonScriptFilenameSuffixes.any {
fileName.endsWith( it, ignoreCase = true) fileName.endsWith(it, ignoreCase = true)
} }
override fun findScriptDefinition(fileName: String): KotlinScriptDefinition? = override fun findScriptDefinition(fileName: String): KotlinScriptDefinition? =