From 61ac78aaf89c13e0b21be148892544cf269541cd Mon Sep 17 00:00:00 2001 From: Maksim Zuev Date: Tue, 5 Nov 2024 17:54:33 +0100 Subject: [PATCH] [debugger] IDEA-362638 Hot swap button: fix setting usage and report statistics GitOrigin-RevId: fee7dd270a54b962432e3b97b343076fe66033b4 --- .../src/com/intellij/debugger/settings/DebuggerSettings.java | 1 + .../settings/DebuggerSettingsStatisticsCollector.java | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) 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 39d29560fbab..4313f9e042fe 100644 --- a/java/debugger/impl/src/com/intellij/debugger/settings/DebuggerSettings.java +++ b/java/debugger/impl/src/com/intellij/debugger/settings/DebuggerSettings.java @@ -183,6 +183,7 @@ public final class DebuggerSettings implements Cloneable, PersistentStateCompone HIDE_STACK_FRAMES_USING_STEPPING_FILTER == secondSettings.HIDE_STACK_FRAMES_USING_STEPPING_FILTER && COMPILE_BEFORE_HOTSWAP == secondSettings.COMPILE_BEFORE_HOTSWAP && HOTSWAP_HANG_WARNING_ENABLED == secondSettings.HOTSWAP_HANG_WARNING_ENABLED && + HOTSWAP_SHOW_FLOATING_BUTTON == secondSettings.HOTSWAP_SHOW_FLOATING_BUTTON && Objects.equals(RUN_HOTSWAP_AFTER_COMPILE, secondSettings.RUN_HOTSWAP_AFTER_COMPILE) && DebuggerUtilsEx.filterEquals(mySteppingFilters, secondSettings.mySteppingFilters) && myCapturePoints.equals(secondSettings.myCapturePoints); diff --git a/java/debugger/impl/src/com/intellij/debugger/settings/DebuggerSettingsStatisticsCollector.java b/java/debugger/impl/src/com/intellij/debugger/settings/DebuggerSettingsStatisticsCollector.java index 6d9e68e9e4c6..ff063bcc376b 100644 --- a/java/debugger/impl/src/com/intellij/debugger/settings/DebuggerSettingsStatisticsCollector.java +++ b/java/debugger/impl/src/com/intellij/debugger/settings/DebuggerSettingsStatisticsCollector.java @@ -14,7 +14,7 @@ import java.util.Set; import static com.intellij.internal.statistic.beans.MetricEventUtilKt.addBoolIfDiffers; public final class DebuggerSettingsStatisticsCollector extends ApplicationUsagesCollector { - private static final EventLogGroup GROUP = new EventLogGroup("debugger.settings.ide", 6); + private static final EventLogGroup GROUP = new EventLogGroup("debugger.settings.ide", 7); private static final VarargEventId SHOW_ALTERNATIVE_SOURCE = GROUP.registerVarargEvent("showAlternativeSource", EventFields.Enabled); private static final VarargEventId HOTSWAP_IN_BACKROUND = GROUP.registerVarargEvent("hotswapInBackround", EventFields.Enabled); @@ -24,6 +24,7 @@ public final class DebuggerSettingsStatisticsCollector extends ApplicationUsages private static final VarargEventId SKIP_GETTERS = GROUP.registerVarargEvent("skipGetters", EventFields.Enabled); private static final VarargEventId SKIP_CLASSLOADERS = GROUP.registerVarargEvent("skipClassloaders", EventFields.Enabled); private static final VarargEventId COMPILE_BEFORE_HOTSWAP = GROUP.registerVarargEvent("compileBeforeHotswap", EventFields.Enabled); + private static final VarargEventId HOTSWAP_SHOW_FLOATING_BUTTON = GROUP.registerVarargEvent("showHotSwapButtonInEditor", EventFields.Enabled); private static final VarargEventId HOTSWAP_HANG_WARNING_ENABLED = GROUP.registerVarargEvent("hotswapHangWarningEnabled", EventFields.Enabled); private static final VarargEventId WATCH_RETURN_VALUES = GROUP.registerVarargEvent("watchReturnValues", EventFields.Enabled); private static final VarargEventId AUTO_VARIABLES_MODE = GROUP.registerVarargEvent("autoVariablesMode", EventFields.Enabled); @@ -52,6 +53,7 @@ public final class DebuggerSettingsStatisticsCollector extends ApplicationUsages addBoolIfDiffers(set, settings, sDefault, s -> s.SKIP_GETTERS, SKIP_GETTERS); addBoolIfDiffers(set, settings, sDefault, s -> s.SKIP_CLASSLOADERS, SKIP_CLASSLOADERS); addBoolIfDiffers(set, settings, sDefault, s -> s.COMPILE_BEFORE_HOTSWAP, COMPILE_BEFORE_HOTSWAP); + addBoolIfDiffers(set, settings, sDefault, s -> s.HOTSWAP_SHOW_FLOATING_BUTTON, HOTSWAP_SHOW_FLOATING_BUTTON); addBoolIfDiffers(set, settings, sDefault, s -> s.HOTSWAP_HANG_WARNING_ENABLED, HOTSWAP_HANG_WARNING_ENABLED); addBoolIfDiffers(set, settings, sDefault, s -> s.WATCH_RETURN_VALUES, WATCH_RETURN_VALUES); addBoolIfDiffers(set, settings, sDefault, s -> s.AUTO_VARIABLES_MODE, AUTO_VARIABLES_MODE);