From 9b8b79431c80786af00e731e8e7fae97865b2df8 Mon Sep 17 00:00:00 2001 From: "Gregory.Shrago" Date: Tue, 17 Oct 2017 22:54:15 +0300 Subject: [PATCH] make ide.scratch.in.project.view true by default: turn off in tests --- .../com/intellij/ide/impl/ProjectViewSelectInTarget.java | 4 ++-- .../ide/projectView/impl/nodes/AbstractProjectNode.java | 4 ++-- .../projectView/impl/nodes/ProjectViewProjectNode.java | 3 +-- .../com/intellij/ide/scratch/ScratchProjectViewPane.java | 8 +++++++- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/ide/impl/ProjectViewSelectInTarget.java b/platform/lang-impl/src/com/intellij/ide/impl/ProjectViewSelectInTarget.java index 937b67970208..cd87c874ae96 100644 --- a/platform/lang-impl/src/com/intellij/ide/impl/ProjectViewSelectInTarget.java +++ b/platform/lang-impl/src/com/intellij/ide/impl/ProjectViewSelectInTarget.java @@ -24,6 +24,7 @@ import com.intellij.ide.projectView.TreeStructureProvider; import com.intellij.ide.projectView.impl.AbstractProjectViewPane; import com.intellij.ide.projectView.impl.ProjectViewPane; import com.intellij.ide.scratch.ScratchFileType; +import com.intellij.ide.scratch.ScratchProjectViewPane; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.extensions.Extensions; import com.intellij.openapi.project.DumbService; @@ -32,7 +33,6 @@ import com.intellij.openapi.roots.ProjectFileIndex; import com.intellij.openapi.roots.ProjectRootManager; import com.intellij.openapi.util.ActionCallback; import com.intellij.openapi.util.Comparing; -import com.intellij.openapi.util.registry.Registry; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.openapi.wm.ToolWindow; import com.intellij.openapi.wm.ToolWindowId; @@ -120,7 +120,7 @@ public abstract class ProjectViewSelectInTarget extends SelectInTargetPsiWrapper index.isInLibraryClasses(vFile) || index.isInLibrarySource(vFile) || Comparing.equal(vFile.getParent(), myProject.getBaseDir()) || - Registry.is("ide.scratch.in.project.view") && vFile.getFileType() == ScratchFileType.INSTANCE; + ScratchProjectViewPane.isScratchesMergedIntoProjectTab() && vFile.getFileType() == ScratchFileType.INSTANCE; } public String getSubIdPresentableName(String subId) { diff --git a/platform/lang-impl/src/com/intellij/ide/projectView/impl/nodes/AbstractProjectNode.java b/platform/lang-impl/src/com/intellij/ide/projectView/impl/nodes/AbstractProjectNode.java index 9e85dfbe6b88..f897c8b4b081 100644 --- a/platform/lang-impl/src/com/intellij/ide/projectView/impl/nodes/AbstractProjectNode.java +++ b/platform/lang-impl/src/com/intellij/ide/projectView/impl/nodes/AbstractProjectNode.java @@ -20,6 +20,7 @@ import com.intellij.ide.projectView.ProjectViewNode; import com.intellij.ide.projectView.ViewSettings; import com.intellij.ide.projectView.impl.ModuleGroup; import com.intellij.ide.scratch.ScratchFileType; +import com.intellij.ide.scratch.ScratchProjectViewPane; import com.intellij.ide.util.treeView.AbstractTreeNode; import com.intellij.openapi.module.*; import com.intellij.openapi.progress.ProcessCanceledException; @@ -27,7 +28,6 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.roots.ProjectFileIndex; import com.intellij.openapi.roots.ProjectRootManager; import com.intellij.openapi.util.Comparing; -import com.intellij.openapi.util.registry.Registry; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.util.PlatformIcons; import com.intellij.util.containers.ContainerUtil; @@ -135,6 +135,6 @@ public abstract class AbstractProjectNode extends ProjectViewNode { index.isInLibraryClasses(vFile) || index.isInLibrarySource(vFile) || Comparing.equal(vFile.getParent(), myProject.getBaseDir()) || - Registry.is("ide.scratch.in.project.view") && vFile.getFileType() == ScratchFileType.INSTANCE; + ScratchProjectViewPane.isScratchesMergedIntoProjectTab() && vFile.getFileType() == ScratchFileType.INSTANCE; } } diff --git a/platform/lang-impl/src/com/intellij/ide/projectView/impl/nodes/ProjectViewProjectNode.java b/platform/lang-impl/src/com/intellij/ide/projectView/impl/nodes/ProjectViewProjectNode.java index 1bd37f10bc17..63c0e1aaa62f 100644 --- a/platform/lang-impl/src/com/intellij/ide/projectView/impl/nodes/ProjectViewProjectNode.java +++ b/platform/lang-impl/src/com/intellij/ide/projectView/impl/nodes/ProjectViewProjectNode.java @@ -25,7 +25,6 @@ import com.intellij.openapi.module.*; import com.intellij.openapi.module.impl.LoadedModuleDescriptionImpl; import com.intellij.openapi.project.Project; import com.intellij.openapi.roots.ProjectFileIndex; -import com.intellij.openapi.util.registry.Registry; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.PsiDirectory; import com.intellij.psi.PsiManager; @@ -79,7 +78,7 @@ public class ProjectViewProjectNode extends AbstractProjectNode { if (getSettings().isShowLibraryContents()) { nodes.add(new ExternalLibrariesNode(getProject(), getSettings())); } - if (Registry.is("ide.scratch.in.project.view")) { + if (ScratchProjectViewPane.isScratchesMergedIntoProjectTab()) { nodes.add(ScratchProjectViewPane.createRootNode(getProject(), getSettings())); } diff --git a/platform/lang-impl/src/com/intellij/ide/scratch/ScratchProjectViewPane.java b/platform/lang-impl/src/com/intellij/ide/scratch/ScratchProjectViewPane.java index e4d156b30f93..53fdc6cf5596 100644 --- a/platform/lang-impl/src/com/intellij/ide/scratch/ScratchProjectViewPane.java +++ b/platform/lang-impl/src/com/intellij/ide/scratch/ScratchProjectViewPane.java @@ -25,6 +25,7 @@ import com.intellij.ide.projectView.impl.ProjectTreeStructure; import com.intellij.ide.projectView.impl.ProjectViewPane; import com.intellij.ide.projectView.impl.nodes.BasePsiNode; import com.intellij.ide.util.treeView.AbstractTreeNode; +import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.application.ReadAction; import com.intellij.openapi.fileTypes.FileTypeRegistry; import com.intellij.openapi.project.Project; @@ -58,6 +59,11 @@ public class ScratchProjectViewPane extends ProjectViewPane { public static final String ID = "Scratches"; + public static boolean isScratchesMergedIntoProjectTab() { + return Registry.is("ide.scratch.in.project.view") && + !ApplicationManager.getApplication().isUnitTestMode(); + } + public ScratchProjectViewPane(Project project) { super(project); } @@ -158,7 +164,7 @@ public class ScratchProjectViewPane extends ProjectViewPane { @Override public boolean isInitiallyVisible() { - return !Registry.is("ide.scratch.in.project.view"); + return !isScratchesMergedIntoProjectTab(); } @NotNull