From df1a72e107557dafce7a85731b9e5ed9bf08c25e Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Fri, 31 Jul 2015 00:24:09 +0200
Subject: [PATCH] since BuiltInsReferenceResolver is initialized on-demand, we
 can't use async initialization

---
 .../idea/references/BuiltInsReferenceResolver.kt      | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/BuiltInsReferenceResolver.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/BuiltInsReferenceResolver.kt
index 7bca26088f6..a996a0bcb4d 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/BuiltInsReferenceResolver.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/BuiltInsReferenceResolver.kt
@@ -63,7 +63,7 @@ public class BuiltInsReferenceResolver(val project: Project, val startupManager:
 
         val jetBuiltInsFiles = getJetBuiltInsFiles()
 
-        val initializeRunnable = { ->
+        runReadAction {
             val newModuleContext = ContextForNewModule(project, Name.special("<built-ins resolver module>"), ModuleParameters.Empty)
             newModuleContext.setDependencies(newModuleContext.module)
 
@@ -88,15 +88,6 @@ public class BuiltInsReferenceResolver(val project: Project, val startupManager:
             builtinsPackageFragment = fragments.single()
             builtInsSources = jetBuiltInsFiles
         }
-
-        if (ApplicationManager.getApplication().isUnitTestMode()) {
-            initializeRunnable()
-        }
-        else {
-            ApplicationManager.getApplication().executeOnPooledThread {
-                runReadAction { initializeRunnable() }
-            }
-        }
     }
 
     private fun getJetBuiltInsFiles(): Set<JetFile> {