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

Correctly check for project disposed (EA-103064)

Browse Source
This commit is contained in:
Dmitry Jemerov
2017-08-28 14:11:42 +02:00
parent ac3beabf43
commit cc5d23440e
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinInProjectUtils.kt
+4 -6
View File
@@ -109,18 +109,16 @@ fun isModuleConfigured(moduleSourceRootGroup: ModuleSourceRootGroup): Boolean {
}
fun getModulesWithKotlinFiles(project: Project): Collection<Module> {
if (project.isDisposed) {
return emptyList()
}
if (!runReadAction { FileTypeIndex.containsFileOfType (KotlinFileType.INSTANCE, GlobalSearchScope.projectScope(project)) }) {
if (!runReadAction {
!project.isDisposed && FileTypeIndex.containsFileOfType (KotlinFileType.INSTANCE, GlobalSearchScope.projectScope(project))
}) {
return emptyList()
}
return project.allModules()
.filter { module ->
runReadAction {
FileTypeIndex.containsFileOfType(KotlinFileType.INSTANCE, module.getModuleScope(true))
!project.isDisposed && FileTypeIndex.containsFileOfType(KotlinFileType.INSTANCE, module.getModuleScope(true))
}
}
}