GitOrigin-RevId: 3a4ed6667ed2a70731807c068a2bbd76d135c8ac
This commit is contained in:
Vladimir Krivosheev
2019-11-22 18:02:21 +00:00
committed by intellij-monorepo-bot
parent d953dd1f1b
commit 4d19934c17
2 changed files with 15 additions and 7 deletions
@@ -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]);
}
@@ -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);