From bc6a8fda82ee1b16f68655faf38ecac5635ea5c5 Mon Sep 17 00:00:00 2001
From: Maksim Zuev <maksim.zuev@jetbrains.com>
Date: Fri, 25 Oct 2024 14:30:15 +0200
Subject: [PATCH] [debugger] Hot swap: drop `Continue with previous code`
 option

* it was effectively the same as close notification


(cherry picked from commit 0cf7a9c7653acf8aa1f78b2254952f97cbd4eee4)

IJ-CR-147839

GitOrigin-RevId: b7268f442939c2b103c2a41d98e3bf56a7f1a9f4
---
 .../intellij/debugger/ui/HotSwapProgressImpl.java   | 13 +------------
 .../messages/JavaDebuggerBundle.properties          |  7 +++----
 2 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/HotSwapProgressImpl.java b/java/debugger/impl/src/com/intellij/debugger/ui/HotSwapProgressImpl.java
index 0bd755f05c5d..10618264ac5e 100644
--- a/java/debugger/impl/src/com/intellij/debugger/ui/HotSwapProgressImpl.java
+++ b/java/debugger/impl/src/com/intellij/debugger/ui/HotSwapProgressImpl.java
@@ -116,9 +116,7 @@ public final class HotSwapProgressImpl extends HotSwapProgress {
       if (withRestart) {
         notification.addAction(new RestartHotSwapNotificationAction(mySessionRef));
       }
-      notification.addAction(Registry.is("debugger.hotswap.floating.toolbar")
-                             ? new ContinueDebugAction()
-                             : new StopHotSwapNotificationAction(mySessionRef));
+      notification.addAction(new StopHotSwapNotificationAction(mySessionRef));
     }
     notification.setImportant(false).notify(getProject());
   }
@@ -261,13 +259,4 @@ public final class HotSwapProgressImpl extends HotSwapProgress {
       }
     }
   }
-
-  private static class ContinueDebugAction extends NotificationAction {
-    ContinueDebugAction() { super(JavaDebuggerBundle.message("status.hot.swap.completed.continue")); }
-
-    @Override
-    public void actionPerformed(@NotNull AnActionEvent e, @NotNull Notification notification) {
-     notification.expire();
-    }
-  }
 }
diff --git a/java/debugger/openapi/resources/messages/JavaDebuggerBundle.properties b/java/debugger/openapi/resources/messages/JavaDebuggerBundle.properties
index 5f71db947fb3..8622ea768589 100644
--- a/java/debugger/openapi/resources/messages/JavaDebuggerBundle.properties
+++ b/java/debugger/openapi/resources/messages/JavaDebuggerBundle.properties
@@ -171,7 +171,7 @@ progress.hotswap.scanning.path=Scanning: {0}
 progress.hotswap.scanning.classes=Scanning for classes to reload\u2026
 progress.hotswap.reloading=Reloading classes\u2026
 error.operation.canceled=Operation canceled
-error.operation.not.supported.by.vm=Operation not supported by VM : {0}
+error.operation.not.supported.by.vm=Operation not supported by VM: {0}
 error.class.def.not.found=Class definition not found : {0}
 error.verification.error=Verification error : {0}
 error.unsupported.class.version=Unsupported class version : {0}
@@ -286,9 +286,8 @@ label.generic.debugger.parameters.patcher.configurable.transport=Transport:
 label.generic.debugger.parameters.patcher.configurable.shmem.address=Shared memory address:
 progress.hot.swap.title=HotSwap
 status.hot.swap.completed.with.errors=HotSwap failed
-status.hot.swap.completed.restart=Restart
-status.hot.swap.completed.stop=Stop debug session
-status.hot.swap.completed.continue=Continue with previous code
+status.hot.swap.completed.restart=Restart session
+status.hot.swap.completed.stop=Stop session
 status.hot.swap.completed.with.warnings=HotSwap completed with warnings
 label.generic.debugger.parameters.patcher.configurable.port=Port:
 status.hotswap.uptodate=Loaded classes are up to date. Nothing to reload.