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

Take read action in KtLightParameter.isEquivalentTo()

Browse Source 
EA-109775 - (OperatorReferencesSearcher) assert: PsiFileImpl.getStubTree
This commit is contained in:
Dmitry Jemerov
2017-12-28 12:50:29 +01:00
parent 7f1dd88600
commit 4b6efe3eb0
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/light-classes/src/org/jetbrains/kotlin/asJava/elements/KtLightParameter.kt
+14 -5
View File
@@ -6,6 +6,8 @@
package org.jetbrains.kotlin.asJava.elements package org.jetbrains.kotlin.asJava.elements
import com.intellij.lang.Language import com.intellij.lang.Language
import com.intellij.openapi.application.ApplicationManager
import com.intellij.openapi.util.Computable
import com.intellij.openapi.util.TextRange import com.intellij.openapi.util.TextRange
import com.intellij.psi.* import com.intellij.psi.*
import com.intellij.psi.search.LocalSearchScope import com.intellij.psi.search.LocalSearchScope
@@ -101,11 +103,18 @@ 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 kotlinOrigin = kotlinOrigin val result = ApplicationManager.getApplication().runReadAction(Computable {
if (another is KtLightParameter && kotlinOrigin != null) { val kotlinOrigin = kotlinOrigin
val anotherParam = another as KtLightParameter? if (another is KtLightParameter && kotlinOrigin != null) {
return kotlinOrigin == anotherParam!!.kotlinOrigin && clsDelegate == anotherParam.clsDelegate val anotherParam = another as KtLightParameter?
} kotlinOrigin == anotherParam!!.kotlinOrigin && clsDelegate == anotherParam.clsDelegate
}
else {
null
}
})
result?.let { return it }
return super.isEquivalentTo(another) return super.isEquivalentTo(another)
} }