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

Workaround for IndexNotReadyException from icon provider (EA-118965)

Browse Source 
Provider is DumbAware and isn't expected to access indexes.
This commit is contained in:
Nikolay Krasko
2018-08-13 19:35:09 +03:00
committed by Nikolay Krasko
parent 2251440f04
commit 8f566132e4
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinIconProvider.kt
+10 -1
View File
@@ -18,6 +18,7 @@ package org.jetbrains.kotlin.idea
import com.intellij.ide.IconProvider import com.intellij.ide.IconProvider
import com.intellij.openapi.project.DumbAware import com.intellij.openapi.project.DumbAware
import com.intellij.openapi.project.IndexNotReadyException
import com.intellij.openapi.util.Iconable import com.intellij.openapi.util.Iconable
import com.intellij.openapi.util.text.StringUtil import com.intellij.openapi.util.text.StringUtil
import com.intellij.psi.PsiElement import com.intellij.psi.PsiElement
@@ -52,7 +53,15 @@ class KotlinIconProvider : IconProvider(), DumbAware {
val result = psiElement.getBaseIcon() val result = psiElement.getBaseIcon()
if (flags and Iconable.ICON_FLAG_VISIBILITY > 0 && result != null && (psiElement is KtModifierListOwner && psiElement !is KtClassInitializer)) { if (flags and Iconable.ICON_FLAG_VISIBILITY > 0 && result != null && (psiElement is KtModifierListOwner && psiElement !is KtClassInitializer)) {
val list = psiElement.modifierList val list = psiElement.modifierList
return createRowIcon(result.addExpectActualMarker(psiElement), getVisibilityIcon(list)) val visibilityIcon = getVisibilityIcon(list)
val withExpectedActual: Icon = try {
result.addExpectActualMarker(psiElement)
} catch (indexNotReady: IndexNotReadyException) {
result
}
createRowIcon(withExpectedActual, visibilityIcon)
} }
return result return result
} }