From e30998d3c18f1de7c4865364aaa1d3c56ecda8ee Mon Sep 17 00:00:00 2001 From: Valentin Kipyatkov Date: Thu, 18 Sep 2014 17:49:51 +0400 Subject: [PATCH] Moved an utility method --- .../src/org/jetbrains/jet/lang/resolve/DescriptorUtils.kt | 3 +++ .../plugin/codeInsight/KotlinCopyPasteReferenceProcessor.kt | 1 + idea/src/org/jetbrains/jet/plugin/imports/ImportsUtils.kt | 5 +---- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/DescriptorUtils.kt b/core/descriptors/src/org/jetbrains/jet/lang/resolve/DescriptorUtils.kt index 549e7197510..f535575c307 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/DescriptorUtils.kt +++ b/core/descriptors/src/org/jetbrains/jet/lang/resolve/DescriptorUtils.kt @@ -29,3 +29,6 @@ public fun ClassDescriptor.hasSyntheticClassObject(): Boolean = getKind() in set public fun DeclarationDescriptor.getImportableDescriptor(): DeclarationDescriptor = if (this is ConstructorDescriptor || DescriptorUtils.isClassObject(this)) getContainingDeclaration()!! else this + +public val DeclarationDescriptor.isExtension: Boolean + get() = this is CallableDescriptor && getReceiverParameter() != null \ No newline at end of file diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/KotlinCopyPasteReferenceProcessor.kt b/idea/src/org/jetbrains/jet/plugin/codeInsight/KotlinCopyPasteReferenceProcessor.kt index 91807f37adc..f871ce186e3 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/KotlinCopyPasteReferenceProcessor.kt +++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/KotlinCopyPasteReferenceProcessor.kt @@ -62,6 +62,7 @@ import org.jetbrains.jet.plugin.imports.* import org.jetbrains.jet.lang.psi.psiUtil.getReceiverExpression import org.jetbrains.jet.utils.* import org.jetbrains.jet.renderer.DescriptorRenderer +import org.jetbrains.jet.lang.resolve.descriptorUtil.isExtension //NOTE: this class is based on CopyPasteReferenceProcessor and JavaCopyPasteReferenceProcessor public class KotlinCopyPasteReferenceProcessor() : CopyPastePostProcessor() { diff --git a/idea/src/org/jetbrains/jet/plugin/imports/ImportsUtils.kt b/idea/src/org/jetbrains/jet/plugin/imports/ImportsUtils.kt index 5616b315312..b9a31e38c71 100644 --- a/idea/src/org/jetbrains/jet/plugin/imports/ImportsUtils.kt +++ b/idea/src/org/jetbrains/jet/plugin/imports/ImportsUtils.kt @@ -28,6 +28,7 @@ import org.jetbrains.jet.lang.psi.psiUtil.getReceiverExpression import com.intellij.psi.PsiElement import org.jetbrains.jet.lang.types.JetType import org.jetbrains.jet.lang.resolve.descriptorUtil.getImportableDescriptor +import org.jetbrains.jet.lang.resolve.descriptorUtil.isExtension public val DeclarationDescriptor.importableFqName: FqName? get() { @@ -64,7 +65,3 @@ public fun isInReceiverScope(referenceElement: PsiElement, referencedDescriptor: val isExpressionWithReceiver = referenceElement is JetSimpleNameExpression && referenceElement.getReceiverExpression() != null return isExpressionWithReceiver && !referencedDescriptor.isExtension } - -//TODO: move this utility to more appropriate place -public val DeclarationDescriptor.isExtension: Boolean - get() = this is CallableDescriptor && getReceiverParameter() != null \ No newline at end of file