microsoft
diff --git a/‎src/configurationProvider.ts‎
Lines changed: 4 additions & 1 deletion b/‎src/configurationProvider.ts‎
Lines changed: 4 additions & 1 deletion
diff --git a/‎src/utility.ts‎
Lines changed: 12 additions & 0 deletions b/‎src/utility.ts‎
Lines changed: 12 additions & 0 deletions
@@ -307,7 +307,10 @@ export class JavaDebugConfigurationProvider implements vscode.DebugConfiguration
                 }
 
                 if (process.platform === "win32" && config.console !== "internalConsole") {
-                    config.launcherScript = utility.getLauncherScriptPath();
+                    const launcherScript: string = utility.getLauncherScriptPath();
+                    if (!launcherScript.includes(" ") || !utility.isGitBash(config.console === "integratedTerminal")) {
+                        config.launcherScript = launcherScript;
+                    }
                 }
             } else if (config.request === "attach") {
                 if (config.hostName && config.port) {
 
@@ -215,6 +215,18 @@ export function getLauncherScriptPath() {
     return path.join(ext.extensionPath, "scripts", "launcher.bat");
 }
 
+export function isGitBash(isIntegratedTerminal: boolean): boolean {
+    const terminal: vscode.WorkspaceConfiguration = vscode.workspace.getConfiguration("terminal");
+    const shellPath: string | undefined = isIntegratedTerminal ? terminal?.get("integrated.shell.windows") : terminal?.get("external.windowsExec");
+    if (!shellPath) {
+        return false;
+    }
+
+    const candidates: string[] = ["Git\\bin\\bash.exe", "Git\\bin\\bash", "Git\\usr\\bin\\bash.exe", "Git\\usr\\bin\\bash"];
+    const find: string | undefined = candidates.find((candidate: string) => shellPath.endsWith(candidate));
+    return !!find;
+}
+
 export enum ServerMode {
     STANDARD = "Standard",
     LIGHTWEIGHT = "LightWeight",
Original file line number	Diff line number	Diff line change
`@@ -307,7 +307,10 @@ export class JavaDebugConfigurationProvider implements vscode.DebugConfiguration`
`307`	`307`	`}`
`308`	`308`
`309`	`309`	`if (process.platform === "win32" && config.console !== "internalConsole") {`
`310`		`- config.launcherScript = utility.getLauncherScriptPath();`
	`310`	`+ const launcherScript: string = utility.getLauncherScriptPath();`
	`311`	`+ if (!launcherScript.includes(" ") \|\| !utility.isGitBash(config.console === "integratedTerminal")) {`
	`312`	`+ config.launcherScript = launcherScript;`
	`313`	`+ }`
`311`	`314`	`}`
`312`	`315`	`} else if (config.request === "attach") {`
`313`	`316`	`if (config.hostName && config.port) {`