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

Move: Detect extension declaration by PSI instead of descriptor as extension descriptor maybe wrapper for Java method

Browse Source 
#KT-10203 Fixed
This commit is contained in:
Alexey Sedunov
2015-11-27 13:42:49 +03:00
parent 1bf521c645
commit 15b7eca665
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/psi/psiUtil/ktPsiUtil.kt
+1 -1
View File
@@ -316,7 +316,7 @@ public fun KtClassOrObject.effectiveDeclarations(): List<KtDeclaration> {
} }
} }
public fun KtDeclaration.isExtensionDeclaration(): Boolean { public fun PsiElement.isExtensionDeclaration(): Boolean {
val callable: KtCallableDeclaration? = when (this) { val callable: KtCallableDeclaration? = when (this) {
is KtNamedFunction, is KtProperty -> this as KtCallableDeclaration is KtNamedFunction, is KtProperty -> this as KtCallableDeclaration
is KtPropertyAccessor -> getNonStrictParentOfType<KtProperty>() is KtPropertyAccessor -> getNonStrictParentOfType<KtProperty>()
idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveUtils.kt
+2 -1
View File
@@ -38,6 +38,7 @@ import com.intellij.refactoring.util.MoveRenameUsageInfo
import com.intellij.refactoring.util.NonCodeUsageInfo import com.intellij.refactoring.util.NonCodeUsageInfo
import com.intellij.usageView.UsageInfo import com.intellij.usageView.UsageInfo
import com.intellij.util.IncorrectOperationException import com.intellij.util.IncorrectOperationException
import com.intellij.util.containers.ContainerUtil
import org.jetbrains.kotlin.asJava.namedUnwrappedElement import org.jetbrains.kotlin.asJava.namedUnwrappedElement
import org.jetbrains.kotlin.asJava.unwrapped import org.jetbrains.kotlin.asJava.unwrapped
import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.descriptors.*
@@ -93,7 +94,7 @@ public fun KtElement.getInternalReferencesToUpdateOnPackageNameChange(packageNam
val declaration = DescriptorToSourceUtilsIde.getAnyDeclaration(getProject(), descriptor) ?: return null val declaration = DescriptorToSourceUtilsIde.getAnyDeclaration(getProject(), descriptor) ?: return null
val isCallable = descriptor is CallableDescriptor val isCallable = descriptor is CallableDescriptor
val isExtension = isCallable && (descriptor as CallableDescriptor).getExtensionReceiverParameter() != null val isExtension = isCallable && declaration.isExtensionDeclaration()
if (isCallable && !isExtension) { if (isCallable && !isExtension) {
val containingDescriptor = descriptor.getContainingDeclaration() val containingDescriptor = descriptor.getContainingDeclaration()