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

A little bit more correct filtering

Browse Source
This commit is contained in:
Valentin Kipyatkov
2015-10-28 19:59:03 +03:00
parent 0ee2b512ff
commit 3e3d86aebb
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/ide-common/src/org/jetbrains/kotlin/idea/util/ShadowedDeclarationsFilter.kt
+1 -1
View File
@@ -38,7 +38,7 @@ import org.jetbrains.kotlin.types.TypeUtils
import org.jetbrains.kotlin.util.descriptorsEqualWithSubstitution import org.jetbrains.kotlin.util.descriptorsEqualWithSubstitution
import java.util.* import java.util.*
public class ShadowedDeclarationsFilter private constructor( public class ShadowedDeclarationsFilter(
private val bindingContext: BindingContext, private val bindingContext: BindingContext,
private val resolutionFacade: ResolutionFacade, private val resolutionFacade: ResolutionFacade,
private val context: PsiElement, private val context: PsiElement,
idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/CompletionSession.kt
+10 -6
View File
@@ -48,6 +48,7 @@ import org.jetbrains.kotlin.resolve.BindingContext
import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode
import org.jetbrains.kotlin.resolve.scopes.DescriptorKindExclude import org.jetbrains.kotlin.resolve.scopes.DescriptorKindExclude
import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter
import org.jetbrains.kotlin.resolve.scopes.receivers.ExpressionReceiver
import org.jetbrains.kotlin.types.KotlinType import org.jetbrains.kotlin.types.KotlinType
import org.jetbrains.kotlin.types.TypeUtils import org.jetbrains.kotlin.types.TypeUtils
import org.jetbrains.kotlin.types.checker.KotlinTypeChecker import org.jetbrains.kotlin.types.checker.KotlinTypeChecker
@@ -273,24 +274,27 @@ abstract class CompletionSession(protected val configuration: CompletionSessionC
descriptorKindFilter?.let { collectReferenceVariants(it) } descriptorKindFilter?.let { collectReferenceVariants(it) }
} }
private fun collectReferenceVariants(descriptorKindFilter: DescriptorKindFilter, runtimeReceiverType: KotlinType? = null): ReferenceVariants { private fun collectReferenceVariants(descriptorKindFilter: DescriptorKindFilter, runtimeReceiver: ExpressionReceiver? = null): ReferenceVariants {
var variants = referenceVariantsHelper.getReferenceVariants( var variants = referenceVariantsHelper.getReferenceVariants(
nameExpression!!, nameExpression!!,
descriptorKindFilter, descriptorKindFilter,
descriptorNameFilter, descriptorNameFilter,
filterOutJavaGettersAndSetters = false, filterOutJavaGettersAndSetters = false,
filterOutShadowed = false, filterOutShadowed = false,
useReceiverType = runtimeReceiverType) useReceiverType = runtimeReceiver?.type)
variants = variants.excludeNonInitializedVariable(nameExpression) variants = variants.excludeNonInitializedVariable(nameExpression)
val shadowedDeclarationsFilter = ShadowedDeclarationsFilter.create(bindingContext, resolutionFacade, position, callTypeAndReceiver) val shadowedDeclarationsFilter = if (runtimeReceiver != null)
ShadowedDeclarationsFilter(bindingContext, resolutionFacade, position, runtimeReceiver)
else
ShadowedDeclarationsFilter.create(bindingContext, resolutionFacade, position, callTypeAndReceiver)
var notImportedExtensions: Collection<CallableDescriptor> = emptyList() var notImportedExtensions: Collection<CallableDescriptor> = emptyList()
if (callTypeAndReceiver.shouldCompleteCallableExtensions()) { if (callTypeAndReceiver.shouldCompleteCallableExtensions()) {
val nameFilter: (String) -> Boolean = { prefixMatcher.prefixMatches(it) } val nameFilter: (String) -> Boolean = { prefixMatcher.prefixMatches(it) }
val extensions = if (runtimeReceiverType != null) val extensions = if (runtimeReceiver != null)
indicesHelper.getCallableTopLevelExtensions(callTypeAndReceiver, listOf(runtimeReceiverType), nameFilter) indicesHelper.getCallableTopLevelExtensions(callTypeAndReceiver, listOf(runtimeReceiver.type), nameFilter)
else else
indicesHelper.getCallableTopLevelExtensions(callTypeAndReceiver, expression!!, bindingContext, nameFilter) indicesHelper.getCallableTopLevelExtensions(callTypeAndReceiver, expression!!, bindingContext, nameFilter)
@@ -332,7 +336,7 @@ abstract class CompletionSession(protected val configuration: CompletionSessionC
val runtimeType = evaluator(explicitReceiver) val runtimeType = evaluator(explicitReceiver)
if (runtimeType == null || runtimeType == type) return null if (runtimeType == null || runtimeType == type) return null
val (variants, notImportedExtensions) = collectReferenceVariants(descriptorKindFilter!!, runtimeType) val (variants, notImportedExtensions) = collectReferenceVariants(descriptorKindFilter!!, ExpressionReceiver(explicitReceiver, runtimeType))
val normalVariants = referenceVariants!!.imported + referenceVariants!!.notImportedExtensions val normalVariants = referenceVariants!!.imported + referenceVariants!!.notImportedExtensions
val filteredVariants = variants.filter { descriptor -> normalVariants.none { compareDescriptors(project, it, descriptor) } } val filteredVariants = variants.filter { descriptor -> normalVariants.none { compareDescriptors(project, it, descriptor) } }
val filteredNotImportedExtensions = notImportedExtensions.filter { descriptor -> normalVariants.none { compareDescriptors(project, it, descriptor) } } val filteredNotImportedExtensions = notImportedExtensions.filter { descriptor -> normalVariants.none { compareDescriptors(project, it, descriptor) } }