From 4d19934c175e17190bc2c5ed9f1ca47365948873 Mon Sep 17 00:00:00 2001
From: Vladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Date: Fri, 22 Nov 2019 17:57:25 +0100
Subject: [PATCH] cleanup

GitOrigin-RevId: 3a4ed6667ed2a70731807c068a2bbd76d135c8ac
---
 .../impl/FileEditorManagerImpl.java           | 21 ++++++++++++-------
 .../context/OpenEditorsContextProvider.java   |  1 +
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/FileEditorManagerImpl.java b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/FileEditorManagerImpl.java
index 13b607ddae6e..9975da527994 100644
--- a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/FileEditorManagerImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/FileEditorManagerImpl.java
@@ -226,7 +226,9 @@ public class FileEditorManagerImpl extends FileEditorManagerEx implements Persis
   }
 
   public void initDockableContentFactory() {
-    if (myContentFactory != null) return;
+    if (myContentFactory != null) {
+      return;
+    }
 
     myContentFactory = new DockableEditorContainerFactory(myProject, this);
     myDockManager.register(DockableEditorContainerFactory.TYPE, myContentFactory);
@@ -260,7 +262,6 @@ public class FileEditorManagerImpl extends FileEditorManagerEx implements Persis
         all.add(((DockableEditorTabbedContainer)each).getSplitters());
       }
     }
-
     return Collections.unmodifiableSet(all);
   }
 
@@ -1235,15 +1236,22 @@ public class FileEditorManagerImpl extends FileEditorManagerEx implements Persis
   }
 
   @Override
-  public boolean isFileOpen(@NotNull final VirtualFile file) {
-    return ContainerUtil.exists(myOpenedEditors, composite -> composite.getFile().equals(file));
+  public boolean isFileOpen(@NotNull VirtualFile file) {
+    for (EditorComposite editor : myOpenedEditors) {
+      if (editor.getFile().equals(file)) {
+        return true;
+      }
+    }
+    return false;
   }
 
   @Override
   @NotNull
   public VirtualFile[] getOpenFiles() {
-    Set<VirtualFile> files = new HashSet<>();
-    myOpenedEditors.forEach(composite -> files.add(composite.getFile()));
+    Set<VirtualFile> files = new LinkedHashSet<>();
+    for (EditorComposite composite : myOpenedEditors) {
+      files.add(composite.getFile());
+    }
     return VfsUtilCore.toVirtualFileArray(files);
   }
 
@@ -1268,7 +1276,6 @@ public class FileEditorManagerImpl extends FileEditorManagerEx implements Persis
     for (EditorsSplitters each : getAllSplitters()) {
       ContainerUtil.addAll(selectedEditors, each.getSelectedEditors());
     }
-
     return selectedEditors.toArray(new FileEditor[0]);
   }
 
diff --git a/platform/tasks-platform-impl/src/com/intellij/tasks/context/OpenEditorsContextProvider.java b/platform/tasks-platform-impl/src/com/intellij/tasks/context/OpenEditorsContextProvider.java
index e6a19b529efa..e32f5d7d32a6 100644
--- a/platform/tasks-platform-impl/src/com/intellij/tasks/context/OpenEditorsContextProvider.java
+++ b/platform/tasks-platform-impl/src/com/intellij/tasks/context/OpenEditorsContextProvider.java
@@ -50,6 +50,7 @@ final class OpenEditorsContextProvider extends WorkingContextProvider {
       fileEditorManager.loadState(element);
       fileEditorManager.getMainSplitters().openFiles();
     }
+
     Element dockState = element.getChild("DockManager");
     if (dockState != null) {
       DockManagerImpl dockManager = (DockManagerImpl)DockManager.getInstance(project);