[RESTORED] Spring Support: Implement Spring-specific references

idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/KotlinFixtureCompletionBaseTestCase.kt

@@ -36,13 +36,18 @@ abstract class KotlinFixtureCompletionBaseTestCase : KotlinLightCodeInsightFixtu
     open fun doTest(testPath: String) {
         setUpFixture(testPath)
 
-        val fileText = FileUtil.loadFile(File(testPath), true)
+        try {
+            val fileText = FileUtil.loadFile(File(testPath), true)
 
-        if (ExpectedCompletionUtils.shouldRunHighlightingBeforeCompletion(fileText)) {
-            myFixture.doHighlighting()
+            if (ExpectedCompletionUtils.shouldRunHighlightingBeforeCompletion(fileText)) {
+                myFixture.doHighlighting()
+            }
+
+            testCompletion(fileText, getPlatform(), { completionType, count -> complete(completionType, count) }, defaultCompletionType(), defaultInvocationCount())
+        }
+        finally {
+            tearDownFixture()
         }
-
-        testCompletion(fileText, getPlatform(), { completionType, count -> complete(completionType, count) }, defaultCompletionType(), defaultInvocationCount())
     }
 
     protected open fun setUpFixture(testPath: String) {
@@ -51,4 +56,8 @@ abstract class KotlinFixtureCompletionBaseTestCase : KotlinLightCodeInsightFixtu
 
         myFixture.configureByFile(testPath)
     }
+
+    protected open fun tearDownFixture() {
+
+    }
 }

idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/handlers/AbstractCompletionHandlerTests.kt

@@ -73,6 +73,7 @@ abstract class AbstractCompletionHandlerTest(private val defaultCompletionType:
         }
         finally {
             settingManager.dropTemporarySettings()
+            tearDownFixture()
         }
     }
 
@@ -80,6 +81,10 @@ abstract class AbstractCompletionHandlerTest(private val defaultCompletionType:
         fixture.configureByFile(testPath)
     }
 
+    protected open fun tearDownFixture() {
+
+    }
+
     override fun getProjectDescriptor() = KotlinWithJdkAndRuntimeLightProjectDescriptor.INSTANCE
 }