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

Minor. Better code in method.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2015-03-11 17:56:59 +03:00
parent 569e4a68ae
commit 8874ad2c96
1 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/referenceUtil.kt
+9 -11
View File
@@ -54,19 +54,17 @@ public val PsiReference.unwrappedTargets: Set<PsiElement>
} }
} }
public fun PsiReference.matchesTarget(target: PsiElement): Boolean { public fun PsiReference.matchesTarget(candidateTarget: PsiElement): Boolean {
val unwrapped = target.unwrapped?.getOriginalElement() val unwrappedCandidate = candidateTarget.unwrapped?.getOriginalElement() ?: return false
return when { val targets = unwrappedTargets
unwrapped in unwrappedTargets -> if (unwrappedCandidate in targets) return true
true
this is JetReference if (this is JetReference) {
&& unwrappedTargets.any { it is PsiMethod && it.isConstructor() && it.getContainingClass() == unwrapped } -> return targets.any {
true it is PsiMethod && it.isConstructor() && it.getContainingClass() == unwrappedCandidate
}
else ->
false
} }
return false
} }
fun AbstractJetReference<out JetExpression>.renameImplicitConventionalCall(newName: String?): JetExpression { fun AbstractJetReference<out JetExpression>.renameImplicitConventionalCall(newName: String?): JetExpression {