From 175f6419d46155f40d2e12fd4cde4304ac821248 Mon Sep 17 00:00:00 2001 From: Mikhail Sokolov Date: Wed, 13 Jun 2018 16:01:53 +0300 Subject: [PATCH] IDEA-193841 New "Search classes" does not show outer class for inner classes --- .../searcheverywhere/AbstractGotoSEContributor.java | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/AbstractGotoSEContributor.java b/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/AbstractGotoSEContributor.java index afd658a55e34..e0736a9126fb 100644 --- a/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/AbstractGotoSEContributor.java +++ b/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/AbstractGotoSEContributor.java @@ -27,6 +27,7 @@ import org.jetbrains.annotations.Nullable; import javax.swing.*; import java.awt.event.InputEvent; +import java.util.Optional; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -158,7 +159,17 @@ public abstract class AbstractGotoSEContributor implements SearchEverywhereCo @Override public ListCellRenderer getElementsRenderer(JList list) { - return new SearchEverywherePsiRenderer(list); + return new SearchEverywherePsiRenderer(list) { + @Override + public String getElementText(PsiElement element) { + if (element instanceof NavigationItem) { + return Optional.ofNullable(((NavigationItem)element).getPresentation()) + .map(presentation -> presentation.getPresentableText()) + .orElse(super.getElementText(element)); + } + return super.getElementText(element); + } + }; } protected boolean isDumbModeSupported() {