From 5efd55f530af7eaea7538d58f4d9f38ba40be220 Mon Sep 17 00:00:00 2001 From: Andrey Uskov Date: Thu, 6 Jun 2019 14:52:40 +0300 Subject: [PATCH] Fix memory leak on project reimport #KT-31843 Fixed --- .../jetbrains/kotlin/idea/configuration/KotlinMPPDataNodes.kt | 3 --- .../idea/configuration/KotlinMPPGradleProjectResolver.kt | 1 - 2 files changed, 4 deletions(-) diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinMPPDataNodes.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinMPPDataNodes.kt index 60e87ca87f0..631fcf9905a 100644 --- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinMPPDataNodes.kt +++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinMPPDataNodes.kt @@ -24,9 +24,6 @@ import com.intellij.openapi.externalSystem.model.Key as ExternalKey var DataNode.kotlinSourceSet: KotlinSourceSetInfo? by CopyableDataNodeUserDataProperty(Key.create("KOTLIN_SOURCE_SET")) -var DataNode.kotlinTargetDataNode: DataNode? - by CopyableDataNodeUserDataProperty(Key.create("KOTLIN_TARGET_DATA_NODE")) - val DataNode.kotlinAndroidSourceSets: List? get() = ExternalSystemApiUtil.getChildren(this, KotlinAndroidSourceSetData.KEY).firstOrNull()?.data?.sourceSetInfos diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinMPPGradleProjectResolver.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinMPPGradleProjectResolver.kt index bf923b43bc3..94206b9b20b 100644 --- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinMPPGradleProjectResolver.kt +++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinMPPGradleProjectResolver.kt @@ -241,7 +241,6 @@ open class KotlinMPPGradleProjectResolver : AbstractProjectResolverExtension() { val compilationDataNode = (existingSourceSetDataNode ?: mainModuleNode.createChild(GradleSourceSetData.KEY, compilationData)).also { it.kotlinSourceSet = kotlinSourceSet - it.kotlinTargetDataNode = targetDataNode } if (existingSourceSetDataNode == null) { sourceSetMap[moduleId] = Pair(compilationDataNode, createExternalSourceSet(compilation, compilationData))