From 763782083c25dbd8004363499a8d45282411e0bd Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Tue, 22 Nov 2016 14:49:18 +0100 Subject: [PATCH] Implement KtLightTypeParameter.isEquivalentTo() without referencing delegate (this is faster and more correct) --- .../kotlin/asJava/elements/KtLightTypeParameter.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/elements/KtLightTypeParameter.java b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/elements/KtLightTypeParameter.java index 473e6b836ad..d8e71cb77f3 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/elements/KtLightTypeParameter.java +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/elements/KtLightTypeParameter.java @@ -160,4 +160,16 @@ public class KtLightTypeParameter if (obj == this) return true; return obj instanceof KtLightTypeParameter && getKotlinOrigin().equals(((KtLightTypeParameter) obj).getKotlinOrigin()); } + + @Override + public boolean isEquivalentTo(PsiElement another) { + if (another instanceof PsiTypeParameter) { + PsiTypeParameter anotherTypeParameter = (PsiTypeParameter) another; + PsiTypeParameterListOwner owner = getOwner(); + if (owner != null) { + return owner.isEquivalentTo(anotherTypeParameter.getOwner()) && getIndex() == anotherTypeParameter.getIndex(); + } + } + return false; + } }