From b7277cd80ca92eda96e06cd65fd307bac7c2db95 Mon Sep 17 00:00:00 2001 From: Alexey Sedunov Date: Fri, 22 May 2015 17:22:13 +0300 Subject: [PATCH] Find Usages: Use isEquivalentTo() instead of identity equality when matching references with PsiCompiledElement --- .../src/org/jetbrains/kotlin/idea/references/referenceUtil.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/referenceUtil.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/referenceUtil.kt index 7a3432b4f89..aa82bd3c958 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/referenceUtil.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/referenceUtil.kt @@ -69,7 +69,8 @@ public fun PsiReference.matchesTarget(candidateTarget: PsiElement): Boolean { } val targets = unwrappedTargets - if (unwrappedCandidate in targets) return true + // TODO: Investigate why PsiCompiledElement identity changes + if (targets.any { it.isEquivalentTo(unwrappedCandidate) }) return true if (this is JetReference) { return targets.any {