From f2a83cdf29e29aa2c05e5e828080a53c424a6b67 Mon Sep 17 00:00:00 2001 From: Valentin Kipyatkov Date: Mon, 20 Oct 2014 14:47:35 +0400 Subject: [PATCH] No need to filter by visibility in LookupElementsCollector anymore --- .../jetbrains/jet/plugin/completion/CompletionSession.kt | 2 +- .../jet/plugin/completion/LookupElementsCollector.kt | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/idea/src/org/jetbrains/jet/plugin/completion/CompletionSession.kt b/idea/src/org/jetbrains/jet/plugin/completion/CompletionSession.kt index 8b2d5662673..ceec3e727eb 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/CompletionSession.kt +++ b/idea/src/org/jetbrains/jet/plugin/completion/CompletionSession.kt @@ -59,7 +59,7 @@ abstract class CompletionSessionBase(protected val configuration: CompletionSess protected val prefixMatcher: PrefixMatcher = this.resultSet.getPrefixMatcher() - protected val collector: LookupElementsCollector = LookupElementsCollector(prefixMatcher, resolveSession, { isVisibleDescriptor(it) }) + protected val collector: LookupElementsCollector = LookupElementsCollector(prefixMatcher, resolveSession) protected val project: Project = position.getProject() protected val searchScope: GlobalSearchScope = searchScopeForSourceElementDependencies(parameters.getOriginalFile()) ?: GlobalSearchScope.EMPTY_SCOPE diff --git a/idea/src/org/jetbrains/jet/plugin/completion/LookupElementsCollector.kt b/idea/src/org/jetbrains/jet/plugin/completion/LookupElementsCollector.kt index b6c7b9ace2c..8d728ecbf18 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/LookupElementsCollector.kt +++ b/idea/src/org/jetbrains/jet/plugin/completion/LookupElementsCollector.kt @@ -29,9 +29,7 @@ import java.util.ArrayList import com.intellij.codeInsight.completion.CompletionResultSet import org.jetbrains.jet.lang.descriptors.FunctionDescriptor -class LookupElementsCollector(private val prefixMatcher: PrefixMatcher, - private val resolveSession: ResolveSessionForBodies, - private val descriptorFilter: (DeclarationDescriptor) -> Boolean) { +class LookupElementsCollector(private val prefixMatcher: PrefixMatcher, private val resolveSession: ResolveSessionForBodies) { private val elements = ArrayList() public fun flushToResultSet(resultSet: CompletionResultSet) { @@ -54,8 +52,6 @@ class LookupElementsCollector(private val prefixMatcher: PrefixMatcher, } public fun addDescriptorElements(descriptor: DeclarationDescriptor, suppressAutoInsertion: Boolean) { - if (!descriptorFilter(descriptor)) return - run { val lookupElement = KotlinLookupElementFactory.createLookupElement(resolveSession, descriptor) if (suppressAutoInsertion) {