Naming Java terminal with mainClass name (microsoft#414)

testforstephen · web-flow · commit 9e017f3382b5 · 2022-05-24T16:10:52.000+08:00
* Naming Java terminal with mainClass name
diff --git a/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/handler/LaunchWithDebuggingDelegate.java b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/handler/LaunchWithDebuggingDelegate.java
@@ -58,7 +58,6 @@ public class LaunchWithDebuggingDelegate implements ILaunchDelegate {
 
     protected static final Logger logger = Logger.getLogger(Configuration.LOGGER_NAME);
     private static final int ATTACH_TERMINAL_TIMEOUT = 20 * 1000;
-    private static final String TERMINAL_TITLE = "Java Debug Console";
     protected static final long RUNINTERMINAL_TIMEOUT = 10 * 1000;
     private VMHandler vmHandler = new VMHandler();
 
@@ -77,20 +76,22 @@ public CompletableFuture<Response> launchInTerminal(LaunchArguments launchArgume
             ((Connector.IntegerArgument) args.get("timeout")).setValue(ATTACH_TERMINAL_TIMEOUT);
             String address = listenConnector.startListening(args);
 
+            final String[] names = launchArguments.mainClass.split("[/\\.]");
+            final String terminalName = "Debug: " + names[names.length - 1];
             String[] cmds = LaunchRequestHandler.constructLaunchCommands(launchArguments, false, address);
             RunInTerminalRequestArguments requestArgs = null;
             if (launchArguments.console == CONSOLE.integratedTerminal) {
                 requestArgs = RunInTerminalRequestArguments.createIntegratedTerminal(
                         cmds,
                         launchArguments.cwd,
                         launchArguments.env,
-                        TERMINAL_TITLE);
+                        terminalName);
             } else {
                 requestArgs = RunInTerminalRequestArguments.createExternalTerminal(
                         cmds,
                         launchArguments.cwd,
                         launchArguments.env,
-                        TERMINAL_TITLE);
+                        terminalName);
             }
             Request request = new Request(Command.RUNINTERMINAL.getName(),
                     (JsonObject) JsonUtils.toJsonTree(requestArgs, RunInTerminalRequestArguments.class));
diff --git a/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/handler/LaunchWithoutDebuggingDelegate.java b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/handler/LaunchWithoutDebuggingDelegate.java
@@ -40,7 +40,6 @@
 
 public class LaunchWithoutDebuggingDelegate implements ILaunchDelegate {
     protected static final Logger logger = Logger.getLogger(Configuration.LOGGER_NAME);
-    protected static final String TERMINAL_TITLE = "Java Process Console";
     protected static final long RUNINTERMINAL_TIMEOUT = 10 * 1000;
     private Consumer<IDebugAdapterContext> terminateHandler;
 
@@ -92,14 +91,16 @@ public CompletableFuture<Response> launchInTerminal(LaunchArguments launchArgume
 
         final String launchInTerminalErrorFormat = "Failed to launch debuggee in terminal. Reason: %s";
 
+        final String[] names = launchArguments.mainClass.split("[/\\.]");
+        final String terminalName = "Run: " + names[names.length - 1];
         String[] cmds = LaunchRequestHandler.constructLaunchCommands(launchArguments, false, null);
         RunInTerminalRequestArguments requestArgs = null;
         if (launchArguments.console == CONSOLE.integratedTerminal) {
             requestArgs = RunInTerminalRequestArguments.createIntegratedTerminal(cmds, launchArguments.cwd,
-                    launchArguments.env, TERMINAL_TITLE);
+                    launchArguments.env, terminalName);
         } else {
             requestArgs = RunInTerminalRequestArguments.createExternalTerminal(cmds, launchArguments.cwd,
-                    launchArguments.env, TERMINAL_TITLE);
+                    launchArguments.env, terminalName);
         }
         Request request = new Request(Command.RUNINTERMINAL.getName(),
                 (JsonObject) JsonUtils.toJsonTree(requestArgs, RunInTerminalRequestArguments.class));
