addressed regressions jdk downloader prompt not showing up and views not reloadingon extension restart

Achal1607 · Achal1607 · commit 0175fd15ed87 · 2024-10-25T16:14:42.000+05:30
fixed no workspace present then extension crashing issue

fixed jdk.verbose not working

fixed runConfig settings not getting persisted regression and refactored configUpdate and get methods

fixed dialog ox appearing when project compile and clean are executed
diff --git a/vscode/src/commands/buildOperations.ts b/vscode/src/commands/buildOperations.ts
@@ -23,16 +23,17 @@ import { wrapCommandWithProgress, wrapProjectActionWithProgress } from "./utils"
 const compileWorkspaceHandler = () => {
     return wrapCommandWithProgress(nbCommands.buildWorkspace, l10n.value('jdk.extension.command.progress.compilingWorkSpace'), LOGGER.getOutputChannel());
 }
+
 const cleanWorkspaceHandler = () => {
     return wrapCommandWithProgress(nbCommands.cleanWorkspace,l10n.value('jdk.extension.command.progress.cleaningWorkSpace'), LOGGER.getOutputChannel());
 }
 
 const compileProjectHandler = (args: any) => {
-    return wrapProjectActionWithProgress('build', undefined, l10n.value('jdk.extension.command.progress.compilingProject'), LOGGER.getOutputChannel(), args);
+    wrapProjectActionWithProgress('build', undefined, l10n.value('jdk.extension.command.progress.compilingProject'), LOGGER.getOutputChannel(), args);
 }
 
 const cleanProjectHandler = (args: any) => {
-    return wrapProjectActionWithProgress('clean', undefined, l10n.value('jdk.extension.command.progress.cleaningProject'), LOGGER.getOutputChannel(), args);
+    wrapProjectActionWithProgress('clean', undefined, l10n.value('jdk.extension.command.progress.cleaningProject'), LOGGER.getOutputChannel(), args);
 }
 
 
diff --git a/vscode/src/commands/utils.ts b/vscode/src/commands/utils.ts
@@ -98,7 +98,7 @@ export const wrapCommandWithProgress = (lsCommand: string, title: string, log?:
                             resolve(res);
                         } else {
                             if (log) {
-                                LOGGER.error(`Command ${lsCommand} takes too long to start`);
+                                LOGGER.error(`Result not obtained while executing ${lsCommand}`);
                             }
                             reject(res);
                         }
@@ -107,6 +107,7 @@ export const wrapCommandWithProgress = (lsCommand: string, title: string, log?:
                     if (log) {
                         LOGGER.error(`command ${lsCommand} executed with error: ${JSON.stringify(err)}`);
                     }
+                    reject(err);
                 }
             } else {
                 reject(l10n.value("jdk.extension.progressBar.error_msg.cannotRun", { lsCommand: lsCommand, client: c }));
diff --git a/vscode/src/configurations/configuration.ts b/vscode/src/configurations/configuration.ts
@@ -24,9 +24,10 @@ export const configKeys = {
     formatPrefs: 'format',
     hintPrefs: 'hints',
     importPrefs: 'java.imports',
-    runConfig: 'runCofig',
     runConfigVmOptions: 'runConfig.vmOptions',
+    runConfigArguments: 'runConfig.arguments',
     runConfigCwd: 'runConfig.cwd',
+    runConfigEnv: 'runConfig.env',
     verbose: 'verbose',
     userdir: 'userdir',
     revealInActivteProj: "revealActiveInProjects"
diff --git a/vscode/src/configurations/handlers.ts b/vscode/src/configurations/handlers.ts
@@ -14,7 +14,7 @@
   limitations under the License.
 */
 
-import { extensions, workspace, WorkspaceConfiguration } from "vscode";
+import { ConfigurationTarget, extensions, workspace, WorkspaceConfiguration } from "vscode";
 import { builtInConfigKeys, configKeys } from "./configuration";
 import { extConstants, NODE_WINDOWS_LABEL } from "../constants";
 import * as os from 'os';
@@ -28,12 +28,12 @@ export const getConfiguration = (key: string = extConstants.COMMAND_PREFIX): Wor
 }
 
 export const getConfigurationValue = <T>(key: string, defaultValue: T | undefined = undefined): T => {
-    const conf = workspace.getConfiguration(extConstants.COMMAND_PREFIX);
-    return defaultValue != undefined ? conf.get(key, defaultValue) : conf.get(key) as T;
+        const conf = getConfiguration();
+        return defaultValue != undefined ? conf.get(key, defaultValue) : conf.get(key) as T;
 }
 
-export const updateConfigurationValue = <T>(key: string, newValue: T): void => {
-    workspace.getConfiguration(extConstants.COMMAND_PREFIX).update(key, newValue);
+export const updateConfigurationValue = <T>(key: string, newValue: T, configurationTarget: ConfigurationTarget | boolean | null = null): void => {
+    getConfiguration().update(key, newValue, configurationTarget);
 }
 
 export const getBuiltinConfigurationValue = <T>(key: string, defaultValue: T | undefined = undefined): T => {
@@ -115,8 +115,9 @@ export const isDarkColorThemeHandler = (): boolean => {
 
 export const userdirHandler = (): string => {
     const userdirScope = process.env['nbcode_userdir'] || getConfigurationValue(configKeys.userdir, "local");
-    const userdirParentDir = userdirScope === "local"
-        ? globalVars.extensionInfo.getWorkspaceStorage()?.fsPath
+    const workspaceStoragePath = globalVars.extensionInfo.getWorkspaceStorage()?.fsPath;
+    const userdirParentDir = userdirScope === "local" && workspaceStoragePath
+        ? workspaceStoragePath
         : globalVars.extensionInfo.getGlobalStorage().fsPath;
 
     if (!userdirParentDir) {
@@ -142,4 +143,8 @@ export const userdirHandler = (): string => {
 
 export const isNbJavacDisabledHandler = (): boolean => {
     return getConfigurationValue(configKeys.disableNbJavac, false);
+}
+
+export const isNetbeansVerboseEnabled = (): boolean => {
+    return getConfigurationValue(configKeys.verbose, false);
 }
diff --git a/vscode/src/extension.ts b/vscode/src/extension.ts
@@ -23,10 +23,7 @@
 
 'use strict';
 
-import { ExtensionContext, TextEditorDecorationType } from 'vscode';
-
-
-import * as vscode from 'vscode';
+import { ExtensionContext, TextEditorDecorationType, Uri } from 'vscode';
 import { NbTestAdapter } from './views/TestViewController';
 import { SetTextEditorDecorationParams } from './lsp/protocol';
 import * as launchConfigurations from './launchConfigurations';
@@ -40,7 +37,6 @@ import { VSNetBeansAPI } from './lsp/types';
 import { registerDebugger } from './debugger/debugger';
 import { registerConfigChangeListeners } from './configurations/listener';
 import { registerFileProviders } from './lsp/listeners/textDocumentContentProvider';
-import { createViews } from './views/initializer';
 
 export namespace globalVars {
     export const listeners = new Map<string, string[]>();
@@ -52,7 +48,7 @@ export namespace globalVars {
     export let nbProcessManager: NbProcessManager | null;
     export let testAdapter: NbTestAdapter | undefined;
     export let decorations = new Map<string, TextEditorDecorationType>();
-    export let decorationParamsByUri = new Map<vscode.Uri, SetTextEditorDecorationParams>();
+    export let decorationParamsByUri = new Map<Uri, SetTextEditorDecorationParams>();
 }
 
 
@@ -66,7 +62,6 @@ export function activate(context: ExtensionContext): VSNetBeansAPI {
 
     registerDebugger(context);
     subscribeCommands(context);
-    createViews(context);
     registerFileProviders(context);
 
     launchConfigurations.updateLaunchConfig();
diff --git a/vscode/src/lsp/initializer.ts b/vscode/src/lsp/initializer.ts
@@ -27,6 +27,7 @@ import { NbLanguageClient } from "./nbLanguageClient";
 import { registerListenersAfterClientInit } from "../views/listener";
 import { registerNotificationListeners } from "./listeners/notifications/register";
 import { registerRequestListeners } from "./listeners/requests/register";
+import { createViews } from "../views/initializer";
 
 const establishConnection = () => new Promise<StreamInfo>((resolve, reject) => {
     const nbProcess = globalVars.nbProcessManager?.getProcess();
@@ -112,7 +113,7 @@ export const clientInit = () => {
         registerListenersAfterClientInit();
         registerNotificationListeners(client);
         registerRequestListeners(client);
-
+        createViews();
         LOGGER.log('Language Client: Ready');
         globalVars.clientPromise.initializedSuccessfully(client);
 
diff --git a/vscode/src/lsp/launchOptions.ts b/vscode/src/lsp/launchOptions.ts
@@ -14,7 +14,7 @@
   limitations under the License.
 */
 import { builtInConfigKeys, configKeys } from "../configurations/configuration"
-import { isDarkColorThemeHandler, isNbJavacDisabledHandler, jdkHomeValueHandler, lspServerVmOptionsHandler, projectSearchRootsValueHandler, userdirHandler } from "../configurations/handlers";
+import { isDarkColorThemeHandler, isNetbeansVerboseEnabled, jdkHomeValueHandler, lspServerVmOptionsHandler, projectSearchRootsValueHandler, userdirHandler } from "../configurations/handlers";
 import { l10n } from "../localiser";
 import { isString } from "../utils";
 import { userDefinedLaunchOptionsType } from "./types"
@@ -31,9 +31,10 @@ export const getUserConfigLaunchOptionsDefaults = (): userDefinedLaunchOptionsTy
         },
         [configKeys.disableProjSearchLimit]: {
             value: projectSearchRootsValueHandler(),
-            optionToPass: '-J-Dproject.limitScanRoot=',
-        },[configKeys.verbose]: {
-            value: isNbJavacDisabledHandler(),
+            optionToPass: '-J-Dproject.limitScanRoot='
+        }, 
+        [configKeys.verbose]: {
+            value: isNetbeansVerboseEnabled(),
             optionToPass: '-J-Dnetbeans.logger.console='
         },
         [builtInConfigKeys.vscodeTheme]: {
diff --git a/vscode/src/lsp/nbcode.ts b/vscode/src/lsp/nbcode.ts
@@ -67,10 +67,12 @@ const processOnDataHandler = (nbProcessManager: NbProcessManager, text: string,
     if (nbProcessManager) {
         globalVars.clientPromise.activationPending = false;
     }
+    if(!text.match(/with hash/)){
+        LOGGER.logNoNL(text);
+    }
     if (nbProcessManager.getStdOut() == null) {
         return;
     }
-    LOGGER.logNoNL(text);
     isOut ? nbProcessManager.appendStdOut(text) : nbProcessManager.appendStdErr(text);
 
     if (nbProcessManager.getStdOut()?.match(/org.netbeans.modules.java.lsp.server/)) {
@@ -87,7 +89,7 @@ const processOnCloseHandler = (nbProcessManager: NbProcessManager, code: number)
             window.showWarningMessage(l10n.value("jdk.extension.lspServer.warning_message.serverExited", { SERVER_NAME: extConstants.SERVER_NAME, code }));
         }
     }
-    if (nbProcessManager.getStdOut()?.match(/Cannot find java/) || (os.type() === NODE_WINDOWS_LABEL && !globalVars.deactivated)) {
+    if (nbProcessManager.getStdErr()?.match(/Cannot find java/) || (os.type() === NODE_WINDOWS_LABEL && !globalVars.deactivated)) {
         jdkDownloaderPrompt();
     }
     if (nbProcessManager.getStdOut() != null) {
diff --git a/vscode/src/views/initializer.ts b/vscode/src/views/initializer.ts
@@ -25,12 +25,14 @@ import { configKeys } from "../configurations/configuration";
 import { initializeRunConfiguration } from "../utils";
 import { NbTestAdapter } from "./TestViewController";
 
-export async function createViews(context: ExtensionContext) {
+export async function createViews() {
+    const context = globalVars.extensionInfo.getExtensionContext();
     createRunConfigurationView(context);
     const client = await globalVars.clientPromise.client;
     createProjectView(client);
     globalVars.testAdapter = new NbTestAdapter();
 }
+
 function createRunConfigurationView(context: ExtensionContext) {
     initializeRunConfiguration().then(initialized => {
         if (initialized) {
@@ -59,9 +61,8 @@ async function createProjectView(client: NbLanguageClient) {
         }
         tv.reveal(vis, { select: true, focus: false, expand: false });
     }
-    const netbeansConfig = workspace.getConfiguration(extConstants.COMMAND_PREFIX);
     globalVars.extensionInfo.pushSubscription(window.onDidChangeActiveTextEditor(ed => {
-        if (netbeansConfig.get("revealActiveInProjects")) {
+        if (getConfigurationValue(configKeys.revealInActivteProj)) {
             revealActiveEditor(ed);
         }
     }));
diff --git a/vscode/src/views/runConfiguration.ts b/vscode/src/views/runConfiguration.ts
@@ -22,13 +22,9 @@
 import * as vscode from 'vscode';
 import { homedir } from 'os';
 import { l10n } from '../localiser';
-import { getConfiguration } from '../configurations/handlers';
+import { getConfigurationValue, updateConfigurationValue } from '../configurations/handlers';
 import { configKeys } from '../configurations/configuration';
 
-
-
-
-
 class RunConfigurationNodeProvider implements vscode.TreeDataProvider<vscode.TreeItem> {
 
 	private _onDidChangeTreeData: vscode.EventEmitter<vscode.TreeItem | undefined | null> = new vscode.EventEmitter<vscode.TreeItem | undefined | null>();
@@ -70,7 +66,7 @@ class RunConfigurationNode extends vscode.TreeItem {
 
 		this.settingsKey = settingsKey;
 
-		this.value = this.getConfig().get(this.settingsKey);
+		this.value = getConfigurationValue(this.settingsKey);
 		this.updateNode();
 	}
 
@@ -96,29 +92,24 @@ class RunConfigurationNode extends vscode.TreeItem {
 
 	setValue(value: string | undefined) {
 		this.value = value;
-		this.getConfig().update(this.settingsKey, this.value, vscode.workspace.name || vscode.workspace.workspaceFile ? null : true);
+		updateConfigurationValue(this.settingsKey, this.value, vscode.workspace.name || vscode.workspace.workspaceFile ? null : true);
 		this.updateNode();
 	}
 
 	updateNode(reload?: boolean) {
 		if (reload) {
-			this.value = this.getConfig().get(this.settingsKey) as string;
+			this.value =  getConfigurationValue(this.settingsKey) as string;
 		}
 		this.description = this.value ? this.value : l10n.value("jdk.extension.runConfig.default.label");
 		this.tooltip = `${this.label} ${this.description}`;
 		runConfigurationNodeProvider.refresh();
 	}
-
-	getConfig(): vscode.WorkspaceConfiguration {
-		return getConfiguration(configKeys.runConfig);
-	}
-
 }
 
 class ArgumentsNode extends RunConfigurationNode {
 
 	constructor() {
-		super(l10n.value("jdk.extension.runConfig.arguments.label"), l10n.value("jdk.extension.runConfig.arguments.prompt"), l10n.value("jdk.extension.runConfig.example.label", { data: "foo bar" }), 'arguments');
+		super(l10n.value("jdk.extension.runConfig.arguments.label"), l10n.value("jdk.extension.runConfig.arguments.prompt"), l10n.value("jdk.extension.runConfig.example.label", { data: "foo bar" }), configKeys.runConfigArguments);
 	}
 
 }
@@ -127,7 +118,7 @@ export const argumentsNode = new ArgumentsNode();
 class VMOptionsNode extends RunConfigurationNode {
 
 	constructor() {
-		super(l10n.value("jdk.extension.runConfig.vmoptions.label"), l10n.value("jdk.extension.runConfig.vmoptions.prompt"), l10n.value("jdk.extension.runConfig.example.label", { data: "-Xmx512m -Xms256m" }), 'vmOptions');
+		super(l10n.value("jdk.extension.runConfig.vmoptions.label"), l10n.value("jdk.extension.runConfig.vmoptions.prompt"), l10n.value("jdk.extension.runConfig.example.label", { data: "-Xmx512m -Xms256m" }), configKeys.runConfigVmOptions);
 	}
 
 }
@@ -136,7 +127,7 @@ export const vmOptionsNode = new VMOptionsNode();
 class EnvironmentVariablesNode extends RunConfigurationNode {
 
 	constructor() {
-		super(l10n.value("jdk.extension.runConfig.env.label"), l10n.value("jdk.extension.runConfig.env.prompt"), l10n.value("jdk.extension.runConfig.example.label", { data: "var1=one, varTwo=2" }), 'env');
+		super(l10n.value("jdk.extension.runConfig.env.label"), l10n.value("jdk.extension.runConfig.env.prompt"), l10n.value("jdk.extension.runConfig.example.label", { data: "var1=one, varTwo=2" }), configKeys.runConfigEnv);
 	}
 
 }
@@ -145,7 +136,7 @@ export const environmentVariablesNode = new EnvironmentVariablesNode();
 class WorkingDirectoryNode extends RunConfigurationNode {
 
 	constructor() {
-		super(l10n.value("jdk.extension.runConfig.wrkdir.label"), l10n.value("jdk.extension.runConfig.wrkdir.prompt"), WorkingDirectoryNode.getExample(), 'cwd');
+		super(l10n.value("jdk.extension.runConfig.wrkdir.label"), l10n.value("jdk.extension.runConfig.wrkdir.prompt"), WorkingDirectoryNode.getExample(), configKeys.runConfigCwd);
 	}
 
 	static getExample(): string {
diff --git a/vscode/src/webviews/jdkDownloader/action.ts b/vscode/src/webviews/jdkDownloader/action.ts
@@ -24,6 +24,8 @@ import * as cp from 'child_process';
 import { promisify } from "util";
 import { l10n } from "../../localiser";
 import { LOGGER } from "../../logger";
+import { updateConfigurationValue } from "../../configurations/handlers";
+import { configKeys } from "../../configurations/configuration";
 
 export class JdkDownloaderAction {
     public static readonly MANUAL_INSTALLATION_TYPE = "manual";
@@ -90,7 +92,7 @@ export class JdkDownloaderAction {
     private startInstallation = async () => {
         try {
             if (this.installType === JdkDownloaderAction.MANUAL_INSTALLATION_TYPE) {
-                workspace.getConfiguration('jdk').update('jdkhome', this.installationPath, true);
+                updateConfigurationValue(configKeys.jdkHome, this.installationPath, true);
                 await this.installationCompletion();
 
                 LOGGER.log(`manual JDK installation completed successfully`);
@@ -260,8 +262,7 @@ export class JdkDownloaderAction {
         if (this.osType === 'macOS') {
             binPath = path.join(newDirectoryPath, 'Contents', 'Home');
         }
-
-        workspace.getConfiguration('jdk').update('jdkhome', binPath, true);
+        updateConfigurationValue(configKeys.jdkHome, binPath, true);
 
         LOGGER.log(`Finishing up installation...`);
         this.installationCleanup(tempDirectoryPath, newDirectoryPath);

Original file line number	Diff line number	Diff line change
`@@ -23,16 +23,17 @@ import { wrapCommandWithProgress, wrapProjectActionWithProgress } from "./utils"`
`23`	`23`	`const compileWorkspaceHandler = () => {`
`24`	`24`	`return wrapCommandWithProgress(nbCommands.buildWorkspace, l10n.value('jdk.extension.command.progress.compilingWorkSpace'), LOGGER.getOutputChannel());`
`25`	`25`	`}`
	`26`	`+`
`26`	`27`	`const cleanWorkspaceHandler = () => {`
`27`	`28`	`return wrapCommandWithProgress(nbCommands.cleanWorkspace,l10n.value('jdk.extension.command.progress.cleaningWorkSpace'), LOGGER.getOutputChannel());`
`28`	`29`	`}`
`29`	`30`
`30`	`31`	`const compileProjectHandler = (args: any) => {`
`31`		`- return wrapProjectActionWithProgress('build', undefined, l10n.value('jdk.extension.command.progress.compilingProject'), LOGGER.getOutputChannel(), args);`
	`32`	`+ wrapProjectActionWithProgress('build', undefined, l10n.value('jdk.extension.command.progress.compilingProject'), LOGGER.getOutputChannel(), args);`
`32`	`33`	`}`
`33`	`34`
`34`	`35`	`const cleanProjectHandler = (args: any) => {`
`35`		`- return wrapProjectActionWithProgress('clean', undefined, l10n.value('jdk.extension.command.progress.cleaningProject'), LOGGER.getOutputChannel(), args);`
	`36`	`+ wrapProjectActionWithProgress('clean', undefined, l10n.value('jdk.extension.command.progress.cleaningProject'), LOGGER.getOutputChannel(), args);`
`36`	`37`	`}`
`37`	`38`
`38`	`39`
Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ export const wrapCommandWithProgress = (lsCommand: string, title: string, log?:`
`98`	`98`	`resolve(res);`
`99`	`99`	`} else {`
`100`	`100`	`if (log) {`
`101`		- LOGGER.error(`Command ${lsCommand} takes too long to start`);
	`101`	+ LOGGER.error(`Result not obtained while executing ${lsCommand}`);
`102`	`102`	`}`
`103`	`103`	`reject(res);`
`104`	`104`	`}`
`@@ -107,6 +107,7 @@ export const wrapCommandWithProgress = (lsCommand: string, title: string, log?:`
`107`	`107`	`if (log) {`
`108`	`108`	LOGGER.error(`command ${lsCommand} executed with error: ${JSON.stringify(err)}`);
`109`	`109`	`}`
	`110`	`+ reject(err);`
`110`	`111`	`}`
`111`	`112`	`} else {`
`112`	`113`	`reject(l10n.value("jdk.extension.progressBar.error_msg.cannotRun", { lsCommand: lsCommand, client: c }));`
Original file line number	Diff line number	Diff line change
`@@ -67,10 +67,12 @@ const processOnDataHandler = (nbProcessManager: NbProcessManager, text: string,`
`67`	`67`	`if (nbProcessManager) {`
`68`	`68`	`globalVars.clientPromise.activationPending = false;`
`69`	`69`	`}`
	`70`	`+ if(!text.match(/with hash/)){`
	`71`	`+ LOGGER.logNoNL(text);`
	`72`	`+ }`
`70`	`73`	`if (nbProcessManager.getStdOut() == null) {`
`71`	`74`	`return;`
`72`	`75`	`}`
`73`		`- LOGGER.logNoNL(text);`
`74`	`76`	`isOut ? nbProcessManager.appendStdOut(text) : nbProcessManager.appendStdErr(text);`
`75`	`77`
`76`	`78`	`if (nbProcessManager.getStdOut()?.match(/org.netbeans.modules.java.lsp.server/)) {`
`@@ -87,7 +89,7 @@ const processOnCloseHandler = (nbProcessManager: NbProcessManager, code: number)`
`87`	`89`	`window.showWarningMessage(l10n.value("jdk.extension.lspServer.warning_message.serverExited", { SERVER_NAME: extConstants.SERVER_NAME, code }));`
`88`	`90`	`}`
`89`	`91`	`}`
`90`		`- if (nbProcessManager.getStdOut()?.match(/Cannot find java/) \|\| (os.type() === NODE_WINDOWS_LABEL && !globalVars.deactivated)) {`
	`92`	`+ if (nbProcessManager.getStdErr()?.match(/Cannot find java/) \|\| (os.type() === NODE_WINDOWS_LABEL && !globalVars.deactivated)) {`
`91`	`93`	`jdkDownloaderPrompt();`
`92`	`94`	`}`
`93`	`95`	`if (nbProcessManager.getStdOut() != null) {`
Original file line number	Diff line number	Diff line change
`@@ -22,13 +22,9 @@`
`22`	`22`	`import * as vscode from 'vscode';`
`23`	`23`	`import { homedir } from 'os';`
`24`	`24`	`import { l10n } from '../localiser';`
`25`		`-import { getConfiguration } from '../configurations/handlers';`
	`25`	`+import { getConfigurationValue, updateConfigurationValue } from '../configurations/handlers';`
`26`	`26`	`import { configKeys } from '../configurations/configuration';`
`27`	`27`
`28`		`-`
`29`		`-`
`30`		`-`
`31`		`-`
`32`	`28`	`class RunConfigurationNodeProvider implements vscode.TreeDataProvider<vscode.TreeItem> {`
`33`	`29`
`34`	`30`	`private _onDidChangeTreeData: vscode.EventEmitter<vscode.TreeItem \| undefined \| null> = new vscode.EventEmitter<vscode.TreeItem \| undefined \| null>();`
`@@ -70,7 +66,7 @@ class RunConfigurationNode extends vscode.TreeItem {`
`70`	`66`
`71`	`67`	`this.settingsKey = settingsKey;`
`72`	`68`
`73`		`- this.value = this.getConfig().get(this.settingsKey);`
	`69`	`+ this.value = getConfigurationValue(this.settingsKey);`
`74`	`70`	`this.updateNode();`
`75`	`71`	`}`
`76`	`72`
`@@ -96,29 +92,24 @@ class RunConfigurationNode extends vscode.TreeItem {`
`96`	`92`
`97`	`93`	`setValue(value: string \| undefined) {`
`98`	`94`	`this.value = value;`
`99`		`- this.getConfig().update(this.settingsKey, this.value, vscode.workspace.name \|\| vscode.workspace.workspaceFile ? null : true);`
	`95`	`+ updateConfigurationValue(this.settingsKey, this.value, vscode.workspace.name \|\| vscode.workspace.workspaceFile ? null : true);`
`100`	`96`	`this.updateNode();`
`101`	`97`	`}`
`102`	`98`
`103`	`99`	`updateNode(reload?: boolean) {`
`104`	`100`	`if (reload) {`
`105`		`- this.value = this.getConfig().get(this.settingsKey) as string;`
	`101`	`+ this.value = getConfigurationValue(this.settingsKey) as string;`
`106`	`102`	`}`
`107`	`103`	`this.description = this.value ? this.value : l10n.value("jdk.extension.runConfig.default.label");`
`108`	`104`	this.tooltip = `${this.label} ${this.description}`;
`109`	`105`	`runConfigurationNodeProvider.refresh();`
`110`	`106`	`}`
`111`		`-`
`112`		`- getConfig(): vscode.WorkspaceConfiguration {`
`113`		`- return getConfiguration(configKeys.runConfig);`
`114`		`- }`
`115`		`-`
`116`	`107`	`}`
`117`	`108`
`118`	`109`	`class ArgumentsNode extends RunConfigurationNode {`
`119`	`110`
`120`	`111`	`constructor() {`
`121`		`- super(l10n.value("jdk.extension.runConfig.arguments.label"), l10n.value("jdk.extension.runConfig.arguments.prompt"), l10n.value("jdk.extension.runConfig.example.label", { data: "foo bar" }), 'arguments');`
	`112`	`+ super(l10n.value("jdk.extension.runConfig.arguments.label"), l10n.value("jdk.extension.runConfig.arguments.prompt"), l10n.value("jdk.extension.runConfig.example.label", { data: "foo bar" }), configKeys.runConfigArguments);`
`122`	`113`	`}`
`123`	`114`
`124`	`115`	`}`
`@@ -127,7 +118,7 @@ export const argumentsNode = new ArgumentsNode();`
`127`	`118`	`class VMOptionsNode extends RunConfigurationNode {`
`128`	`119`
`129`	`120`	`constructor() {`
`130`		`- super(l10n.value("jdk.extension.runConfig.vmoptions.label"), l10n.value("jdk.extension.runConfig.vmoptions.prompt"), l10n.value("jdk.extension.runConfig.example.label", { data: "-Xmx512m -Xms256m" }), 'vmOptions');`
	`121`	`+ super(l10n.value("jdk.extension.runConfig.vmoptions.label"), l10n.value("jdk.extension.runConfig.vmoptions.prompt"), l10n.value("jdk.extension.runConfig.example.label", { data: "-Xmx512m -Xms256m" }), configKeys.runConfigVmOptions);`
`131`	`122`	`}`
`132`	`123`
`133`	`124`	`}`
`@@ -136,7 +127,7 @@ export const vmOptionsNode = new VMOptionsNode();`
`136`	`127`	`class EnvironmentVariablesNode extends RunConfigurationNode {`
`137`	`128`
`138`	`129`	`constructor() {`
`139`		`- super(l10n.value("jdk.extension.runConfig.env.label"), l10n.value("jdk.extension.runConfig.env.prompt"), l10n.value("jdk.extension.runConfig.example.label", { data: "var1=one, varTwo=2" }), 'env');`
	`130`	`+ super(l10n.value("jdk.extension.runConfig.env.label"), l10n.value("jdk.extension.runConfig.env.prompt"), l10n.value("jdk.extension.runConfig.example.label", { data: "var1=one, varTwo=2" }), configKeys.runConfigEnv);`
`140`	`131`	`}`
`141`	`132`
`142`	`133`	`}`
`@@ -145,7 +136,7 @@ export const environmentVariablesNode = new EnvironmentVariablesNode();`
`145`	`136`	`class WorkingDirectoryNode extends RunConfigurationNode {`
`146`	`137`
`147`	`138`	`constructor() {`
`148`		`- super(l10n.value("jdk.extension.runConfig.wrkdir.label"), l10n.value("jdk.extension.runConfig.wrkdir.prompt"), WorkingDirectoryNode.getExample(), 'cwd');`
	`139`	`+ super(l10n.value("jdk.extension.runConfig.wrkdir.label"), l10n.value("jdk.extension.runConfig.wrkdir.prompt"), WorkingDirectoryNode.getExample(), configKeys.runConfigCwd);`
`149`	`140`	`}`
`150`	`141`
`151`	`142`	`static getExample(): string {`