From 5538f89a7ba552bd75bdfe249163b04c95efc1ac Mon Sep 17 00:00:00 2001
From: Andrey Akinshin <andrey.akinshin@jetbrains.com>
Date: Tue, 21 Jun 2016 08:57:24 +0300
Subject: [PATCH] SimpleToolWindowPanel: extend AnAction list for panels with
 several toolbars

---
 .../src/com/intellij/openapi/ui/SimpleToolWindowPanel.java | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/platform/platform-api/src/com/intellij/openapi/ui/SimpleToolWindowPanel.java b/platform/platform-api/src/com/intellij/openapi/ui/SimpleToolWindowPanel.java
index 0d7b5777180a..0ae404f593a2 100644
--- a/platform/platform-api/src/com/intellij/openapi/ui/SimpleToolWindowPanel.java
+++ b/platform/platform-api/src/com/intellij/openapi/ui/SimpleToolWindowPanel.java
@@ -19,6 +19,7 @@ import com.intellij.openapi.actionSystem.ActionToolbar;
 import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.actionSystem.DataProvider;
 import com.intellij.ui.switcher.QuickActionProvider;
+import com.intellij.util.containers.JBIterable;
 import com.intellij.util.ui.UIUtil;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.Nullable;
@@ -105,8 +106,10 @@ public class SimpleToolWindowPanel extends JPanel implements QuickActionProvider
   }
 
   public List<AnAction> getActions(boolean originalProvider) {
-    ActionToolbar toolbar = UIUtil.uiTraverser(myToolbar).traverse().filter(ActionToolbar.class).first();
-    return toolbar == null ? null : toolbar.getActions(originalProvider);
+    JBIterable<ActionToolbar> toolbars = UIUtil.uiTraverser(myToolbar).traverse().filter(ActionToolbar.class);
+    if (toolbars.size() == 0)
+      return null;
+    return toolbars.flatten(toolbar -> toolbar.getActions(originalProvider)).toList();
   }
 
   public JComponent getComponent() {