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

EA-209576: Fix access to disposed module in gradle importer

Browse Source
This commit is contained in:
Ilya Kirillov
2019-12-05 17:37:25 +03:00
parent 2b6a0d6c58
commit af6d5b76f5
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleSourceSetDataService.kt
+3 -2
View File
@@ -94,9 +94,10 @@ class KotlinGradleProjectSettingsDataService : AbstractProjectDataService<Projec
project: Project, project: Project,
modelsProvider: IdeModifiableModelsProvider modelsProvider: IdeModifiableModelsProvider
) { ) {
val allSettings = modelsProvider.modules.mapNotNull { val allSettings = modelsProvider.modules.mapNotNull { module ->
if (module.isDisposed) return@mapNotNull null
val settings = modelsProvider val settings = modelsProvider
.getModifiableFacetModel(it) .getModifiableFacetModel(module)
.findFacet(KotlinFacetType.TYPE_ID, KotlinFacetType.INSTANCE.defaultFacetName) .findFacet(KotlinFacetType.TYPE_ID, KotlinFacetType.INSTANCE.defaultFacetName)
?.configuration ?.configuration
?.settings ?: return@mapNotNull null ?.settings ?: return@mapNotNull null