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

Fix processing synthetic members in completion

Browse Source 
Not all synthetic scope's descriptors are extensions (SAM adapters are not)

 #KT-11128 Fixed
This commit is contained in:
Denis Zharkov
2016-12-06 12:07:31 +03:00
parent 891a036b59
commit 035383285c
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/ide-common/src/org/jetbrains/kotlin/idea/codeInsight/ReferenceVariantsHelper.kt
+11 -6
View File
@@ -30,9 +30,9 @@ import org.jetbrains.kotlin.psi.KtSimpleNameExpression
import org.jetbrains.kotlin.psi.KtVariableDeclaration import org.jetbrains.kotlin.psi.KtVariableDeclaration
import org.jetbrains.kotlin.psi.psiUtil.parentsWithSelf import org.jetbrains.kotlin.psi.psiUtil.parentsWithSelf
import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.resolve.BindingContext
import org.jetbrains.kotlin.resolve.bindingContextUtil.getDataFlowInfoAfter
import org.jetbrains.kotlin.resolve.bindingContextUtil.getDataFlowInfoBefore import org.jetbrains.kotlin.resolve.bindingContextUtil.getDataFlowInfoBefore
import org.jetbrains.kotlin.resolve.calls.smartcasts.SmartCastManager import org.jetbrains.kotlin.resolve.calls.smartcasts.SmartCastManager
import org.jetbrains.kotlin.resolve.descriptorUtil.isExtension
import org.jetbrains.kotlin.resolve.isHiddenInResolution import org.jetbrains.kotlin.resolve.isHiddenInResolution
import org.jetbrains.kotlin.resolve.scopes.* import org.jetbrains.kotlin.resolve.scopes.*
import org.jetbrains.kotlin.resolve.scopes.receivers.ClassQualifier import org.jetbrains.kotlin.resolve.scopes.receivers.ClassQualifier
@@ -361,9 +361,14 @@ class ReferenceVariantsHelper(
if (kindFilter.excludes.contains(DescriptorKindExclude.Extensions)) return if (kindFilter.excludes.contains(DescriptorKindExclude.Extensions)) return
if (receiverTypes.isEmpty()) return if (receiverTypes.isEmpty()) return
fun process(extension: CallableDescriptor) { fun process(extensionOrSyntheticMember: CallableDescriptor) {
if (kindFilter.accepts(extension) && nameFilter(extension.name)) { if (kindFilter.accepts(extensionOrSyntheticMember) && nameFilter(extensionOrSyntheticMember.name)) {
addAll(extension.substituteExtensionIfCallable(receiverTypes, callType)) if (extensionOrSyntheticMember.isExtension) {
addAll(extensionOrSyntheticMember.substituteExtensionIfCallable(receiverTypes, callType))
}
else {
add(extensionOrSyntheticMember)
}
} }
} }
@@ -380,8 +385,8 @@ class ReferenceVariantsHelper(
} }
if (kindFilter.acceptsKinds(DescriptorKindFilter.FUNCTIONS_MASK)) { if (kindFilter.acceptsKinds(DescriptorKindFilter.FUNCTIONS_MASK)) {
for (extension in syntheticScopes.collectSyntheticExtensionFunctions(receiverTypes)) { for (syntheticMember in syntheticScopes.collectSyntheticExtensionFunctions(receiverTypes)) {
process(extension) process(syntheticMember)
} }
} }
} }