8000 Disable launcher.bat script to unblock Git Bash users if windows username has blank spaces by testforstephen · Pull Request #938 · microsoft/vscode-java-debug · GitHub
[go: up one dir, main page]
Skip to content

Disable launcher.bat script to unblock Git Bash users if windows username has blank spaces #938

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
testforstephen merged 2 commits into from
Jan 21, 2021
Merged

Disable launcher.bat script to unblock Git Bash users if windows username has blank spaces #938

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
557b008
Disable launcher.bat script to unblock Git Bash users if windows user…
testforstephen Jan 20, 2021
07ed6df
Use vscode.env.shell API to get current shell
testforstephen Jan 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/configurationProvider.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
12 changes: 12 additions & 0 deletions src/utility.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,18 @@ export function getLauncherScriptPath() {
return path.join(ext.extensionPath, "scripts", "launcher.bat");
}

export function isGitBash(isIntegratedTerminal: boolean): boolean {
const currentWindowsShellPath: string | undefined = isIntegratedTerminal ? vscode.env.shell :
vscode.workspace.getConfiguration("terminal")?.get("external.windowsExec");
if (!currentWindowsShellPath) {
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) => currentWindowsShellPath.endsWith(candidate));
return !!find;
}

export enum ServerMode {
STANDARD = "Standard",
LIGHTWEIGHT = "LightWeight",
Expand Down
0