src/config: move getGoConfig/getGoplsConfig to config

And let them use the new Configuration class

For #1094

Change-Id: I96d0cc32b6499e59d1062c2b04031bc675703a24
Reviewed-on: https://go-review.googlesource.com/c/vscode-go/+/283255
Trust: Hyang-Ah Hana Kim <[email protected]>
Reviewed-by: Suzy Mueller <[email protected]>

Author: hyangah

src/config.ts

@@ -20,7 +20,7 @@ export async function initConfig(ctx: vscode.ExtensionContext) {
 	const isTrusted = getFromWorkspaceState(WORKSPACE_IS_TRUSTED_KEY, false);
 	defaultConfig = new Configuration(isTrusted, vscode.workspace.getConfiguration);
 	ctx.subscriptions.push(
-		vscode.commands.registerCommand('go.workspace.isTrusted.toggle', defaultConfig.toggleWorkspaceIsTrusted)
+		vscode.commands.registerCommand('go.workspace.isTrusted.toggle', toggleWorkspaceIsTrusted)
 	);
 
 	if (isTrusted) {
@@ -40,7 +40,7 @@ export async function initConfig(ctx: vscode.ExtensionContext) {
 		'More Info');
 	switch (val) {
 		case 'Trust This Workspace':
-			await defaultConfig.toggleWorkspaceIsTrusted();
+			await toggleWorkspaceIsTrusted();
 			break;
 		case 'More Info':
 			vscode.env.openExternal(
@@ -58,22 +58,27 @@ function ignoredWorkspaceConfig(cfg: vscode.WorkspaceConfiguration, keys: string
 	});
 }
 
+async function toggleWorkspaceIsTrusted() {
+	const v = defaultConfig.toggleWorkspaceIsTrusted();
+	await updateWorkspaceState(WORKSPACE_IS_TRUSTED_KEY, v);
+}
+
 // Go extension configuration for a workspace.
 export class Configuration {
 	constructor(
-		private workspaceIsTrusted: boolean,
-		private getConfiguration: typeof vscode.workspace.getConfiguration) { }
+		private workspaceIsTrusted = false,
+		private getConfiguration = vscode.workspace.getConfiguration) { }
 
-	public async toggleWorkspaceIsTrusted() {
+	public toggleWorkspaceIsTrusted() {
 		this.workspaceIsTrusted = !this.workspaceIsTrusted;
-		await updateWorkspaceState(WORKSPACE_IS_TRUSTED_KEY, this.workspaceIsTrusted);
+		return this.workspaceIsTrusted;
 	}
 
 	// returns a Proxied vscode.WorkspaceConfiguration, which prevents
 	// from using the workspace configuration if the workspace is untrusted.
-	public get<T>(uri?: vscode.Uri): vscode.WorkspaceConfiguration {
-		const cfg = this.getConfiguration('go', uri);
-		if (this.workspaceIsTrusted) {
+	public get<T>(section: string, uri?: vscode.Uri): vscode.WorkspaceConfiguration {
+		const cfg = this.getConfiguration(section, uri);
+		if (section !== 'go' || this.workspaceIsTrusted) {
 			return cfg;
 		}
 
@@ -117,3 +122,24 @@ class WrappedConfiguration implements vscode.WorkspaceConfiguration {
 		return this._wrapped.update(section, value, configurationTarget, overrideInLanguage);
 	}
 }
+
+// getGoConfig is declared as an exported const rather than a function, so it can be stubbbed in testing.
+export const getGoConfig = (uri?: vscode.Uri) => {
+	return getConfig('go', uri);
+};
+
+// getGoplsConfig returns the user's gopls configuration.
+export function getGoplsConfig(uri?: vscode.Uri) {
+	return getConfig('gopls', uri);
+}
+
+function getConfig(section: string, uri?: vscode.Uri) {
+	if (!uri) {
+		if (vscode.window.activeTextEditor) {
+			uri = vscode.window.activeTextEditor.document.uri;
+		} else {
+			uri = null;
+		}
+	}
+	return defaultConfig ? defaultConfig.get(section, uri) : new Configuration().get(section, uri);
+}

src/goBuild.ts

@@ -5,6 +5,7 @@
 
 import path = require('path');
 import vscode = require('vscode');
+import { getGoConfig } from './config';
 import { toolExecutionEnvironment } from './goEnv';
 import { buildDiagnosticCollection } from './goMain';
 import { isModSupported } from './goModules';
@@ -13,7 +14,6 @@ import { diagnosticsStatusBarItem, outputChannel } from './goStatus';
 import { getTestFlags } from './testUtils';
 import {
 	getCurrentGoPath,
-	getGoConfig,
 	getModuleCache,
 	getTempFilePath,
 	getWorkspaceFolderPath,

src/goCover.ts

@@ -8,10 +8,10 @@
 import fs = require('fs');
 import path = require('path');
 import vscode = require('vscode');
+import { getGoConfig } from './config';
 import { isModSupported } from './goModules';
 import { getImportPathToFolder } from './goPackages';
 import { getTestFlags, goTest, showTestOutput, TestConfig } from './testUtils';
-import { getGoConfig } from './util';
 import { fixDriveCasingInWindows } from './utils/pathUtils';
 
 let gutterSvgs: { [key: string]: string; };

src/goDebugConfiguration.ts

@@ -9,11 +9,12 @@ import path = require('path');
 import vscode = require('vscode');
 import parse = require('yargs-parser');
 import unparse = require('yargs-unparser');
+import { getGoConfig } from './config';
 import { toolExecutionEnvironment } from './goEnv';
 import { promptForMissingTool } from './goInstallTools';
 import { packagePathToGoModPathMap } from './goModules';
 import { getFromGlobalState, updateGlobalState } from './stateUtils';
-import { getBinPath, getGoConfig, resolvePath } from './util';
+import { getBinPath, resolvePath } from './util';
 import { parseEnvFiles } from './utils/envUtils';
 
 export class GoDebugConfigurationProvider implements vscode.DebugConfigurationProvider {

src/goDeclaration.ts

@@ -8,14 +8,14 @@
 import cp = require('child_process');
 import path = require('path');
 import vscode = require('vscode');
+import { getGoConfig } from './config';
 import { toolExecutionEnvironment } from './goEnv';
 import { promptForMissingTool, promptForUpdatingTool } from './goInstallTools';
 import { getModFolderPath, promptToUpdateToolForModules } from './goModules';
 import {
 	byteOffsetAt,
 	getBinPath,
 	getFileArchive,
-	getGoConfig,
 	getModuleCache,
 	getWorkspaceFolderPath,
 	goKeywords,

src/goEnv.ts

@@ -7,7 +7,8 @@
 
 import path = require('path');
 import vscode = require('vscode');
-import { getCurrentGoPath, getGoConfig, getToolsGopath, resolvePath } from './util';
+import { getGoConfig } from './config';
+import { getCurrentGoPath, getToolsGopath, resolvePath } from './util';
 
 // toolInstallationEnvironment returns the environment in which tools should
 // be installed. It always returns a new object.

src/goEnvironmentStatus.ts

@@ -13,12 +13,13 @@ import path = require('path');
 import { promisify } from 'util';
 import vscode = require('vscode');
 import WebRequest = require('web-request');
+import { getGoConfig } from './config';
 import { toolInstallationEnvironment } from './goEnv';
 import { logVerbose } from './goLogging';
 import { addGoStatus, goEnvStatusbarItem, outputChannel, removeGoStatus } from './goStatus';
 import { getFromGlobalState, getFromWorkspaceState, updateGlobalState, updateWorkspaceState } from './stateUtils';
 import {
-	getBinPath, getCheckForToolsUpdatesConfig, getGoConfig, getGoVersion,
+	getBinPath, getCheckForToolsUpdatesConfig, getGoVersion,
 	getTempFilePath, GoVersion, rmdirRecursive } from './util';
 import {
 	correctBinname,

src/goExtraInfo.ts

@@ -7,8 +7,8 @@
 
 import vscode = require('vscode');
 import { CancellationToken, Hover, HoverProvider, Position, TextDocument, WorkspaceConfiguration } from 'vscode';
+import { getGoConfig } from './config';
 import { definitionLocation } from './goDeclaration';
-import { getGoConfig } from './util';
 
 export class GoHoverProvider implements HoverProvider {
 	private goConfig: WorkspaceConfiguration | undefined;

src/goFormat.ts

@@ -8,9 +8,10 @@
 import cp = require('child_process');
 import path = require('path');
 import vscode = require('vscode');
+import { getGoConfig } from './config';
 import { toolExecutionEnvironment } from './goEnv';
 import { promptForMissingTool, promptForUpdatingTool } from './goInstallTools';
-import { getBinPath, getGoConfig } from './util';
+import { getBinPath } from './util';
 import { killProcessTree } from './utils/processUtils';
 
 export class GoDocumentFormattingEditProvider implements vscode.DocumentFormattingEditProvider {

src/goGenerateTests.ts

@@ -8,12 +8,13 @@
 import cp = require('child_process');
 import path = require('path');
 import vscode = require('vscode');
+import { getGoConfig } from './config';
 
 import { toolExecutionEnvironment } from './goEnv';
 import { promptForMissingTool } from './goInstallTools';
 import { GoDocumentSymbolProvider } from './goOutline';
 import { outputChannel } from './goStatus';
-import { getBinPath, getGoConfig } from './util';
+import { getBinPath } from './util';
 
 const generatedWord = 'Generated ';