From 2e657d0d345f7372c5cabf78fe9575dd4071795d Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Thu, 19 Mar 2015 18:28:05 +0300 Subject: [PATCH] Use lazy initialization for built-ins in tests --- .../kotlin/idea/references/BuiltInsReferenceResolver.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/BuiltInsReferenceResolver.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/BuiltInsReferenceResolver.java index 1e67cf1acf7..ccc88ed9ead 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/BuiltInsReferenceResolver.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/BuiltInsReferenceResolver.java @@ -113,7 +113,10 @@ public class BuiltInsReferenceResolver extends AbstractProjectComponent { module.initialize(injectorForLazyResolve.getResolveSession().getPackageFragmentProvider()); - injectorForLazyResolve.getResolveSession().forceResolveAll(); + if (!ApplicationManager.getApplication().isUnitTestMode()) { + // Use lazy initialization in tests + injectorForLazyResolve.getResolveSession().forceResolveAll(); + } List fragments = module.getPackageFragmentProvider().getPackageFragments(KotlinBuiltIns.BUILT_INS_PACKAGE_FQ_NAME);