From a1376e25313ee67140832f07bfd4ec4bc971f967 Mon Sep 17 00:00:00 2001 From: Sergey Malenkov Date: Wed, 7 Mar 2018 18:45:04 +0300 Subject: [PATCH] IDEA-181529 return last selected editor before others --- .../openapi/fileEditor/impl/FileEditorManagerImpl.java | 5 +++-- 1 file changed, 3 insertions(+), 2 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 432f63802b7e..948f0cd8e1b8 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 @@ -1249,11 +1249,12 @@ public class FileEditorManagerImpl extends FileEditorManagerEx implements Persis @Override @NotNull public FileEditor[] getSelectedEditors() { - Set selectedEditors = new HashSet<>(); + Set selectedEditors = new LinkedHashSet<>(); + EditorComposite selected = getLastSelected(); + if (selected != null) selectedEditors.add(selected.getSelectedEditor()); for (EditorsSplitters each : getAllSplitters()) { ContainerUtil.addAll(selectedEditors, each.getSelectedEditors()); } - return selectedEditors.toArray(new FileEditor[0]); }