From 005acb8dfbb21a8d104005948bfec9f9845543da Mon Sep 17 00:00:00 2001 From: Egor Ushakov Date: Mon, 3 Sep 2018 16:26:01 +0300 Subject: [PATCH] IDEA-197854 Always use debug agent - configuration ui --- .../DebuggerLaunchingConfigurable.java | 24 +++++++------------ .../debugger/settings/DebuggerSettings.java | 2 ++ .../impl/DefaultJavaProgramRunner.java | 3 ++- .../src/messages/DebuggerBundle.properties | 1 + 4 files changed, 14 insertions(+), 16 deletions(-) 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 1909f5dd29a9..71796de6a8c8 100644 --- a/java/debugger/impl/src/com/intellij/debugger/settings/DebuggerLaunchingConfigurable.java +++ b/java/debugger/impl/src/com/intellij/debugger/settings/DebuggerLaunchingConfigurable.java @@ -1,23 +1,10 @@ -/* - * Copyright 2000-2015 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package com.intellij.debugger.settings; import com.intellij.debugger.DebuggerBundle; import com.intellij.openapi.options.ConfigurableUi; import com.intellij.openapi.util.SystemInfo; +import com.intellij.openapi.util.registry.Registry; import com.intellij.ui.StateRestoringCheckBox; import com.intellij.ui.components.panels.VerticalBox; import com.intellij.util.ui.JBUI; @@ -34,6 +21,7 @@ class DebuggerLaunchingConfigurable implements ConfigurableUi private JCheckBox myCbDisableJIT; private JCheckBox myCbShowAlternativeSource; private JCheckBox myCbKillImmediately; + private JCheckBox myCbAlwaysDebug; @Override public void reset(@NotNull DebuggerSettings settings) { @@ -54,6 +42,7 @@ class DebuggerLaunchingConfigurable implements ConfigurableUi myCbDisableJIT.setSelected(settings.DISABLE_JIT); myCbShowAlternativeSource.setSelected(settings.SHOW_ALTERNATIVE_SOURCE); myCbKillImmediately.setSelected(settings.KILL_PROCESS_IMMEDIATELY); + myCbAlwaysDebug.setSelected(settings.ALWAYS_DEBUG); } @Override @@ -72,6 +61,7 @@ class DebuggerLaunchingConfigurable implements ConfigurableUi settings.DISABLE_JIT = myCbDisableJIT.isSelected(); settings.SHOW_ALTERNATIVE_SOURCE = myCbShowAlternativeSource.isSelected(); settings.KILL_PROCESS_IMMEDIATELY = myCbKillImmediately.isSelected(); + settings.ALWAYS_DEBUG = myCbAlwaysDebug.isSelected(); } @Override @@ -90,6 +80,7 @@ class DebuggerLaunchingConfigurable implements ConfigurableUi 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")); + myCbAlwaysDebug = new JCheckBox(DebuggerBundle.message("label.debugger.general.configurable.always.debug")); final ButtonGroup gr = new ButtonGroup(); gr.add(myRbSocket); @@ -110,6 +101,9 @@ class DebuggerLaunchingConfigurable implements ConfigurableUi panel.add(myCbDisableJIT); panel.add(myCbShowAlternativeSource); panel.add(myCbKillImmediately); + if (Registry.is("execution.java.always.debug")) { + panel.add(myCbAlwaysDebug); + } 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 5474f7543ea9..0d13f14915b3 100644 --- a/java/debugger/impl/src/com/intellij/debugger/settings/DebuggerSettings.java +++ b/java/debugger/impl/src/com/intellij/debugger/settings/DebuggerSettings.java @@ -77,6 +77,7 @@ public class DebuggerSettings implements Cloneable, PersistentStateComponent s.startsWith("-agentlib:jdwp"))) { parametersList.add("-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,quiet=y"); diff --git a/resources-en/src/messages/DebuggerBundle.properties b/resources-en/src/messages/DebuggerBundle.properties index 35e458a006c9..69e8e61687f2 100644 --- a/resources-en/src/messages/DebuggerBundle.properties +++ b/resources-en/src/messages/DebuggerBundle.properties @@ -245,6 +245,7 @@ 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.always.debug=Start run configurations with the debug agent 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