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

Temporary fix for completion of Android synthetic extensions

Browse Source
This commit is contained in:
Valentin Kipyatkov
2015-10-29 11:27:26 +03:00
parent 129f6f8532
commit 40d3f71e1a
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/CompletionSession.kt
+7 -6
View File
@@ -44,7 +44,6 @@ import org.jetbrains.kotlin.name.Name
import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.psi.*
import org.jetbrains.kotlin.psi.psiUtil.isExtensionDeclaration import org.jetbrains.kotlin.psi.psiUtil.isExtensionDeclaration
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.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
@@ -167,11 +166,13 @@ abstract class CompletionSession(protected val configuration: CompletionSessionC
.toSet() .toSet()
override fun excludes(descriptor: DeclarationDescriptor): Boolean { override fun excludes(descriptor: DeclarationDescriptor): Boolean {
return descriptor is CallableMemberDescriptor if (descriptor !is CallableMemberDescriptor) return false
&& descriptor.extensionReceiverParameter != null if (descriptor.extensionReceiverParameter == null) return false
&& descriptor.containingDeclaration is PackageFragmentDescriptor if (descriptor in extensionsFromThisFile) return false
&& descriptor !in extensionsFromThisFile if (descriptor.kind != CallableMemberDescriptor.Kind.DECLARATION) return false /* do not filter out synthetic extensions from packages */
&& descriptor.kind == CallableMemberDescriptor.Kind.DECLARATION /* do not filter out synthetic extensions from packages */ val containingPackage = descriptor.containingDeclaration as? PackageFragmentDescriptor ?: return false
if (containingPackage.fqName.asString().startsWith("kotlinx.android.synthetic.")) return false // TODO: temporary solution for Android synthetic extensions
return true
} }
override val fullyExcludedDescriptorKinds: Int override val fullyExcludedDescriptorKinds: Int