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

Module-specific list cell renderer: wrap into runReadAction

Browse Source 
This should fix KotlinGoto*ModuleTestGenerated.testExpectClassSuperclass
and related exception in IDEA
Additional fix for KT-23685
This commit is contained in:
Mikhail Glukhikh
2018-06-14 13:55:02 +03:00
parent 3d4b407d0c
commit 90b6f369e0
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/presentation/KtModuleSpecificListCellRenderer.kt
+4 -1
View File
@@ -6,6 +6,7 @@
package org.jetbrains.kotlin.idea.presentation package org.jetbrains.kotlin.idea.presentation
import com.intellij.ide.util.PsiElementListCellRenderer import com.intellij.ide.util.PsiElementListCellRenderer
import com.intellij.openapi.application.runReadAction
import com.intellij.psi.NavigatablePsiElement import com.intellij.psi.NavigatablePsiElement
import org.jetbrains.kotlin.idea.util.module import org.jetbrains.kotlin.idea.util.module
@@ -14,7 +15,9 @@ abstract class KtModuleSpecificListCellRenderer<T : NavigatablePsiElement> : Psi
override fun getComparingObject(element: T?): Comparable<Nothing> { override fun getComparingObject(element: T?): Comparable<Nothing> {
val baseText = super.getComparingObject(element) val baseText = super.getComparingObject(element)
val moduleName = element?.module?.name ?: return baseText val moduleName = runReadAction {
element?.module?.name
} ?: return baseText
return "$baseText [$moduleName]" return "$baseText [$moduleName]"
} }
} }