since BuiltInsReferenceResolver is initialized on-demand, we can't use async initialization
This commit is contained in:
+1
-10
@@ -63,7 +63,7 @@ public class BuiltInsReferenceResolver(val project: Project, val startupManager:
|
|||||||
|
|
||||||
val jetBuiltInsFiles = getJetBuiltInsFiles()
|
val jetBuiltInsFiles = getJetBuiltInsFiles()
|
||||||
|
|
||||||
val initializeRunnable = { ->
|
runReadAction {
|
||||||
val newModuleContext = ContextForNewModule(project, Name.special("<built-ins resolver module>"), ModuleParameters.Empty)
|
val newModuleContext = ContextForNewModule(project, Name.special("<built-ins resolver module>"), ModuleParameters.Empty)
|
||||||
newModuleContext.setDependencies(newModuleContext.module)
|
newModuleContext.setDependencies(newModuleContext.module)
|
||||||
|
|
||||||
@@ -88,15 +88,6 @@ public class BuiltInsReferenceResolver(val project: Project, val startupManager:
|
|||||||
builtinsPackageFragment = fragments.single()
|
builtinsPackageFragment = fragments.single()
|
||||||
builtInsSources = jetBuiltInsFiles
|
builtInsSources = jetBuiltInsFiles
|
||||||
}
|
}
|
||||||
|
|
||||||
if (ApplicationManager.getApplication().isUnitTestMode()) {
|
|
||||||
initializeRunnable()
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
ApplicationManager.getApplication().executeOnPooledThread {
|
|
||||||
runReadAction { initializeRunnable() }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun getJetBuiltInsFiles(): Set<JetFile> {
|
private fun getJetBuiltInsFiles(): Set<JetFile> {
|
||||||
|
|||||||
Reference in New Issue
Block a user