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-204424 Add "Other" group if needed and ensure no duplicated entries on the list

Browse Source
This commit is contained in:
Piotr Tomiak
2018-12-20 21:02:04 +01:00
parent 569e5afa04
commit 0094a5dbfe
1 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/codeInsight/navigation/NavigationUtil.java
+14 -10
View File
@@ -264,15 +264,19 @@ public final class NavigationUtil {
*/
@NotNull
public static JBPopup getRelatedItemsPopup(final List<? extends GotoRelatedItem> items, String title, boolean showContainingModules) {
Object[] elements = new Object[items.size()];
List<Object> elements = new ArrayList<>(items.size());
//todo[nik] move presentation logic to GotoRelatedItem class
final Map<PsiElement, GotoRelatedItem> itemsMap = new HashMap<>();
for (int i = 0; i < items.size(); i++) {
GotoRelatedItem item = items.get(i);
elements[i] = item.getElement() != null ? item.getElement() : item;
itemsMap.put(item.getElement(), item);
for (GotoRelatedItem item : items) {
if (item.getElement() != null) {
if (itemsMap.putIfAbsent(item.getElement(), item) == null) {
elements.add(item.getElement());
}
}
else {
elements.add(item);
}
}
return getPsiElementPopup(elements, itemsMap, title, showContainingModules, element -> {
if (element instanceof PsiElement) {
itemsMap.get(element).navigate();
@@ -285,7 +289,7 @@ public final class NavigationUtil {
);
}
private static JBPopup getPsiElementPopup(final Object[] elements, final Map<PsiElement, GotoRelatedItem> itemsMap,
private static JBPopup getPsiElementPopup(final List<Object> elements, final Map<PsiElement, GotoRelatedItem> itemsMap,
final String title, final boolean showContainingModules, final Processor<Object> processor) {
final Ref<Boolean> hasMnemonic = Ref.create(false);
@@ -366,7 +370,7 @@ public final class NavigationUtil {
return component;
}
};
final ListPopupImpl popup = new ListPopupImpl(new BaseListPopupStep<Object>(title, Arrays.asList(elements)) {
final ListPopupImpl popup = new ListPopupImpl(new BaseListPopupStep<Object>(title, elements) {
@Override
public boolean isSpeedSearchEnabled() {
return true;
@@ -390,7 +394,7 @@ public final class NavigationUtil {
}) {
};
popup.getList().setCellRenderer(new PopupListElementRenderer(popup) {
Map<Object, String> separators = new HashMap<>();
final Map<Object, String> separators = new HashMap<>();
{
final ListModel model = popup.getList().getModel();
String current = null;
@@ -400,7 +404,7 @@ public final class NavigationUtil {
final GotoRelatedItem item = itemsMap.get(element);
if (item != null && !StringUtil.equals(current, item.getGroup())) {
current = item.getGroup();
separators.put(element, current);
separators.put(element, hasTitle && StringUtil.isEmpty(current) ? "Other" : current);
if (!hasTitle && !StringUtil.isEmpty(current)) {
hasTitle = true;
}