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

Check self before complex equivalence check in light parameter

Browse Source
This commit is contained in:
Nikolay Krasko
2019-06-28 16:40:19 +03:00
parent 484c4ca268
commit 73356cbb4b
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/light-classes/src/org/jetbrains/kotlin/asJava/elements/KtLightParameter.kt
+11 -10
View File
@@ -100,19 +100,20 @@ class KtLightParameter(
override fun getParent(): PsiElement = method.parameterList override fun getParent(): PsiElement = method.parameterList
override fun isEquivalentTo(another: PsiElement?): Boolean { override fun isEquivalentTo(another: PsiElement?): Boolean {
val result = ApplicationManager.getApplication().runReadAction(Computable { if (this === another) return true
val kotlinOrigin = kotlinOrigin
if (kotlinOrigin?.isEquivalentTo(another) == true) return@Computable true
if (another is KtLightParameter && kotlinOrigin != null) { return ApplicationManager.getApplication().runReadAction(Computable<Boolean> {
kotlinOrigin == another.kotlinOrigin && clsDelegate == another.clsDelegate if (another is KtParameter) {
} else { val kotlinOrigin = kotlinOrigin
null if (kotlinOrigin?.isEquivalentTo(another) == true) return@Computable true
} }
})
result?.let { return it }
return super.isEquivalentTo(another) if (another is KtLightParameter) {
return@Computable kotlinOrigin != null && kotlinOrigin == another.kotlinOrigin && clsDelegate == another.clsDelegate
}
false
})
} }
override fun equals(other: Any?): Boolean { override fun equals(other: Any?): Boolean {