From 93f00db871517af8142959b86f41c0f673dfeef1 Mon Sep 17 00:00:00 2001 From: Alexey Sedunov Date: Mon, 16 Mar 2015 20:20:00 +0300 Subject: [PATCH] Extraction Engine: Consider declarations when comparing descriptors #KT-6960 Fixed --- .../idea/completion/CompletionSession.kt | 2 +- .../extractionEngine/ExtractionData.kt | 2 +- .../extractableAnalysisUtil.kt | 2 +- .../idea/refactoring/jetRefactoringUtil.kt | 20 +++++++++++-------- .../basic/callWithPlatformTypeReceiver.java | 8 ++++++++ .../basic/callWithPlatformTypeReceiver.kt | 6 ++++++ .../callWithPlatformTypeReceiver.kt.after | 8 ++++++++ .../introduce/JetExtractionTestGenerated.java | 6 ++++++ 8 files changed, 43 insertions(+), 11 deletions(-) create mode 100644 idea/testData/refactoring/extractFunction/basic/callWithPlatformTypeReceiver.java create mode 100644 idea/testData/refactoring/extractFunction/basic/callWithPlatformTypeReceiver.kt create mode 100644 idea/testData/refactoring/extractFunction/basic/callWithPlatformTypeReceiver.kt.after diff --git a/idea/src/org/jetbrains/kotlin/idea/completion/CompletionSession.kt b/idea/src/org/jetbrains/kotlin/idea/completion/CompletionSession.kt index e03a29f91cb..4f4afafa928 100644 --- a/idea/src/org/jetbrains/kotlin/idea/completion/CompletionSession.kt +++ b/idea/src/org/jetbrains/kotlin/idea/completion/CompletionSession.kt @@ -201,7 +201,7 @@ abstract class CompletionSessionBase(protected val configuration: CompletionSess else { return descriptors.filter { desc -> !alreadyAddedDescriptors.any { - comparePossiblyOverridingDescriptors(it, desc) + comparePossiblyOverridingDescriptors(project, it, desc) } } } diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/ExtractionData.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/ExtractionData.kt index 8fbfc4de809..38404f38ea2 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/ExtractionData.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/ExtractionData.kt @@ -158,7 +158,7 @@ data class ExtractionData( if (parent is JetUserType && (parent.getParent() as? JetUserType)?.getQualifier() == parent) continue val descriptor = context[BindingContext.REFERENCE_TARGET, ref] - if (!compareDescriptors(originalResolveResult.descriptor, descriptor) + if (!compareDescriptors(project, originalResolveResult.descriptor, descriptor) && !originalResolveResult.declaration.isInsideOf(originalElements)) { referencesInfo.add(ResolvedReferenceInfo(ref, offset, originalResolveResult)) } diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/extractableAnalysisUtil.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/extractableAnalysisUtil.kt index 4e3aad27f40..5bede079bf0 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/extractableAnalysisUtil.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/extractableAnalysisUtil.kt @@ -912,7 +912,7 @@ fun ExtractableCodeDescriptor.validate(): ExtractableCodeDescriptorWithConflicts if (diagnostics.any { it.getFactory() == Errors.UNRESOLVED_REFERENCE } || (currentDescriptor != null && !ErrorUtils.isError(currentDescriptor) - && !comparePossiblyOverridingDescriptors(currentDescriptor, resolveResult.descriptor))) { + && !comparePossiblyOverridingDescriptors(extractionData.project, currentDescriptor, resolveResult.descriptor))) { conflicts.putValue( resolveResult.originalRefExpr, getDeclarationMessage(resolveResult.declaration, "0.will.no.longer.be.accessible.after.extraction") diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/jetRefactoringUtil.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/jetRefactoringUtil.kt index 164b0415d3d..3d19d88efc5 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/jetRefactoringUtil.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/jetRefactoringUtil.kt @@ -97,6 +97,7 @@ import com.intellij.psi.PsiJavaCodeReferenceElement import com.intellij.lang.java.JavaLanguage import com.intellij.psi.PsiClass import com.intellij.codeInsight.daemon.impl.quickfix.CreateFromUsageUtils +import org.jetbrains.kotlin.idea.codeInsight.DescriptorToSourceUtilsIde fun PsiElement.getAndRemoveCopyableUserData(key: Key): T? { val data = getCopyableUserData(key) @@ -403,16 +404,19 @@ public fun chooseContainerElementIfNecessary( public fun PsiElement.isTrueJavaMethod(): Boolean = this is PsiMethod && this !is KotlinLightMethod -fun compareDescriptors(d1: DeclarationDescriptor?, d2: DeclarationDescriptor?): Boolean { - return d1 == d2 || - (d1 != null && d2 != null && - DescriptorRenderer.FQ_NAMES_IN_TYPES.render(d1) == DescriptorRenderer.FQ_NAMES_IN_TYPES.render(d2)) +fun compareDescriptors(project: Project, d1: DeclarationDescriptor?, d2: DeclarationDescriptor?): Boolean { + if (d1 == d2) return true + if (d1 == null || d2 == null) return false + if (DescriptorToSourceUtilsIde.getAllDeclarations(project, d1) == DescriptorToSourceUtilsIde.getAllDeclarations(project, d2)) return true + return DescriptorRenderer.FQ_NAMES_IN_TYPES.render(d1) == DescriptorRenderer.FQ_NAMES_IN_TYPES.render(d2) } -public fun comparePossiblyOverridingDescriptors(currentDescriptor: DeclarationDescriptor?, originalDescriptor: DeclarationDescriptor?): Boolean { - if (compareDescriptors(currentDescriptor, originalDescriptor)) return true +public fun comparePossiblyOverridingDescriptors(project: Project, + currentDescriptor: DeclarationDescriptor?, + originalDescriptor: DeclarationDescriptor?): Boolean { + if (compareDescriptors(project, currentDescriptor, originalDescriptor)) return true if (originalDescriptor is CallableDescriptor) { - if (!OverridingUtil.traverseOverridenDescriptors(originalDescriptor) { !compareDescriptors(currentDescriptor, it) }) return true + if (!OverridingUtil.traverseOverridenDescriptors(originalDescriptor) { !compareDescriptors(project, currentDescriptor, it) }) return true if (originalDescriptor !is CallableMemberDescriptor || currentDescriptor !is CallableMemberDescriptor) return false val kind = originalDescriptor.getKind() if (kind != Kind.FAKE_OVERRIDE && kind != Kind.DELEGATION) return false @@ -422,7 +426,7 @@ public fun comparePossiblyOverridingDescriptors(currentDescriptor: DeclarationDe val currentOverriddenDescriptors = currentDescriptor.getOverriddenDescriptors() if (originalOverriddenDescriptors.size() != currentOverriddenDescriptors.size()) return false return (currentOverriddenDescriptors zip originalOverriddenDescriptors ).all { - comparePossiblyOverridingDescriptors(it.first, it.second) + comparePossiblyOverridingDescriptors(project, it.first, it.second) } } diff --git a/idea/testData/refactoring/extractFunction/basic/callWithPlatformTypeReceiver.java b/idea/testData/refactoring/extractFunction/basic/callWithPlatformTypeReceiver.java new file mode 100644 index 00000000000..b3285535209 --- /dev/null +++ b/idea/testData/refactoring/extractFunction/basic/callWithPlatformTypeReceiver.java @@ -0,0 +1,8 @@ +import java.util.HashMap; +import java.util.Map; + +class J { + public static Map getMap() { + return new HashMap(); + } +} \ No newline at end of file diff --git a/idea/testData/refactoring/extractFunction/basic/callWithPlatformTypeReceiver.kt b/idea/testData/refactoring/extractFunction/basic/callWithPlatformTypeReceiver.kt new file mode 100644 index 00000000000..75ecb2db68d --- /dev/null +++ b/idea/testData/refactoring/extractFunction/basic/callWithPlatformTypeReceiver.kt @@ -0,0 +1,6 @@ +// WITH_RUNTIME +// PARAM_DESCRIPTOR: value-parameter val it: kotlin.Map.Entry<(Boolean..Boolean?), (Boolean..Boolean?)> defined in test. +// PARAM_TYPES: kotlin.Map.Entry<(Boolean..Boolean?), (Boolean..Boolean?)> +fun test() { + J.getMap().filter { it.getKey() } +} \ No newline at end of file diff --git a/idea/testData/refactoring/extractFunction/basic/callWithPlatformTypeReceiver.kt.after b/idea/testData/refactoring/extractFunction/basic/callWithPlatformTypeReceiver.kt.after new file mode 100644 index 00000000000..d257041f3c2 --- /dev/null +++ b/idea/testData/refactoring/extractFunction/basic/callWithPlatformTypeReceiver.kt.after @@ -0,0 +1,8 @@ +// WITH_RUNTIME +// PARAM_DESCRIPTOR: value-parameter val it: kotlin.Map.Entry<(Boolean..Boolean?), (Boolean..Boolean?)> defined in test. +// PARAM_TYPES: kotlin.Map.Entry<(Boolean..Boolean?), (Boolean..Boolean?)> +fun test() { + J.getMap().filter { b(it) } +} + +private fun b(it: Map.Entry) = it.getKey() \ No newline at end of file diff --git a/idea/tests/org/jetbrains/kotlin/idea/refactoring/introduce/JetExtractionTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/refactoring/introduce/JetExtractionTestGenerated.java index eea40d7d316..f86418aba77 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/refactoring/introduce/JetExtractionTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/refactoring/introduce/JetExtractionTestGenerated.java @@ -346,6 +346,12 @@ public class JetExtractionTestGenerated extends AbstractJetExtractionTest { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/basic"), Pattern.compile("^(.+)\\.kt$"), true); } + @TestMetadata("callWithPlatformTypeReceiver.kt") + public void testCallWithPlatformTypeReceiver() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/basic/callWithPlatformTypeReceiver.kt"); + doExtractFunctionTest(fileName); + } + @TestMetadata("delegatingFunction.kt") public void testDelegatingFunction() throws Exception { String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/basic/delegatingFunction.kt");