From 2234e46f7623b06aca19eff93dd7cbefb0fe4d8e Mon Sep 17 00:00:00 2001
From: Vladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Date: Fri, 28 Oct 2016 16:17:34 +0200
Subject: [PATCH] IDEA-155007 IDEA does not kill the debug process immediately

---
 .../settings/DebuggerLaunchingConfigurable.java     |  5 +++++
 .../debugger/settings/DebuggerSettings.java         |  3 +++
 .../application/ApplicationConfiguration.java       | 13 +++++++++++++
 resources-en/src/messages/DebuggerBundle.properties |  1 +
 4 files changed, 22 insertions(+)

diff --git a/java/debugger/impl/src/com/intellij/debugger/settings/DebuggerLaunchingConfigurable.java b/java/debugger/impl/src/com/intellij/debugger/settings/DebuggerLaunchingConfigurable.java
index b964083eb049..e184048de71c 100644
--- a/java/debugger/impl/src/com/intellij/debugger/settings/DebuggerLaunchingConfigurable.java
+++ b/java/debugger/impl/src/com/intellij/debugger/settings/DebuggerLaunchingConfigurable.java
@@ -31,6 +31,7 @@ class DebuggerLaunchingConfigurable implements ConfigurableUi<DebuggerSettings>
   private StateRestoringCheckBox myCbForceClassicVM;
   private JCheckBox myCbDisableJIT;
   private JCheckBox myCbShowAlternativeSource;
+  private JCheckBox myCbKillImmediately;
 
   @Override
   public void reset(@NotNull DebuggerSettings settings) {
@@ -50,6 +51,7 @@ class DebuggerLaunchingConfigurable implements ConfigurableUi<DebuggerSettings>
     myCbForceClassicVM.setSelected(settings.FORCE_CLASSIC_VM);
     myCbDisableJIT.setSelected(settings.DISABLE_JIT);
     myCbShowAlternativeSource.setSelected(settings.SHOW_ALTERNATIVE_SOURCE);
+    myCbKillImmediately.setSelected(settings.KILL_PROCESS_IMMEDIATELY);
   }
 
   @Override
@@ -67,6 +69,7 @@ class DebuggerLaunchingConfigurable implements ConfigurableUi<DebuggerSettings>
     settings.FORCE_CLASSIC_VM = myCbForceClassicVM.isSelectedWhenSelectable();
     settings.DISABLE_JIT = myCbDisableJIT.isSelected();
     settings.SHOW_ALTERNATIVE_SOURCE = myCbShowAlternativeSource.isSelected();
+    settings.KILL_PROCESS_IMMEDIATELY = myCbKillImmediately.isSelected();
   }
 
   @Override
@@ -84,6 +87,7 @@ class DebuggerLaunchingConfigurable implements ConfigurableUi<DebuggerSettings>
     myCbShowAlternativeSource = new JCheckBox(DebuggerBundle.message("label.debugger.general.configurable.show.alternative.source"));
     myRbSocket = new JRadioButton(DebuggerBundle.message("label.debugger.launching.configurable.socket"));
     myRbShmem = new JRadioButton(DebuggerBundle.message("label.debugger.launching.configurable.shmem"));
+    myCbKillImmediately = new JCheckBox(DebuggerBundle.message("label.debugger.general.configurable.kill.immediately"));
 
     final ButtonGroup gr = new ButtonGroup();
     gr.add(myRbSocket);
@@ -101,6 +105,7 @@ class DebuggerLaunchingConfigurable implements ConfigurableUi<DebuggerSettings>
     panel.add(myCbForceClassicVM);
     panel.add(myCbDisableJIT);
     panel.add(myCbShowAlternativeSource);
+    panel.add(myCbKillImmediately);
 
     JPanel result = new JPanel(new BorderLayout());
     result.add(panel, BorderLayout.NORTH);
diff --git a/java/debugger/impl/src/com/intellij/debugger/settings/DebuggerSettings.java b/java/debugger/impl/src/com/intellij/debugger/settings/DebuggerSettings.java
index 593500398de9..436d02b5d421 100644
--- a/java/debugger/impl/src/com/intellij/debugger/settings/DebuggerSettings.java
+++ b/java/debugger/impl/src/com/intellij/debugger/settings/DebuggerSettings.java
@@ -83,6 +83,8 @@ public class DebuggerSettings implements Cloneable, PersistentStateComponent<Ele
   public volatile boolean WATCH_RETURN_VALUES = false;
   public volatile boolean AUTO_VARIABLES_MODE = false;
 
+  public volatile boolean KILL_PROCESS_IMMEDIATELY = false;
+
   public String EVALUATE_FINALLY_ON_POP_FRAME = EVALUATE_FINALLY_ASK;
 
   public boolean RESUME_ONLY_CURRENT_THREAD = false;
@@ -159,6 +161,7 @@ public class DebuggerSettings implements Cloneable, PersistentStateComponent<Ele
       FORCE_CLASSIC_VM == secondSettings.FORCE_CLASSIC_VM &&
       DISABLE_JIT == secondSettings.DISABLE_JIT &&
       SHOW_ALTERNATIVE_SOURCE == secondSettings.SHOW_ALTERNATIVE_SOURCE &&
+      KILL_PROCESS_IMMEDIATELY == secondSettings.KILL_PROCESS_IMMEDIATELY &&
       HOTSWAP_IN_BACKGROUND == secondSettings.HOTSWAP_IN_BACKGROUND &&
       SKIP_SYNTHETIC_METHODS == secondSettings.SKIP_SYNTHETIC_METHODS &&
       SKIP_CLASSLOADERS == secondSettings.SKIP_CLASSLOADERS &&
diff --git a/java/execution/impl/src/com/intellij/execution/application/ApplicationConfiguration.java b/java/execution/impl/src/com/intellij/execution/application/ApplicationConfiguration.java
index 0148402611bd..3b5861e09148 100644
--- a/java/execution/impl/src/com/intellij/execution/application/ApplicationConfiguration.java
+++ b/java/execution/impl/src/com/intellij/execution/application/ApplicationConfiguration.java
@@ -16,12 +16,15 @@
 package com.intellij.execution.application;
 
 import com.intellij.codeInsight.daemon.impl.analysis.JavaModuleGraphUtil;
+import com.intellij.debugger.settings.DebuggerSettings;
 import com.intellij.diagnostic.logging.LogConfigurationPanel;
 import com.intellij.execution.*;
 import com.intellij.execution.configuration.EnvironmentVariablesComponent;
 import com.intellij.execution.configurations.*;
 import com.intellij.execution.filters.TextConsoleBuilderFactory;
 import com.intellij.execution.junit.RefactoringListeners;
+import com.intellij.execution.process.KillableProcessHandler;
+import com.intellij.execution.process.OSProcessHandler;
 import com.intellij.execution.runners.ExecutionEnvironment;
 import com.intellij.execution.util.JavaParametersUtil;
 import com.intellij.execution.util.ProgramParametersUtil;
@@ -285,6 +288,16 @@ public class ApplicationConfiguration extends ModuleBasedConfiguration<JavaRunCo
       return params;
     }
 
+    @NotNull
+    @Override
+    protected OSProcessHandler startProcess() throws ExecutionException {
+      OSProcessHandler processHandler = super.startProcess();
+      if (processHandler instanceof KillableProcessHandler && DebuggerSettings.getInstance().KILL_PROCESS_IMMEDIATELY) {
+        ((KillableProcessHandler)processHandler).setShouldKillProcessSoftly(false);
+      }
+      return processHandler;
+    }
+
     private static void setupModulePath(JavaParameters params, JavaRunConfigurationModule module) {
       JavaSdkVersion version = null;
       Sdk jdk = params.getJdk();
diff --git a/resources-en/src/messages/DebuggerBundle.properties b/resources-en/src/messages/DebuggerBundle.properties
index 280b434bf16c..b45a67445ddd 100644
--- a/resources-en/src/messages/DebuggerBundle.properties
+++ b/resources-en/src/messages/DebuggerBundle.properties
@@ -236,6 +236,7 @@ label.debugger.launching.configurable.debugger.transport=Transport:
 label.debugger.launching.configurable.socket=&Socket
 label.debugger.launching.configurable.shmem=Shared &memory
 label.debugger.general.configurable.show.alternative.source=Show alternative source switcher
+label.debugger.general.configurable.kill.immediately=Kill the debug process immediately
 label.debugger.general.configurable.skip.synthetic.methods=Ski&p synthetic methods
 label.debugger.general.configurable.skip.constructors=Skip &constructors
 label.debugger.general.configurable.skip.classLoaders=Skip class l&oaders