From 067ecf37ed16672965f6cd33b596cd083819234d Mon Sep 17 00:00:00 2001 From: "Gregory.Shrago" Date: Tue, 17 Oct 2017 20:34:41 +0300 Subject: [PATCH] make ide.scratch.enabled always true and remove it --- .../src/com/intellij/ide/scratch/ScratchFileActions.java | 7 +++---- platform/util/resources/misc/registry.properties | 2 -- .../com/jetbrains/python/PyCharmInitialConfigurator.java | 1 - 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/ide/scratch/ScratchFileActions.java b/platform/lang-impl/src/com/intellij/ide/scratch/ScratchFileActions.java index 73172ad25bc1..5b970fe67e19 100644 --- a/platform/lang-impl/src/com/intellij/ide/scratch/ScratchFileActions.java +++ b/platform/lang-impl/src/com/intellij/ide/scratch/ScratchFileActions.java @@ -78,9 +78,8 @@ public class ScratchFileActions { getTemplatePresentation().setText(myActionText); String place = e.getPlace(); - boolean enabled = e.getProject() != null - && Registry.is("ide.scratch.enabled") - && (ActionPlaces.isMainMenuOrActionSearch(place) || ActionPlaces.isPopupPlace(place)); + boolean enabled = e.getProject() != null && + (ActionPlaces.isMainMenuOrActionSearch(place) || ActionPlaces.isPopupPlace(place)); Presentation presentation = e.getPresentation(); presentation.setEnabledAndVisible(enabled); @@ -145,7 +144,7 @@ public class ScratchFileActions { @Override public void update(@NotNull AnActionEvent e) { - boolean enabled = e.getProject() != null && Registry.is("ide.scratch.enabled") && Registry.intValue("ide.scratch.buffers") > 0; + boolean enabled = e.getProject() != null && Registry.intValue("ide.scratch.buffers") > 0; e.getPresentation().setEnabledAndVisible(enabled); } diff --git a/platform/util/resources/misc/registry.properties b/platform/util/resources/misc/registry.properties index 80583c4817dd..39a15cd1d8b9 100644 --- a/platform/util/resources/misc/registry.properties +++ b/platform/util/resources/misc/registry.properties @@ -753,8 +753,6 @@ embed.scene.builder.description=Show SceneBuilder embedded into IntelliJ IDEA fr new.retina.detection=false new.retina.detection.description=New implementation to detect retina devices -ide.scratch.enabled=true -ide.scratch.enabled.description=Disables scratch files and buffers ide.scratch.buffers=5 ide.scratch.buffers.description=Number of scratch buffer files ide.scratch.in.project.view=false diff --git a/python/ide/src/com/jetbrains/python/PyCharmInitialConfigurator.java b/python/ide/src/com/jetbrains/python/PyCharmInitialConfigurator.java index d349d575b79a..fa28c1c2e131 100644 --- a/python/ide/src/com/jetbrains/python/PyCharmInitialConfigurator.java +++ b/python/ide/src/com/jetbrains/python/PyCharmInitialConfigurator.java @@ -91,7 +91,6 @@ public class PyCharmInitialConfigurator { }); } - Registry.get("ide.scratch.enabled").setValue(true); Registry.get("ide.ssh.one.time.password").setValue(true); }