feature: Also run plain Java when noDebug from launch.json

packages/metals-languageclient/src/interfaces/DebugDiscoveryParams.ts

@@ -1,6 +1,12 @@
 export interface DebugDiscoveryParams {
- path: string;
+ path: string | undefined;
+ mainClass: string | undefined;
+ buildTarget: string | undefined;
  runType: RunType;
+ args: string[] | undefined;
+ jvmOptions: string[] | undefined;
+ env: Map<string, string> | undefined;
+ envFile: string | undefined;
 }
 
 export enum RunType {

packages/metals-vscode/src/debugger/scalaDebugger.ts

@@ -168,6 +168,12 @@ class ScalaMainConfigProvider implements vscode.DebugConfigurationProvider {
  const args: DebugDiscoveryParams = {
  path: editor.document.uri.toString(true),
  runType: RunType.RunOrTestFile,
+ buildTarget: undefined,
+ mainClass: undefined,
+ args: undefined,
+ jvmOptions: undefined,
+ env: undefined,
+ envFile: undefined,
  };
  await startDiscovery(debugConfiguration.noDebug, args);
  return debugConfiguration;
@@ -186,15 +192,34 @@ class ScalaDebugServerFactory implements vscode.DebugAdapterDescriptorFactory {
  session.configuration.testClass !== undefined ||
  session.configuration.hostName !== undefined
  ) {
- const debugSession = await vscode.commands.executeCommand<DebugSession>(
- ServerCommands.DebugAdapterStart,
- session.configuration
- );
-
- if (debugSession === undefined) {
- return null;
+ if (session.configuration.noDebug) {
+ const args: DebugDiscoveryParams = {
+ path: undefined,
+ mainClass: session.configuration.mainClass,
+ buildTarget: session.configuration.buildTarget,
+ runType: RunType.Run,
+ args: session.configuration.args,
+ jvmOptions: session.configuration.jvmOptions,
+ env: session.configuration.env,
+ envFile: session.configuration.envFile,
+ };
+ await startDiscovery(session.configuration.noDebug, args);
+
+ // This is the only way not to have to run full fledged DAP server
+ return new vscode.DebugAdapterExecutable("echo", [
+ '"Running in the task window"',
+ ]);
  } else {
- return debugServerFromUri(debugSession.uri);
+ const debugSession = await vscode.commands.executeCommand<DebugSession>(
+ ServerCommands.DebugAdapterStart,
+ session.configuration
+ );
+
+ if (debugSession === undefined) {
+ return null;
+ } else {
+ return debugServerFromUri(debugSession.uri);
+ }
  }
  }
  return null;

packages/metals-vscode/src/extension.ts

@@ -236,7 +236,7 @@
  const canRetryWithJar =
  javaHome && !coursier.endsWith(".jar") && !forceCoursierJar;
 
  function retry(error: any): Promise<any> {
  if (canRetryWithJar) {
  outputChannel.appendLine(
  "Trying again with the embedded coursier. This might take longer."
@@ -278,7 +278,7 @@
  serverProperties,
  javaConfig,
  serverVersion
  ).catch((reason): Promise<any> => {
  outputChannel.appendLine(
  "Launching Metals failed with the following:"
  );
@@ -842,6 +842,12 @@
  const args: DebugDiscoveryParams = {
  path: editor.document.uri.toString(true),
  runType: RunType.RunOrTestFile,
+ buildTarget: undefined,
+ mainClass: undefined,
+ args: undefined,
+ jvmOptions: undefined,
+ env: undefined,
+ envFile: undefined,
  };
  scalaDebugger.startDiscovery(true, args).then((wasStarted) => {
  if (!wasStarted) {
@@ -854,6 +860,12 @@
  const args: DebugDiscoveryParams = {
  path: editor.document.uri.toString(true),
  runType: RunType.TestTarget,
+ buildTarget: undefined,
+ mainClass: undefined,
+ args: undefined,
+ jvmOptions: undefined,
+ env: undefined,
+ envFile: undefined,
  };
  scalaDebugger.startDiscovery(true, args).then((wasStarted) => {
  if (!wasStarted) {