Jinbo Wang (testforstephen) · Jun 8, 2020 · Jun 8, 2020 · Jun 8, 2020
diff --git a/src/configurationProvider.ts b/src/configurationProvider.ts
@@ -257,16 +257,7 @@ export class JavaDebugConfigurationProvider implements vscode.DebugConfiguration
                 });
             }
 
-            const debugServerPort = await lsPlugin.startDebugSession();
-            if (debugServerPort) {
-                config.debugServer = debugServerPort;
-                return config;
-            } else {
-                // Information for diagnostic:
-                // tslint:disable-next-line:no-console
-                console.log("Cannot find a port for debugging session");
-                throw new Error("Failed to start debug server.");
-            }
+            return config;
         } catch (ex) {
             if (ex instanceof utility.JavaExtensionNotEnabledError) {
                 utility.guideToInstallJavaExtension();

diff --git a/src/extension.ts b/src/extension.ts
@@ -11,6 +11,7 @@ import { JavaDebugConfigurationProvider } from "./configurationProvider";
 import { HCR_EVENT, JAVA_LANGID, USER_NOTIFICATION_EVENT } from "./constants";
 import { initializeCodeLensProvider, startDebugging } from "./debugCodeLensProvider";
 import { handleHotCodeReplaceCustomEvent, initializeHotCodeReplace, NO_BUTTON, YES_BUTTON } from "./hotCodeReplace";
+import { JavaDebugAdapterDescriptorFactory } from "./javaDebugAdapterDescriptorFactory";
 import { IMainMethod, resolveMainMethod } from "./languageServerPlugin";
 import { logger, Type } from "./logger";
 import { initializeThreadOperations } from "./threadOperations";
@@ -33,6 +34,7 @@ function initializeExtension(operationId: string, context: vscode.ExtensionConte
     registerDebugEventListener(context);
     context.subscriptions.push(logger);
     context.subscriptions.push(vscode.debug.registerDebugConfigurationProvider("java", new JavaDebugConfigurationProvider()));
+    context.subscriptions.push(vscode.debug.registerDebugAdapterDescriptorFactory("java", new JavaDebugAdapterDescriptorFactory()));
     context.subscriptions.push(instrumentOperationAsVsCodeCommand("JavaDebug.SpecifyProgramArgs", async () => {
         return specifyProgramArguments(context);
     }));

diff --git a/src/javaDebugAdapterDescriptorFactory.ts b/src/javaDebugAdapterDescriptorFactory.ts
@@ -0,0 +1,39 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+import { DebugAdapterDescriptor, DebugAdapterDescriptorFactory, DebugAdapterExecutable, DebugAdapterServer, DebugSession } from "vscode";
+
+import { startDebugSession } from "./languageServerPlugin";
+import { Type } from "./logger";
+import { formatErrorProperties, showErrorMessageWithTroubleshooting } from "./utility";
+
+export class JavaDebugAdapterDescriptorFactory implements DebugAdapterDescriptorFactory {
+    public async createDebugAdapterDescriptor(session: DebugSession, executable: DebugAdapterExecutable): Promise<DebugAdapterDescriptor> {
+        let error;
+        try {
+            const debugServerPort = <number> (await startDebugSession());
+            if (debugServerPort) {
+                return new DebugAdapterServer(debugServerPort);
+            } else {
+                // Information for diagnostic:
+                // tslint:disable-next-line:no-console
+                console.log("Cannot find a port for debugging session");
+            }
+        } catch (err) {
+            error = err;
+        }
+
+        let errorMessage = "Failed to start debug server.";
+        let details = {};
+        if (error) {
+            errorMessage = error.message || String(error);
+            details = formatErrorProperties(error);
+        }
+
+        showErrorMessageWithTroubleshooting({
+            message: errorMessage,
+            type: Type.EXCEPTION,
+            details,
+        });
+    }
+}