From 4b1969ea6126c6210effd8644b2f879f05e04d7f Mon Sep 17 00:00:00 2001 From: Alexander Koshevoy Date: Fri, 14 Feb 2020 19:37:27 +0300 Subject: [PATCH] IDEA-232922 Fix SOE on revealing hidden toolbar actions in the popup Revert "IDEA-CR-50279: PY-36737 Fix inability to use Jupyter editor actions from toolbar shown in popup". This reverts commit 351e6bea. This fixes IDEA-232922 and exposes PY-36737. GitOrigin-RevId: 05afcd81e29d71373e86faadeff488cdd772a0ab --- .../openapi/actionSystem/impl/ActionToolbarImpl.java | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionToolbarImpl.java b/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionToolbarImpl.java index 5ec02d85efaf..9447c10af143 100644 --- a/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionToolbarImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionToolbarImpl.java @@ -1320,7 +1320,7 @@ public class ActionToolbarImpl extends JPanel implements ActionToolbar, QuickAct myUpdater.updateActions(false, false); } - abstract static class PopupToolbar extends ActionToolbarImpl implements AnActionListener, DataProvider, Disposable { + abstract static class PopupToolbar extends ActionToolbarImpl implements AnActionListener, Disposable { private final JComponent myParent; PopupToolbar(@NotNull String place, @@ -1333,12 +1333,6 @@ public class ActionToolbarImpl extends JPanel implements ActionToolbar, QuickAct setBorder(myParent.getBorder()); } - @Nullable - @Override - public Object getData(@NotNull String dataId) { - return getDataContext().getData(dataId); - } - @Override public Container getParent() { Container parent = super.getParent();