From 9fb6e19a36068d4cf52c9eb4c255135668e42c3f Mon Sep 17 00:00:00 2001
From: Stanislav Dombrovsky <stanislav.dombrovsky@jetbrains.com>
Date: Fri, 10 Nov 2017 12:43:59 +0300
Subject: [PATCH] OC-15178 Automatically set some settings when user selects
 Xcode behaviour [make WelcomeWizardUtil a pure data class]

---
 .../src/com/intellij/ide/WelcomeWizardUtil.java        | 10 +++++++---
 .../com/intellij/ide/customize/WelcomeWizardHelper.kt  |  7 +++++++
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/platform/core-api/src/com/intellij/ide/WelcomeWizardUtil.java b/platform/core-api/src/com/intellij/ide/WelcomeWizardUtil.java
index 1662eae881ea..2c22ca59219a 100644
--- a/platform/core-api/src/com/intellij/ide/WelcomeWizardUtil.java
+++ b/platform/core-api/src/com/intellij/ide/WelcomeWizardUtil.java
@@ -15,7 +15,6 @@
  */
 package com.intellij.ide;
 
-import com.intellij.openapi.util.registry.Registry;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.Collections;
@@ -34,6 +33,7 @@ public class WelcomeWizardUtil {
   private static volatile Integer ourContinuationIndent;
   private static volatile Integer ourAppearanceFontSize;
   private static volatile String ourAppearanceFontFace;
+  private static volatile Boolean ourDisableBreakpointsOnClick;
   private static final Set<String> ourFeaturedPluginsToInstall = new HashSet<>();
 
   public static void setDefaultLAF(String laf) {
@@ -88,8 +88,12 @@ public class WelcomeWizardUtil {
     ourFeaturedPluginsToInstall.addAll(pluginsToInstall);
   }
 
-  public static void setDisableBreakpointsOnClick(boolean xcodeLikeBreakpoints) {
-    Registry.get("debugger.click.disable.breakpoints").setValue(xcodeLikeBreakpoints);
+  public static Boolean getDisableBreakpointsOnClick() {
+    return ourDisableBreakpointsOnClick;
+  }
+
+  public static void setDisableBreakpointsOnClick(Boolean disableBreakpointsOnClick) {
+    ourDisableBreakpointsOnClick = disableBreakpointsOnClick;
   }
 
   public static void setCompletionCaseSensitive(Integer completionCaseSensitive) {
diff --git a/platform/lang-impl/src/com/intellij/ide/customize/WelcomeWizardHelper.kt b/platform/lang-impl/src/com/intellij/ide/customize/WelcomeWizardHelper.kt
index 47d6c11cba96..9d3e2841260f 100644
--- a/platform/lang-impl/src/com/intellij/ide/customize/WelcomeWizardHelper.kt
+++ b/platform/lang-impl/src/com/intellij/ide/customize/WelcomeWizardHelper.kt
@@ -23,6 +23,7 @@ import com.intellij.ide.ui.LafManager
 import com.intellij.ide.ui.UISettings
 import com.intellij.lang.Language
 import com.intellij.openapi.components.ApplicationComponent
+import com.intellij.openapi.util.registry.Registry
 import com.intellij.psi.codeStyle.*
 
 class WelcomeWizardHelper : ApplicationComponent {
@@ -34,6 +35,12 @@ class WelcomeWizardHelper : ApplicationComponent {
     WelcomeWizardUtil.getManualOrder()?.let {
       ProjectViewSharedSettings.instance.manualOrder = it
     }
+
+    //Debugger settings
+    WelcomeWizardUtil.getDisableBreakpointsOnClick()?.let{
+      Registry.get("debugger.click.disable.breakpoints").setValue(it)
+    }
+
     //Code insight settings
     WelcomeWizardUtil.getCompletionCaseSensitive()?.let {
       CodeInsightSettings.getInstance().COMPLETION_CASE_SENSITIVE = it