diff --git a/java/execution/impl/src/com/intellij/execution/testDiscovery/actions/ShowDiscoveredTestsAction.java b/java/execution/impl/src/com/intellij/execution/testDiscovery/actions/ShowDiscoveredTestsAction.java index 2e88e9714210..456219bce6cb 100644 --- a/java/execution/impl/src/com/intellij/execution/testDiscovery/actions/ShowDiscoveredTestsAction.java +++ b/java/execution/impl/src/com/intellij/execution/testDiscovery/actions/ShowDiscoveredTestsAction.java @@ -175,7 +175,13 @@ public class ShowDiscoveredTestsAction extends AnAction { ActiveComponent runButton = createButton(RUN_ALL_ACTION_TEXT, AllIcons.Actions.Execute, () -> runAllDiscoveredTests(project, tree, ref, context, initTitle)); Runnable pinActionListener = () -> { - UsageView view = FindUtil.showInUsageView(null, tree.getTestMethods(), param -> new TestMethodUsage(param), initTitle, project); + UsageView view = FindUtil.showInUsageView(null, tree.getTestMethods(), param -> new TestMethodUsage(param), initTitle, p -> { + p.setCodeUsages(false); // don't show r/w, imports filtering actions + p.setUsagesWord("test"); + p.setMergeDupLinesAvailable(false); + p.setUsageTypeFilteringAvailable(false); + p.setExcludeAvailable(false); + }, project); if (view != null) { view.addButtonToLowerPane(new AbstractAction(RUN_ALL_ACTION_TEXT, AllIcons.Actions.Execute) { @Override @@ -183,10 +189,6 @@ public class ShowDiscoveredTestsAction extends AnAction { runAllDiscoveredTests(project, tree, ref, context, initTitle); } }); - view.getPresentation().setUsagesWord("test"); - view.getPresentation().setMergeDupLinesAvailable(false); - view.getPresentation().setUsageTypeFilteringAvailable(false); - view.getPresentation().setExcludeAvailable(false); } JBPopup popup = ref.get(); if (popup != null) { diff --git a/platform/lang-impl/src/com/intellij/find/FindUtil.java b/platform/lang-impl/src/com/intellij/find/FindUtil.java index d3c59ea76662..c76df1e0a6a8 100644 --- a/platform/lang-impl/src/com/intellij/find/FindUtil.java +++ b/platform/lang-impl/src/com/intellij/find/FindUtil.java @@ -62,6 +62,7 @@ import com.intellij.ui.LightweightHint; import com.intellij.usageView.UsageInfo; import com.intellij.usages.*; import com.intellij.usages.impl.UsageViewImpl; +import com.intellij.util.Consumer; import com.intellij.util.Function; import com.intellij.util.containers.ContainerUtil; import com.intellij.util.ui.UIUtil; @@ -909,12 +910,16 @@ public class FindUtil { @NotNull T[] targets, @NotNull Function usageConverter, @NotNull String title, + @Nullable Consumer presentationSetup, @NotNull final Project project) { if (targets.length == 0) return null; final UsageViewPresentation presentation = new UsageViewPresentation(); presentation.setCodeUsagesString(title); presentation.setTabName(title); presentation.setTabText(title); + if (presentationSetup != null) { + presentationSetup.consume(presentation); + } UsageTarget[] usageTargets = sourceElement == null ? UsageTarget.EMPTY_ARRAY : new UsageTarget[]{new PsiElement2UsageTargetAdapter(sourceElement)}; UsageView view = UsageViewManager.getInstance(project).showUsages(usageTargets, Usage.EMPTY_ARRAY, presentation); @@ -953,7 +958,7 @@ public class FindUtil { return showInUsageView(sourceElement, pointers, p -> { PsiElement element = p.getElement(); return element == null ? null : UsageInfoToUsageConverter.convert(primary, new UsageInfo(element)); - }, title, project); + }, title, null, project); } /**