From efa03e7ad8b7aebc1fb01fd59619d0d473d5776e Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Fri, 24 Mar 2017 15:16:27 +0100
Subject: [PATCH] Fix project leaks in tests

---
 .../idea/configuration/KotlinWithLibraryConfigurator.java | 3 +++
 ...bstractKotlinTypeAliasByExpansionShortNameIndexTest.kt | 8 +++++++-
 .../kotlin/idea/caches/KotlinShortNamesCacheTest.kt       | 4 +++-
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinWithLibraryConfigurator.java b/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinWithLibraryConfigurator.java
index 13167f60107..9d305c46df0 100644
--- a/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinWithLibraryConfigurator.java
+++ b/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinWithLibraryConfigurator.java
@@ -110,6 +110,9 @@ public abstract class KotlinWithLibraryConfigurator implements KotlinProjectConf
                 dialog.show();
                 if (!dialog.isOK()) return;
             }
+            else {
+                dialog.close(0);
+            }
 
             modulesToConfigure = dialog.getModulesToConfigure();
             copyLibraryIntoPath = dialog.getCopyIntoPath();
diff --git a/idea/tests/org/jetbrains/kotlin/idea/AbstractKotlinTypeAliasByExpansionShortNameIndexTest.kt b/idea/tests/org/jetbrains/kotlin/idea/AbstractKotlinTypeAliasByExpansionShortNameIndexTest.kt
index 9cad04dca47..8d1788013e0 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/AbstractKotlinTypeAliasByExpansionShortNameIndexTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/AbstractKotlinTypeAliasByExpansionShortNameIndexTest.kt
@@ -22,6 +22,7 @@ import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase
 import org.jetbrains.kotlin.test.InTextDirectivesUtils
 import org.jetbrains.kotlin.test.KotlinTestUtils
 import org.junit.Assert
+import kotlin.reflect.KMutableProperty0
 
 abstract class AbstractKotlinTypeAliasByExpansionShortNameIndexTest : KotlinLightCodeInsightFixtureTestCase() {
 
@@ -30,13 +31,18 @@ abstract class AbstractKotlinTypeAliasByExpansionShortNameIndexTest : KotlinLigh
         return KotlinTestUtils.getHomeDirectory() + "/"
     }
 
-    lateinit var scope: GlobalSearchScope
+    private lateinit var scope: GlobalSearchScope
 
     override fun setUp() {
         super.setUp()
         scope = GlobalSearchScope.allScope(project)
     }
 
+    override fun tearDown() {
+        (this::scope as KMutableProperty0<GlobalSearchScope?>).set(null)
+        super.tearDown()
+    }
+
     override fun getProjectDescriptor() = super.getProjectDescriptorFromTestName()
 
     fun doTest(file: String) {
diff --git a/idea/tests/org/jetbrains/kotlin/idea/caches/KotlinShortNamesCacheTest.kt b/idea/tests/org/jetbrains/kotlin/idea/caches/KotlinShortNamesCacheTest.kt
index f7cfd73a64c..45492eef3f6 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/caches/KotlinShortNamesCacheTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/caches/KotlinShortNamesCacheTest.kt
@@ -33,10 +33,11 @@ import org.jetbrains.kotlin.load.java.JvmAbi
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.psi.KtProperty
 import org.jetbrains.kotlin.test.KotlinTestUtils
+import kotlin.reflect.KMutableProperty0
 
 class KotlinShortNamesCacheTest : KotlinCodeInsightTestCase() {
 
-    lateinit var cacheInstance: PsiShortNamesCache
+    private lateinit var cacheInstance: PsiShortNamesCache
 
     override fun setUp() {
         super.setUp()
@@ -45,6 +46,7 @@ class KotlinShortNamesCacheTest : KotlinCodeInsightTestCase() {
     }
 
     override fun tearDown() {
+        (this::cacheInstance as KMutableProperty0<GlobalSearchScope?>).set(null)
         ConfigLibraryUtil.unConfigureKotlinRuntimeAndSdk(myModule, testProjectJdk)
         super.tearDown()