1 files changed, 14 insertions, 11 deletions
diff --git a/platform/lang-impl/src/com/intellij/execution/ui/layout/impl/RunnerContentUi.java b/platform/lang-impl/src/com/intellij/execution/ui/layout/impl/RunnerContentUi.java
index b8225b0c238b..5384ea06de23 100644
--- a/platform/lang-impl/src/com/intellij/execution/ui/layout/impl/RunnerContentUi.java
+++ b/platform/lang-impl/src/com/intellij/execution/ui/layout/impl/RunnerContentUi.java
@@ -290,7 +290,8 @@ public class RunnerContentUi implements ContentUI, Disposable, CellTransform.Fac
       final ContentManager manager = ContentFactory.SERVICE.getInstance().createContentManager(this, false, myProject);
       Disposer.register((Disposable)myRunnerUi, manager);
       manager.getComponent();
-    } else {
+    }
+    else {
       final DockManager dockManager = DockManager.getInstance(myProject);
       if (dockManager != null) { //default project
         dockManager.register(this);
@@ -518,13 +519,15 @@ public class RunnerContentUi implements ContentUI, Disposable, CellTransform.Fac
   @Override
   public void closeAll() {
     final Content[] contents = myManager.getContents();
-    for (Content content : contents) {
-      getStateFor(content).setWindow(0);
-    }
     if (myOriginal != null) {
       for (Content content : contents) {
+        getStateFor(content).setWindow(0);
         myOriginal.myManager.addContent(content);
-        myOriginal.findCellFor(content).minimize(content);
+        GridCell cell = myOriginal.findCellFor(content);
+        if (cell != null) {
+          myOriginal.restoreContent(content.getUserData(ViewImpl.ID));
+          cell.minimize(content);
+        }
       }
     }
     myManager.removeAllContents(false);
@@ -1373,7 +1376,6 @@ public class RunnerContentUi implements ContentUI, Disposable, CellTransform.Fac
   }
 
   private class MyComponent extends Wrapper.FocusHolder implements DataProvider, QuickActionProvider {
-
     private boolean myWasEverAdded;
 
     public MyComponent() {
@@ -1388,9 +1390,13 @@ public class RunnerContentUi implements ContentUI, Disposable, CellTransform.Fac
       if (KEY.is(dataId)) {
         return RunnerContentUi.this;
       }
-      else {
-        return null;
+
+      ContentManager originalContentManager = myOriginal == null ? null : myOriginal.getContentManager();
+      JComponent originalContentComponent = originalContentManager == null ? null : originalContentManager.getComponent();
+      if (originalContentComponent instanceof DataProvider) {
+        return ((DataProvider)originalContentComponent).getData(dataId);
       }
+      return null;
     }
 
     @SuppressWarnings("NullableProblems")
@@ -1839,9 +1845,6 @@ public class RunnerContentUi implements ContentUI, Disposable, CellTransform.Fac
     public void dragOutFinished(MouseEvent event, TabInfo source) {
       final Component component = event.getComponent();
       final IdeFrame window = UIUtil.getParentOfType(IdeFrame.class, component);
-      if (window != null) {
-
-      }
       mySession.process(event);
       mySession = null;
     }