MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

AstLoadingFilter: disable loading when computing element icons

Browse Source
This commit is contained in:
Daniil Ovchinnikov
2018-04-06 19:46:38 +02:00
parent 97533acd98
commit 5f72c7c70a
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/core-api/src/com/intellij/psi/impl/ElementBase.java
+7 -1
View File
@@ -34,6 +34,8 @@ import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import java.util.List;
import static com.intellij.util.AstLoadingFilter.disableTreeLoading;
public abstract class ElementBase extends UserDataHolderBase implements Iconable {
private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.ElementBase");
@@ -88,7 +90,7 @@ public abstract class ElementBase extends UserDataHolderBase implements Iconable
if (Registry.is("psi.deferIconLoading")) {
Icon baseIcon = LastComputedIcon.get(psiElement, flags);
if (baseIcon == null) {
baseIcon = computeBaseIcon(flags);
baseIcon = disableTreeLoading(() -> computeBaseIcon(flags));
}
return IconDeferrer.getInstance().defer(baseIcon, new ElementIconRequest(psiElement, psiElement.getProject(), flags), ICON_COMPUTE);
}
@@ -98,6 +100,10 @@ public abstract class ElementBase extends UserDataHolderBase implements Iconable
@Nullable
private static Icon computeIconNow(@NotNull PsiElement element, @Iconable.IconFlags int flags) {
return disableTreeLoading(() -> doComputeIconNow(element, flags));
}
private static Icon doComputeIconNow(@NotNull PsiElement element, @Iconable.IconFlags int flags) {
final Icon providersIcon = PsiIconUtil.getProvidersIcon(element, flags);
if (providersIcon != null) {
return providersIcon instanceof RowIcon ? (RowIcon)providersIcon : createLayeredIcon(element, providersIcon, flags);