Skip to content

Commit 506f919

Browse files
Shorten command line approach should be compatible with the project runtime (#771)
Signed-off-by: Jinbo Wang <jinbwan@microsoft.com>
1 parent 2ccca24 commit 506f919

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

src/launchCommand.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@ enum shortenApproach {
1515
}
1616

1717
export async function detectLaunchCommandStyle(config: vscode.DebugConfiguration): Promise<shortenApproach> {
18-
const javaHome = await getJavaHome();
19-
const javaVersion = await checkJavaVersion(javaHome);
18+
const javaExec: string = config.javaExec || path.join(await getJavaHome(), "bin", "java");
19+
const javaVersion = await checkJavaVersion(javaExec);
2020
const recommendedShortenApproach = javaVersion <= 8 ? shortenApproach.jarmanifest : shortenApproach.argfile;
2121
return (await shouldShortenIfNecessary(config)) ? recommendedShortenApproach : shortenApproach.none;
2222
}
2323

24-
function checkJavaVersion(javaHome: string): Promise<number> {
24+
function checkJavaVersion(javaExec: string): Promise<number> {
2525
return new Promise((resolve, reject) => {
26-
cp.execFile(javaHome + "/bin/java", ["-version"], {}, (error, stdout, stderr) => {
26+
cp.execFile(javaExec, ["-version"], {}, (error, stdout, stderr) => {
2727
const javaVersion = parseMajorVersion(stderr);
2828
resolve(javaVersion);
2929
});

0 commit comments

Comments
 (0)