Merge pull request #458 from ramya-rao-a/ramya-rao-a/update-on-config-change

Update GoRoot,GoPath env variables when config changes. Fixes #455

Author: lukehoban

src/goInstallTools.ts

@@ -81,7 +81,7 @@ export function installTools(missing: string[]) {
 	});
 }
 
-export function setupGoPathAndOfferToInstallTools() {
+export function updateGoPathGoRootFromConfig() {
 	let goroot = vscode.workspace.getConfiguration('go')['goroot'];
 	if (goroot) {
 		process.env['GOROOT'] = goroot;
@@ -90,7 +90,12 @@ export function setupGoPathAndOfferToInstallTools() {
 	let gopath = vscode.workspace.getConfiguration('go')['gopath'];
 	if (gopath) {
 		process.env['GOPATH'] = gopath.replace(/\${workspaceRoot}/g, vscode.workspace.rootPath);
+		hideGoStatus();
 	}
+}
+
+export function setupGoPathAndOfferToInstallTools() {
+	updateGoPathGoRootFromConfig();
 
 	if (!process.env['GOPATH']) {
 		let info = 'GOPATH is not set as an environment variable or via `go.gopath` setting in Code';

src/goMain.ts

@@ -20,7 +20,7 @@ import { GoSignatureHelpProvider } from './goSignature';
 import { GoWorkspaceSymbolProvider } from './goSymbol';
 import { GoCodeActionProvider } from './goCodeAction';
 import { check, ICheckResult } from './goCheck';
-import { setupGoPathAndOfferToInstallTools } from './goInstallTools';
+import { updateGoPathGoRootFromConfig, setupGoPathAndOfferToInstallTools } from './goInstallTools';
 import { GO_MODE } from './goMode';
 import { showHideStatus } from './goStatus';
 import { coverageCurrentPackage, getCodeCoverage, removeCodeCoverage } from './goCover';
@@ -84,6 +84,10 @@ export function activate(ctx: vscode.ExtensionContext): void {
 		installAllTools();
 	}));
 
+	ctx.subscriptions.push(vscode.workspace.onDidChangeConfiguration(() => {
+		updateGoPathGoRootFromConfig();
+	}));
+
 	vscode.languages.setLanguageConfiguration(GO_MODE.language, {
 		indentationRules: {
 			// ^(.*\*/)?\s*\}.*$

src/goStatus.ts

@@ -28,7 +28,9 @@ export function showHideStatus() {
 }
 
 export function hideGoStatus() {
-	statusBarEntry.dispose();
+	if (statusBarEntry) {
+		statusBarEntry.dispose();
+	}
 }
 
 export function showGoStatus(message: string, command: string, tooltip?: string) {