From 07f7a35bc93380fb9c46cd60477e3d208728b937 Mon Sep 17 00:00:00 2001
From: Valentin Kipyatkov <valentin@jetbrains.com>
Date: Fri, 21 Nov 2014 22:44:36 +0300
Subject: [PATCH] Finally turned on non-imported extensions completion
 optimization as new ResolutionFacade now allows for resolving any declaration

---
 .../jetbrains/jet/plugin/caches/KotlinIndicesHelper.kt    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/idea/src/org/jetbrains/jet/plugin/caches/KotlinIndicesHelper.kt b/idea/src/org/jetbrains/jet/plugin/caches/KotlinIndicesHelper.kt
index 3129b1e41dc..be8c32ad41f 100644
--- a/idea/src/org/jetbrains/jet/plugin/caches/KotlinIndicesHelper.kt
+++ b/idea/src/org/jetbrains/jet/plugin/caches/KotlinIndicesHelper.kt
@@ -36,6 +36,7 @@ import org.jetbrains.jet.lang.resolve.calls.smartcasts.DataFlowInfo
 import com.intellij.psi.stubs.StringStubIndexExtension
 import org.jetbrains.jet.plugin.caches.resolve.ResolutionFacade
 import org.jetbrains.jet.plugin.util.extensionsUtils.isExtensionCallable
+import org.jetbrains.jet.plugin.caches.resolve.getResolutionFacade
 
 public class KotlinIndicesHelper(
         private val project: Project,
@@ -199,13 +200,12 @@ public class KotlinIndicesHelper(
                                        module: ModuleDescriptor,
                                        bindingContext: BindingContext): Collection<CallableDescriptor> {
         val fqnString = callableFQN.asString()
-        val descriptors = /* this code is temporarily disabled because taking descriptors from another resolve session causes duplicates and potentially other problems*/
-        /*if (index != null) {
+        val descriptors = if (index != null) {
             index.get(fqnString, project, scope)
                     .filter { it.getReceiverTypeReference() != null }
-                    .map { it.getLazyResolveSession().resolveToDescriptor(it) as CallableDescriptor }
+                    .map { resolutionFacade.resolveToDescriptor(it) as CallableDescriptor }
         }
-        else*/ run {
+        else {
             val importDirective = JetPsiFactory(project).createImportDirective(fqnString)
             analyzeImportReference(importDirective, resolutionScope, BindingTraceContext(), module)
                     .filterIsInstance(javaClass<CallableDescriptor>())