Pass the workspace path to onConfigurationChange()

Signed-off-by: sheche <sheche@microsoft.com>

Author: jdneo

src/extension.ts

@@ -36,7 +36,6 @@ let storagePath: string;
 let clientLogFile: string;
 
 export const cleanWorkspaceFileName = '.cleanWorkspace';
-export let workspacePath: string;
 
 export class ClientErrorHandler implements ErrorHandler {
 	private restarts: number[];
@@ -193,7 +192,7 @@ export function activate(context: ExtensionContext): Promise<ExtensionAPI> {
 	}).then(async (requirements) => {
 		const triggerFiles = await getTriggerFiles();
 		return new Promise<ExtensionAPI>(async (resolve) => {
-			workspacePath = path.resolve(storagePath + '/jdt_ws');
+			const workspacePath = path.resolve(storagePath + '/jdt_ws');
 			const syntaxServerWorkspacePath = path.resolve(storagePath + '/ss_ws');
 
 			let serverMode = getJavaServerMode();
@@ -370,7 +369,7 @@ export function activate(context: ExtensionContext): Promise<ExtensionAPI> {
 
 			context.subscriptions.push(commands.registerCommand(Commands.CLEAN_WORKSPACE, () => cleanWorkspace(workspacePath)));
 
-			context.subscriptions.push(onConfigurationChange());
+			context.subscriptions.push(onConfigurationChange(workspacePath));
 
 			/**
 			 * Command to switch the server mode. Currently it only supports switch from lightweight to standard.

src/settings.ts

@@ -4,7 +4,7 @@ import * as fs from 'fs';
 import * as path from 'path';
 import { window, Uri, workspace, WorkspaceConfiguration, commands, ConfigurationTarget, env, ExtensionContext, TextEditor, Range, Disposable, WorkspaceFolder } from 'vscode';
 import { Commands } from './commands';
-import { cleanWorkspaceFileName, workspacePath } from './extension';
+import { cleanWorkspaceFileName } from './extension';
 import { ensureExists, getJavaConfiguration } from './utils';
 
 const DEFAULT_HIDDEN_FILES: string[] = ['**/.classpath', '**/.project', '**/.settings', '**/.factorypath'];
@@ -25,7 +25,7 @@ export const ORGANIZE_IMPORTS_ON_PASTE = 'actionsOnPaste.organizeImports'; // ja
 let oldConfig: WorkspaceConfiguration = getJavaConfiguration();
 const gradleWrapperPromptDialogs = [];
 
-export function onConfigurationChange() {
+export function onConfigurationChange(workspacePath: string) {
 	return workspace.onDidChangeConfiguration(params => {
 		if (!params.affectsConfiguration('java')) {
 			return;