azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

No need to filter by visibility in LookupElementsCollector anymore

Browse Source
This commit is contained in:
Valentin Kipyatkov
2014-10-20 14:47:35 +04:00
parent 042e446694
commit f2a83cdf29
2 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/completion/CompletionSession.kt
+1 -1
View File
@@ -59,7 +59,7 @@ abstract class CompletionSessionBase(protected val configuration: CompletionSess
protected val prefixMatcher: PrefixMatcher = this.resultSet.getPrefixMatcher() 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 project: Project = position.getProject()
protected val searchScope: GlobalSearchScope = searchScopeForSourceElementDependencies(parameters.getOriginalFile()) ?: GlobalSearchScope.EMPTY_SCOPE protected val searchScope: GlobalSearchScope = searchScopeForSourceElementDependencies(parameters.getOriginalFile()) ?: GlobalSearchScope.EMPTY_SCOPE
idea/src/org/jetbrains/jet/plugin/completion/LookupElementsCollector.kt
+1 -5
View File
@@ -29,9 +29,7 @@ import java.util.ArrayList
import com.intellij.codeInsight.completion.CompletionResultSet import com.intellij.codeInsight.completion.CompletionResultSet
import org.jetbrains.jet.lang.descriptors.FunctionDescriptor import org.jetbrains.jet.lang.descriptors.FunctionDescriptor
class LookupElementsCollector(private val prefixMatcher: PrefixMatcher, class LookupElementsCollector(private val prefixMatcher: PrefixMatcher, private val resolveSession: ResolveSessionForBodies) {
private val resolveSession: ResolveSessionForBodies,
private val descriptorFilter: (DeclarationDescriptor) -> Boolean) {
private val elements = ArrayList<LookupElement>() private val elements = ArrayList<LookupElement>()
public fun flushToResultSet(resultSet: CompletionResultSet) { public fun flushToResultSet(resultSet: CompletionResultSet) {
@@ -54,8 +52,6 @@ class LookupElementsCollector(private val prefixMatcher: PrefixMatcher,
} }
public fun addDescriptorElements(descriptor: DeclarationDescriptor, suppressAutoInsertion: Boolean) { public fun addDescriptorElements(descriptor: DeclarationDescriptor, suppressAutoInsertion: Boolean) {
if (!descriptorFilter(descriptor)) return
run { run {
val lookupElement = KotlinLookupElementFactory.createLookupElement(resolveSession, descriptor) val lookupElement = KotlinLookupElementFactory.createLookupElement(resolveSession, descriptor)
if (suppressAutoInsertion) { if (suppressAutoInsertion) {