From 0384e3d3235f54a2f679e99ffcf1524ee0a7bd87 Mon Sep 17 00:00:00 2001
From: Valentin Kipyatkov <valentin@jetbrains.com>
Date: Wed, 22 Oct 2014 13:54:01 +0400
Subject: [PATCH] No filtering by visibility filter twice

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

diff --git a/idea/src/org/jetbrains/jet/plugin/caches/KotlinIndicesHelper.kt b/idea/src/org/jetbrains/jet/plugin/caches/KotlinIndicesHelper.kt
index c5a4df55c04..9401c5e27d9 100644
--- a/idea/src/org/jetbrains/jet/plugin/caches/KotlinIndicesHelper.kt
+++ b/idea/src/org/jetbrains/jet/plugin/caches/KotlinIndicesHelper.kt
@@ -129,7 +129,7 @@ public class KotlinIndicesHelper(private val project: Project,
 
         return allFqNames.filter { nameFilter(it.shortName().asString()) }
                 .toSet()
-                .flatMap { findTopLevelCallables(it, context, jetScope) }
+                .flatMap { findTopLevelCallables(it, context, jetScope).filter(visibilityFilter) }
     }
 
     public fun getCallableExtensions(nameFilter: (String) -> Boolean, expression: JetSimpleNameExpression): Collection<CallableDescriptor> {
@@ -213,7 +213,7 @@ public class KotlinIndicesHelper(private val project: Project,
     private fun findTopLevelCallables(fqName: FqName, context: JetExpression, jetScope: JetScope): Collection<CallableDescriptor> {
         val importDirective = JetPsiFactory(context.getProject()).createImportDirective(ImportPath(fqName, false))
         val allDescriptors = analyzeImportReference(importDirective, jetScope, BindingTraceContext(), resolveSession.getModuleDescriptor())
-        return allDescriptors.filterIsInstance(javaClass<CallableDescriptor>()).filter { it.getExtensionReceiverParameter() == null && visibilityFilter(it) }
+        return allDescriptors.filterIsInstance(javaClass<CallableDescriptor>()).filter { it.getExtensionReceiverParameter() == null }
     }
 
     private fun analyzeImportReference(