diff --git a/platform/lang-impl/src/com/intellij/ide/impl/StructureViewWrapperImpl.kt b/platform/lang-impl/src/com/intellij/ide/impl/StructureViewWrapperImpl.kt index 5f8130e9521a..05496af2b1de 100644 --- a/platform/lang-impl/src/com/intellij/ide/impl/StructureViewWrapperImpl.kt +++ b/platform/lang-impl/src/com/intellij/ide/impl/StructureViewWrapperImpl.kt @@ -563,7 +563,13 @@ class StructureViewWrapperImpl( val titleActions: List = if (structureView is StructureViewComponent) { if (ExperimentalUI.isNewUI()) { readAction { structureView.getViewActions(myActionGroup) } - listOf(myActionGroup) + val headerActions = withContext(Dispatchers.EDT) { structureView.headerActions } + if (headerActions.isNotEmpty()) { + listOf(myActionGroup, Separator.getInstance()) + headerActions + } + else { + listOf(myActionGroup) + } } else { withContext(Dispatchers.EDT) { structureView.addExpandCollapseActions() } diff --git a/platform/lang-impl/src/com/intellij/ide/structureView/newStructureView/StructureViewComponent.java b/platform/lang-impl/src/com/intellij/ide/structureView/newStructureView/StructureViewComponent.java index bd613e196c8f..380e9200262b 100644 --- a/platform/lang-impl/src/com/intellij/ide/structureView/newStructureView/StructureViewComponent.java +++ b/platform/lang-impl/src/com/intellij/ide/structureView/newStructureView/StructureViewComponent.java @@ -377,7 +377,7 @@ public class StructureViewComponent extends SimpleToolWindowPanel implements Tre } @ApiStatus.Internal - public final void getViewActions(@NotNull DefaultActionGroup result) { + public void getViewActions(@NotNull DefaultActionGroup result) { result.addSeparator(StructureViewBundle.message("structureview.subgroup.sort")); result.addAll(sortActionsByName(getSortActions())); result.addSeparator(StructureViewBundle.message("structureview.subgroup.filter")); @@ -429,6 +429,10 @@ public class StructureViewComponent extends SimpleToolWindowPanel implements Tre return result; } + @ApiStatus.Internal + public @NotNull List getHeaderActions() { + return Collections.emptyList(); + } protected void addGroupByActions(@NotNull DefaultActionGroup result) { Grouper[] groupers = myTreeModel.getGroupers();