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-228306 Items in "Go to Test" and "Go to Implementations" popup use monospaced (editor) font

Browse Source 
GitOrigin-RevId: 64c222f9eb217f9afdaba0c5a83acc6c7d5169f3
This commit is contained in:
Egor Ushakov
2019-12-18 10:32:28 +00:00
committed by intellij-monorepo-bot
parent c860ab37f4
commit 48b7c94f54
2 changed files with 31 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/codeInsight/navigation/GotoTargetHandler.java
+26 -19
View File
@@ -74,6 +74,10 @@ public abstract class GotoTargetHandler implements CodeInsightActionHandler {
@NonNls
protected abstract String getFeatureUsedKey();
protected boolean useEditorFont() {
return true;
}
@Nullable
protected abstract GotoData getSourceAndTargetElements(Editor editor, PsiFile file);
@@ -112,25 +116,26 @@ public abstract class GotoTargetHandler implements CodeInsightActionHandler {
final IPopupChooserBuilder<Object> builder = JBPopupFactory.getInstance().createPopupChooserBuilder(allElements);
final Ref<UsageView> usageView = new Ref<>();
final JBPopup popup = builder.setNamerForFiltering(o -> {
builder.setNamerForFiltering(o -> {
if (o instanceof AdditionalAction) {
return ((AdditionalAction)o).getText();
}
return getRenderer(o, gotoData).getElementText((PsiElement)o);
}).
setTitle(title).
setFont(EditorUtil.getEditorFont()).
setRenderer(new DefaultListCellRenderer() {
@Override
public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
if (value == null) return super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
if (value instanceof AdditionalAction) {
return myActionElementRenderer.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
}
PsiElementListCellRenderer renderer = getRenderer(value, gotoData);
return renderer.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
}).setTitle(title);
if (useEditorFont()) {
builder.setFont(EditorUtil.getEditorFont());
}
builder.setRenderer(new DefaultListCellRenderer() {
@Override
public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
if (value == null) return super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
if (value instanceof AdditionalAction) {
return myActionElementRenderer.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
}
}).
PsiElementListCellRenderer renderer = getRenderer(value, gotoData);
return renderer.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
}
}).
setItemsChosenCallback(selectedElements -> {
for (Object element : selectedElements) {
if (element instanceof AdditionalAction) {
@@ -159,17 +164,19 @@ public abstract class GotoTargetHandler implements CodeInsightActionHandler {
return true;
}).
setCouldPin(popup1 -> {
usageView.set(FindUtil.showInUsageView(gotoData.source, gotoData.targets, getFindUsagesTitle(gotoData.source, name, gotoData.targets.length), gotoData.source.getProject()));
usageView.set(FindUtil.showInUsageView(gotoData.source, gotoData.targets,
getFindUsagesTitle(gotoData.source, name, gotoData.targets.length),
gotoData.source.getProject()));
popup1.cancel();
return false;
}).
setAdText(getAdText(gotoData.source, targets.length)).
createPopup();
setAdText(getAdText(gotoData.source, targets.length));
final JBPopup popup = builder.createPopup();
JScrollPane pane = builder instanceof PopupChooserBuilder ? ((PopupChooserBuilder)builder).getScrollPane() : null;
if (pane != null) {
pane.setBorder(null);
pane.setViewportBorder(null);
pane.setBorder(null);
pane.setViewportBorder(null);
}
if (gotoData.listUpdaterTask != null) {
platform/lang-impl/src/com/intellij/testIntegration/GotoTestOrCodeHandler.java
+5
View File
@@ -141,6 +141,11 @@ public class GotoTestOrCodeHandler extends GotoTargetHandler {
return null;
}
@Override
protected boolean useEditorFont() {
return false;
}
@Override
protected void navigateToElement(@NotNull Navigatable element) {
if (element instanceof PsiElement) {