From 7c521f4bb8565ae7500b7558bdb97804cf93a00c Mon Sep 17 00:00:00 2001
From: Dmitry Trofimov <dmitry.trofimov@jetbrains.com>
Date: Mon, 31 Jul 2017 15:12:17 +0200
Subject: [PATCH] Turn on dumb aware run configurations by default (PY-25435)

---
 .../python/edu/PyCharmEduInitialConfigurator.java         | 8 ++++++++
 .../com/jetbrains/python/PyCharmInitialConfigurator.java  | 4 ++++
 2 files changed, 12 insertions(+)

diff --git a/python/educational-python/src/com/jetbrains/python/edu/PyCharmEduInitialConfigurator.java b/python/educational-python/src/com/jetbrains/python/edu/PyCharmEduInitialConfigurator.java
index 22166146d2bc..27f6704c0b56 100644
--- a/python/educational-python/src/com/jetbrains/python/edu/PyCharmEduInitialConfigurator.java
+++ b/python/educational-python/src/com/jetbrains/python/edu/PyCharmEduInitialConfigurator.java
@@ -60,6 +60,7 @@ import com.intellij.openapi.ui.DialogBuilder;
 import com.intellij.openapi.util.Disposer;
 import com.intellij.openapi.util.Key;
 import com.intellij.openapi.util.Ref;
+import com.intellij.openapi.util.registry.Registry;
 import com.intellij.openapi.vfs.VfsUtil;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.openapi.wm.*;
@@ -103,6 +104,7 @@ public class PyCharmEduInitialConfigurator {
   @NonNls private static final String CONFIGURED_V1 = "PyCharmEDU.InitialConfiguration.V1";
   @NonNls private static final String CONFIGURED_V2 = "PyCharmEDU.InitialConfiguration.V2";
   @NonNls private static final String CONFIGURED_V3 = "PyCharmEDU.InitialConfiguration.V3";
+  @NonNls private static final String CONFIGURED_V4 = "PyCharmEDU.InitialConfiguration.V4";
 
   private static final Set<String> UNRELATED_TIPS = Sets.newHashSet("LiveTemplatesDjango.html", "TerminalOpen.html",
                                                                     "Terminal.html", "ConfiguringTerminal.html");
@@ -149,6 +151,12 @@ public class PyCharmEduInitialConfigurator {
                                        FileTypeManager fileTypeManager,
                                        final ProjectManagerEx projectManager) {
     final UISettings uiSettings = UISettings.getInstance();
+
+    if (!propertiesComponent.getBoolean(CONFIGURED_V4)) {
+      Registry.get("dumb.aware.run.configurations").setValue(true);
+      propertiesComponent.setValue(CONFIGURED_V4, true);
+    }
+
     if (!propertiesComponent.getBoolean(CONFIGURED_V2)) {
       EditorSettingsExternalizable editorSettings = EditorSettingsExternalizable.getInstance();
       editorSettings.setEnsureNewLineAtEOF(true);
diff --git a/python/ide/src/com/jetbrains/python/PyCharmInitialConfigurator.java b/python/ide/src/com/jetbrains/python/PyCharmInitialConfigurator.java
index 5d2b2cfde2c5..d349d575b79a 100644
--- a/python/ide/src/com/jetbrains/python/PyCharmInitialConfigurator.java
+++ b/python/ide/src/com/jetbrains/python/PyCharmInitialConfigurator.java
@@ -74,6 +74,10 @@ public class PyCharmInitialConfigurator {
       propertiesComponent.setValue("PyCharm.InitialConfiguration.V6", true);
       CodeInsightSettings.getInstance().INDENT_TO_CARET_ON_PASTE = true;
     }
+    if (!propertiesComponent.getBoolean("PyCharm.InitialConfiguration.V7")) {
+      propertiesComponent.setValue("PyCharm.InitialConfiguration.V7", true);
+      Registry.get("dumb.aware.run.configurations").setValue(true);
+    }
 
     if (!propertiesComponent.isValueSet(DISPLAYED_PROPERTY)) {
       bus.connect().subscribe(AppLifecycleListener.TOPIC, new AppLifecycleListener() {