From a0b4b4e01f15dc8928c4bcf2f2f72bbc4b00f867 Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Mon, 31 Oct 2016 13:37:13 +0300 Subject: [PATCH] on initial editor load fire the fileChanged() for the current opened editor tab (instead of silently make it active) --- .../openapi/fileEditor/impl/EditorsSplitters.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorsSplitters.java b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorsSplitters.java index 324a1f806d62..ca6cbec9ef35 100644 --- a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorsSplitters.java +++ b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorsSplitters.java @@ -842,7 +842,7 @@ public class EditorsSplitters extends IdePanePanel implements UISettingsListener (Computable)() -> virtualFile.isValid() ? FileDocumentManager.getInstance().getDocument(virtualFile) : null); final boolean isCurrentInTab = Boolean.valueOf(file.getAttributeValue(CURRENT_IN_TAB)).booleanValue(); Boolean pin = Boolean.valueOf(file.getAttributeValue(PINNED)); - fileEditorManager.openFileImpl4(window, virtualFile, entry, isCurrentInTab, isCurrentInTab, pin, i); + fileEditorManager.openFileImpl4(window, virtualFile, entry, false, false, pin, i); if (isCurrentInTab) { focusedFile = virtualFile; } @@ -862,6 +862,13 @@ public class EditorsSplitters extends IdePanePanel implements UISettingsListener } if (focusedFile != null) { getManager().addSelectionRecord(focusedFile, window); + VirtualFile finalFocusedFile = focusedFile; + UIUtil.invokeLaterIfNeeded(()->{ + EditorWithProviderComposite editor = window.findFileComposite(finalFocusedFile); + if (editor != null) { + window.setEditor(editor, true, true); + } + }); } return window.myPanel; }