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

IDEA-118159 "Search Everywhere" inconsistent api on ItemPresentation

Browse Source
This commit is contained in:
Maxim.Mossienko
2013-12-12 22:37:13 +01:00
parent 0e548a83c0
commit 9729ea9b92
1 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/ide/actions/SearchEverywhereAction.java
+19 -6
View File
@@ -32,6 +32,7 @@ import com.intellij.ide.util.DefaultPsiElementCellRenderer;
import com.intellij.ide.util.PropertiesComponent;
import com.intellij.ide.util.gotoByName.*;
import com.intellij.navigation.ItemPresentation;
import com.intellij.navigation.NavigationItem;
import com.intellij.openapi.Disposable;
import com.intellij.openapi.actionSystem.*;
import com.intellij.openapi.actionSystem.ex.AnActionListener;
@@ -979,12 +980,24 @@ public class SearchEverywhereAction extends AnAction implements CustomComponentA
if (name != null) {
setLocationString(name);
}
} else if (value instanceof ItemPresentation) {
final String text = ((ItemPresentation)value).getPresentableText();
append(text == null ? value.toString() : text);
final String location = ((ItemPresentation)value).getLocationString();
if (!StringUtil.isEmpty(location)) {
setLocationString(location);
}
else {
ItemPresentation presentation = null;
if (value instanceof ItemPresentation) {
presentation = (ItemPresentation)value;
}
else if (value instanceof NavigationItem) {
presentation = ((NavigationItem)value).getPresentation();
}
if (presentation != null) {
final String text = presentation.getPresentableText();
append(text == null ? value.toString() : text);
final String location = presentation.getLocationString();
if (!StringUtil.isEmpty(location)) {
setLocationString(location);
}
Icon icon = presentation.getIcon(false);
if (icon != null) setIcon(icon);
}
}
}