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

allow searching by container text in goto declaration popup (PY-1533 & friends); don't show location twice in the same popup in platform products

Browse Source
This commit is contained in:
Dmitry Jemerov
2010-08-17 21:34:44 +04:00
parent bed35b2a0d
commit 60f764e8b6
2 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/codeInsight/navigation/NavigationUtil.java
+1 -1
View File
@@ -82,7 +82,7 @@ public final class NavigationUtil {
if (title != null) {
builder.setTitle(title);
}
renderer.installSpeedSearch(builder);
renderer.installSpeedSearch(builder, true);
return builder.setItemChoosenCallback(runnable).createPopup();
}
platform/lang-impl/src/com/intellij/ide/util/PsiElementListCellRenderer.java
+17 -3
View File
@@ -155,7 +155,12 @@ public abstract class PsiElementListCellRenderer<T extends PsiElement> extends J
@Nullable
protected DefaultListCellRenderer getRightCellRenderer() {
if (UISettings.getInstance().SHOW_ICONS_IN_QUICK_NAVIGATION) {
return ModuleRendererFactory.getInstance().getModuleRenderer();
final DefaultListCellRenderer renderer = ModuleRendererFactory.getInstance().getModuleRenderer();
if (renderer instanceof PlatformModuleRendererFactory.PlatformModuleRenderer) {
// it won't display any new information
return null;
}
return renderer;
}
return null;
}
@@ -187,10 +192,18 @@ public abstract class PsiElementListCellRenderer<T extends PsiElement> extends J
}
public void installSpeedSearch(PopupChooserBuilder builder) {
installSpeedSearch(builder, false);
}
public void installSpeedSearch(PopupChooserBuilder builder, final boolean includeContainerText) {
builder.setFilteringEnabled(new Function<Object, String>() {
public String fun(Object o) {
if (o instanceof PsiElement) {
return PsiElementListCellRenderer.this.getElementText((T)o);
final String elementText = PsiElementListCellRenderer.this.getElementText((T)o);
if (includeContainerText) {
return elementText + " " + getContainerText((T) o, elementText);
}
return elementText;
}
else {
return o.toString();
@@ -207,7 +220,8 @@ public abstract class PsiElementListCellRenderer<T extends PsiElement> extends J
new ListSpeedSearch(list) {
protected String getElementText(Object o) {
if (o instanceof PsiElement) {
return PsiElementListCellRenderer.this.getElementText((T)o);
final String elementText = PsiElementListCellRenderer.this.getElementText((T)o);
return elementText + " " + getContainerText((T) o, elementText);
}
else {
return o.toString();