added frontend requirements of apache#7697

Achal1607 · Feb 21, 2025 · 23fea05 · 23fea05
1 parent 65bce92
commit 23fea05
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 0 deletions.
diff --git a/vscode/package.json b/vscode/package.json
@@ -290,8 +290,13 @@
 							"vmArgs": {
 								"type": [
 									"string",
+									"array",
 									"null"
 								],
+								"items": {
+									"type": "string",
+									"description": "%jdk.debugger.configuration.vmArgs.items.description%"
+								},
 								"description": "%jdk.debugger.configuration.vmArgs.description%",
 								"default": null
 							},

diff --git a/vscode/package.nls.json b/vscode/package.nls.json
@@ -50,6 +50,7 @@
     "jdk.debugger.configuration.classPaths.description": "The classpaths for launching the JVM.",
     "jdk.debugger.configuration.console.description": "The specified console to launch the program.",
     "jdk.debugger.configuration.args.description": "Arguments for the executed class",
+    "jdk.debugger.configuration.vmArgs.items.description": "Single argument to the Java VM",
     "jdk.debugger.configuration.vmArgs.description": "Arguments for the Java VM",
     "jdk.debugger.configuration.cwd.description": "Working directory for the program execution",
     "jdk.debugger.configuration.env.description": "Environment variables for the program execution",

diff --git a/vscode/src/debugger/debugger.ts b/vscode/src/debugger/debugger.ts
@@ -237,7 +237,11 @@ class RunConfigurationProvider implements vscode.DebugConfigurationProvider {
             if (vmArgs) {
                 if (!config.vmArgs) {
                     config.vmArgs = vmArgs;
+                } else if (Array.isArray(config.vmArgs)) {
+                    let cfg: string[] = config.vmArgs;
+                    cfg.push(vmArgs);
                 } else {
+                    // assume the config is a string
                     config.vmArgs = `${config.vmArgs} ${vmArgs}`;
                 }
             }