Skip to content

Commit 23fea05

Browse files
committed
added frontend requirements of #7697
1 parent 65bce92 commit 23fea05

File tree

3 files changed

+10
-0
lines changed

3 files changed

+10
-0
lines changed

vscode/package.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -290,8 +290,13 @@
290290
"vmArgs": {
291291
"type": [
292292
"string",
293+
"array",
293294
"null"
294295
],
296+
"items": {
297+
"type": "string",
298+
"description": "%jdk.debugger.configuration.vmArgs.items.description%"
299+
},
295300
"description": "%jdk.debugger.configuration.vmArgs.description%",
296301
"default": null
297302
},

vscode/package.nls.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
"jdk.debugger.configuration.classPaths.description": "The classpaths for launching the JVM.",
5151
"jdk.debugger.configuration.console.description": "The specified console to launch the program.",
5252
"jdk.debugger.configuration.args.description": "Arguments for the executed class",
53+
"jdk.debugger.configuration.vmArgs.items.description": "Single argument to the Java VM",
5354
"jdk.debugger.configuration.vmArgs.description": "Arguments for the Java VM",
5455
"jdk.debugger.configuration.cwd.description": "Working directory for the program execution",
5556
"jdk.debugger.configuration.env.description": "Environment variables for the program execution",

vscode/src/debugger/debugger.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,11 @@ class RunConfigurationProvider implements vscode.DebugConfigurationProvider {
237237
if (vmArgs) {
238238
if (!config.vmArgs) {
239239
config.vmArgs = vmArgs;
240+
} else if (Array.isArray(config.vmArgs)) {
241+
let cfg: string[] = config.vmArgs;
242+
cfg.push(vmArgs);
240243
} else {
244+
// assume the config is a string
241245
config.vmArgs = `${config.vmArgs} ${vmArgs}`;
242246
}
243247
}

0 commit comments

Comments
 (0)