From 90b6f369e034d22852c99cd25c958c80f34d0504 Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Thu, 14 Jun 2018 13:55:02 +0300 Subject: [PATCH] Module-specific list cell renderer: wrap into runReadAction This should fix KotlinGoto*ModuleTestGenerated.testExpectClassSuperclass and related exception in IDEA Additional fix for KT-23685 --- .../idea/presentation/KtModuleSpecificListCellRenderer.kt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/presentation/KtModuleSpecificListCellRenderer.kt b/idea/src/org/jetbrains/kotlin/idea/presentation/KtModuleSpecificListCellRenderer.kt index 6219c4339af..abf7f8f0620 100644 --- a/idea/src/org/jetbrains/kotlin/idea/presentation/KtModuleSpecificListCellRenderer.kt +++ b/idea/src/org/jetbrains/kotlin/idea/presentation/KtModuleSpecificListCellRenderer.kt @@ -6,6 +6,7 @@ package org.jetbrains.kotlin.idea.presentation import com.intellij.ide.util.PsiElementListCellRenderer +import com.intellij.openapi.application.runReadAction import com.intellij.psi.NavigatablePsiElement import org.jetbrains.kotlin.idea.util.module @@ -14,7 +15,9 @@ abstract class KtModuleSpecificListCellRenderer : Psi override fun getComparingObject(element: T?): Comparable { val baseText = super.getComparingObject(element) - val moduleName = element?.module?.name ?: return baseText + val moduleName = runReadAction { + element?.module?.name + } ?: return baseText return "$baseText [$moduleName]" } } \ No newline at end of file