From 8874ad2c9665f7dbcf7a363460d64f376a090bd5 Mon Sep 17 00:00:00 2001
From: Evgeny Gerashchenko <Evgeny.Gerashchenko@jetbrains.com>
Date: Wed, 11 Mar 2015 17:56:59 +0300
Subject: [PATCH] Minor. Better code in method.

---
 .../kotlin/idea/references/referenceUtil.kt   | 20 +++++++++----------
 1 file changed, 9 insertions(+), 11 deletions(-)

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 d32b405c025..9e3a339860f 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
@@ -54,19 +54,17 @@ public val PsiReference.unwrappedTargets: Set<PsiElement>
         }
     }
 
-public fun PsiReference.matchesTarget(target: PsiElement): Boolean {
-    val unwrapped = target.unwrapped?.getOriginalElement()
-    return when {
-        unwrapped in unwrappedTargets ->
-            true
+public fun PsiReference.matchesTarget(candidateTarget: PsiElement): Boolean {
+    val unwrappedCandidate = candidateTarget.unwrapped?.getOriginalElement() ?: return false
+    val targets = unwrappedTargets
+    if (unwrappedCandidate in targets) return true
 
-        this is JetReference
-                && unwrappedTargets.any { it is PsiMethod && it.isConstructor() && it.getContainingClass() == unwrapped } ->
-            true
-
-        else ->
-            false
+    if (this is JetReference) {
+        return targets.any {
+            it is PsiMethod && it.isConstructor() && it.getContainingClass() == unwrappedCandidate
+        }
     }
+    return false
 }
 
 fun AbstractJetReference<out JetExpression>.renameImplicitConventionalCall(newName: String?): JetExpression {