From 48cae0e480b8a8c99b59468a1b52e54a801b1dce Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Mon, 13 Mar 2017 14:40:10 +0300 Subject: [PATCH] KtLightField/Method: Use equality in equivalence checks Avoid computing delegate to determine equivalence --- .../org/jetbrains/kotlin/asJava/elements/KtLightFieldImpl.kt | 2 +- .../src/org/jetbrains/kotlin/asJava/elements/KtLightMethod.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/elements/KtLightFieldImpl.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/elements/KtLightFieldImpl.kt index 471e6d6ace3..5f23604e667 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/elements/KtLightFieldImpl.kt +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/elements/KtLightFieldImpl.kt @@ -117,7 +117,7 @@ sealed class KtLightFieldImpl( } override fun isEquivalentTo(another: PsiElement?): Boolean { - if (another is KtLightField && kotlinOrigin == another.kotlinOrigin && clsDelegate == another.clsDelegate) { + if (another is KtLightField && this == another) { return true } return super.isEquivalentTo(another) diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/elements/KtLightMethod.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/elements/KtLightMethod.kt index 6509e952421..bee5ff1abea 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/elements/KtLightMethod.kt +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/elements/KtLightMethod.kt @@ -179,7 +179,7 @@ class KtLightMethodImpl private constructor( } override fun isEquivalentTo(another: PsiElement?): Boolean { - if (another is KtLightMethod && kotlinOrigin == another.kotlinOrigin && clsDelegate == another.clsDelegate) { + if (another is KtLightMethod && this == another) { return true }