From bdb70a49735c980cdbea21fdb685fec230c9ab9f Mon Sep 17 00:00:00 2001
From: Vladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Date: Thu, 9 Jan 2020 19:51:47 +0100
Subject: [PATCH] fix testDockableContainer

GitOrigin-RevId: 3ccc05e514b7e581777c49d4f0c57e58f7d9d46d
---
 .../ui/docking/impl/DockManagerImpl.java      | 27 ++++++++++++-------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/ui/docking/impl/DockManagerImpl.java b/platform/platform-impl/src/com/intellij/ui/docking/impl/DockManagerImpl.java
index f00ad63fe50f..0ed0277bce6c 100644
--- a/platform/platform-impl/src/com/intellij/ui/docking/impl/DockManagerImpl.java
+++ b/platform/platform-impl/src/com/intellij/ui/docking/impl/DockManagerImpl.java
@@ -378,14 +378,18 @@ public final class DockManagerImpl extends DockManager implements PersistentStat
   }
 
   @NotNull
-  public Pair<FileEditor[], FileEditorProvider[]> createNewDockContainerFor(@NotNull VirtualFile file, @NotNull FileEditorManagerImpl fileEditorManager) {
+  public Pair<FileEditor[], FileEditorProvider[]> createNewDockContainerFor(@NotNull VirtualFile file,
+                                                                            @NotNull FileEditorManagerImpl fileEditorManager) {
     DockContainer container = getFactory(DockableEditorContainerFactory.TYPE).createContainer(null);
     register(container);
 
     DockWindow window = createWindowFor(null, container);
-    window.show(true);
-    final EditorWindow editorWindow = ((DockableEditorTabbedContainer)container).getSplitters().getOrCreateCurrentWindow(file);
-    final Pair<FileEditor[], FileEditorProvider[]> result = fileEditorManager.openFileImpl2(editorWindow, file, true);
+    if (!ApplicationManager.getApplication().isHeadlessEnvironment()) {
+      window.show(true);
+    }
+
+    EditorWindow editorWindow = ((DockableEditorTabbedContainer)container).getSplitters().getOrCreateCurrentWindow(file);
+    Pair<FileEditor[], FileEditorProvider[]> result = fileEditorManager.openFileImpl2(editorWindow, file, true);
     container.add(EditorTabbedContainer.createDockableEditor(myProject, null, file, new Presentation(file.getName()), editorWindow), null);
 
     SwingUtilities.invokeLater(() -> window.myUiContainer.setPreferredSize(null));
@@ -416,11 +420,13 @@ public final class DockManagerImpl extends DockManager implements PersistentStat
       myContainer = container;
       setProject(project);
 
-      if (!(container instanceof DockContainer.Dialog)) {
+      if (!ApplicationManager.getApplication().isHeadlessEnvironment() && !(container instanceof DockContainer.Dialog)) {
         StatusBar statusBar = WindowManager.getInstance().getStatusBar(project);
-        Window frame = getFrame();
-        if (statusBar != null && frame instanceof IdeFrame) {
-          setStatusBar(statusBar.createChild((IdeFrame)frame));
+        if (statusBar != null) {
+          Window frame = getFrame();
+          if (frame instanceof IdeFrame) {
+            setStatusBar(statusBar.createChild((IdeFrame)frame));
+          }
         }
       }
 
@@ -467,7 +473,10 @@ public final class DockManagerImpl extends DockManager implements PersistentStat
     }
 
     private void updateNorthPanel() {
-      if (ApplicationManager.getApplication().isUnitTestMode()) return;
+      if (ApplicationManager.getApplication().isUnitTestMode()) {
+        return;
+      }
+
       myNorthPanel.setVisible(UISettings.getInstance().getShowNavigationBar()
                               && !(myContainer instanceof DockContainer.Dialog)
                               && !UISettings.getInstance().getPresentationMode());