Use getGoConfig() utility (#2818)

.vscode/launch.json

@@ -40,6 +40,7 @@
 			"runtimeExecutable": "${execPath}",
 			// the workspace path should be GOPATH
 			"args": [
+				"--disable-extensions",
 				"--extensionDevelopmentPath=${workspaceFolder}",
 				"--extensionTestsPath=${workspaceFolder}/out/test/integration/index",
 				"--timeout",

.vscode/settings.json

@@ -10,5 +10,5 @@
 		"out/": true
 	},
 	"editor.insertSpaces": false,
-	"typescript.tsdk": "node_modules\\typescript\\lib"
+	"typescript.tsdk": "node_modules\\typescript\\lib",
 }

src/goBuild.ts

@@ -11,7 +11,7 @@ import { getNonVendorPackages } from './goPackages';
 import { getCurrentGoWorkspaceFromGOPATH } from './goPath';
 import { diagnosticsStatusBarItem, outputChannel } from './goStatus';
 import { getTestFlags } from './testUtils';
-import { getCurrentGoPath, getModuleCache, getTempFilePath, getToolsEnvVars, getWorkspaceFolderPath, handleDiagnosticErrors, ICheckResult, runTool } from './util';
+import { getCurrentGoPath, getGoConfig, getModuleCache, getTempFilePath, getToolsEnvVars, getWorkspaceFolderPath, handleDiagnosticErrors, ICheckResult, runTool } from './util';
 /**
  * Builds current package or workspace.
  */
@@ -29,7 +29,7 @@ export function buildCode(buildWorkspace?: boolean) {
 	}
 
 	const documentUri = editor ? editor.document.uri : null;
-	const goConfig = vscode.workspace.getConfiguration('go', documentUri);
+	const goConfig = getGoConfig(documentUri);
 
 	outputChannel.clear(); // Ensures stale output from build on save is cleared
 	diagnosticsStatusBarItem.show();

src/goCheck.ts

@@ -35,10 +35,6 @@ export function notifyIfGeneratedFile(this: void, e: vscode.TextDocumentChangeEv
 	if (e.document.isUntitled || e.document.languageId !== 'go') {
 		return;
 	}
-
-	const documentUri = e ? e.document.uri : null;
-	const goConfig = vscode.workspace.getConfiguration('go', documentUri);
-
 	if ((ctx.globalState.get('ignoreGeneratedCodeWarning') !== true) && e.document.lineAt(0).text.match(/^\/\/ Code generated .* DO NOT EDIT\.$/)) {
 		vscode.window.showWarningMessage('This file seems to be generated. DO NOT EDIT.', neverAgain).then(result => {
 			if (result === neverAgain) {

src/goCover.ts

@@ -11,7 +11,7 @@ import fs = require('fs');
 import rl = require('readline');
 import { isModSupported } from './goModules';
 import { getTestFlags, goTest, showTestOutput, TestConfig } from './testUtils';
-import { getTempFilePath } from './util';
+import { getGoConfig, getTempFilePath } from './util';
 
 let gutterSvgs: { [key: string]: string };
 let decorators: {
@@ -51,9 +51,8 @@ export function initCoverageDecorators(ctx: vscode.ExtensionContext) {
 		verticalyellow: ctx.asAbsolutePath('images/gutter-vertyellow.svg')
 	};
 
-	const editor = vscode.window.activeTextEditor;
 	// Update the coverageDecorator in User config, if they are using the old style.
-	const goConfig = vscode.workspace.getConfiguration('go', editor ? editor.document.uri : null);
+	const goConfig = getGoConfig();
 	const inspectResult = goConfig.inspect('coverageDecorator');
 	if (typeof inspectResult.globalValue === 'string') {
 		goConfig.update('coverageDecorator', { type: inspectResult.globalValue }, vscode.ConfigurationTarget.Global);
@@ -239,7 +238,7 @@ export function applyCodeCoverage(editor: vscode.TextEditor) {
 		return;
 	}
 
-	const cfg = vscode.workspace.getConfiguration('go', editor.document.uri);
+	const cfg = getGoConfig(editor.document.uri);
 	const coverageOptions = cfg['coverageOptions'];
 	for (const filename in coverageFiles) {
 		if (editor.document.uri.fsPath.endsWith(filename)) {
@@ -293,7 +292,7 @@ export function toggleCoverageCurrentPackage() {
 		return;
 	}
 
-	const goConfig = vscode.workspace.getConfiguration('go', editor.document.uri);
+	const goConfig = getGoConfig();
 	const cwd = path.dirname(editor.document.uri.fsPath);
 
 	const testFlags = getTestFlags(goConfig);

src/goDebugConfiguration.ts

@@ -9,7 +9,7 @@ import vscode = require('vscode');
 import path = require('path');
 import { promptForMissingTool } from './goInstallTools';
 import { getFromGlobalState, updateGlobalState } from './stateUtils';
-import { getBinPath, getCurrentGoPath, getToolsEnvVars, sendTelemetryEvent } from './util';
+import { getBinPath, getCurrentGoPath, getGoConfig, getToolsEnvVars, sendTelemetryEvent } from './util';
 
 export class GoDebugConfigurationProvider implements vscode.DebugConfigurationProvider {
 
@@ -69,7 +69,7 @@ export class GoDebugConfigurationProvider implements vscode.DebugConfigurationPr
 			debugConfiguration['env']['GOPATH'] = gopath;
 		}
 
-		const goConfig = vscode.workspace.getConfiguration('go', folder ? folder.uri : null);
+		const goConfig = getGoConfig(folder && folder.uri);
 		const goToolsEnvVars = getToolsEnvVars();
 		Object.keys(goToolsEnvVars).forEach(key => {
 			if (!debugConfiguration['env'].hasOwnProperty(key)) {

src/goDeclaration.ts

@@ -10,7 +10,7 @@ import cp = require('child_process');
 import path = require('path');
 import { promptForMissingTool, promptForUpdatingTool } from './goInstallTools';
 import { getModFolderPath, promptToUpdateToolForModules } from './goModules';
-import { byteOffsetAt, getBinPath, getFileArchive, getModuleCache, getToolsEnvVars, getWorkspaceFolderPath, goKeywords, isPositionInString, killProcess, runGodoc } from './util';
+import { byteOffsetAt, getBinPath, getFileArchive, getGoConfig, getModuleCache, getToolsEnvVars, getWorkspaceFolderPath, goKeywords, isPositionInString, killProcess, runGodoc } from './util';
 
 const missingToolMsg = 'Missing tool: ';
 
@@ -55,7 +55,7 @@ export function definitionLocation(document: vscode.TextDocument, position: vsco
 	position = adjustedPos[2];
 
 	if (!goConfig) {
-		goConfig = vscode.workspace.getConfiguration('go', document.uri);
+		goConfig = getGoConfig(document.uri);
 	}
 	const toolForDocs = goConfig['docsTool'] || 'godoc';
 	return getModFolderPath(document.uri).then(modFolderPath => {
@@ -189,7 +189,7 @@ function definitionLocation_gogetdoc(input: GoDefinitionInput, token: vscode.Can
 	return new Promise<GoDefinitionInformation>((resolve, reject) => {
 
 		const gogetdocFlagsWithoutTags = ['-u', '-json', '-modified', '-pos', input.document.fileName + ':#' + offset.toString()];
-		const buildTags = vscode.workspace.getConfiguration('go', input.document.uri)['buildTags'];
+		const buildTags = getGoConfig(input.document.uri)['buildTags'];
 		const gogetdocFlags = (buildTags && useTags) ? [...gogetdocFlagsWithoutTags, '-tags', buildTags] : gogetdocFlagsWithoutTags;
 		p = cp.execFile(gogetdoc, gogetdocFlags, { env, cwd: input.cwd }, (err, stdout, stderr) => {
 			try {

src/goExtraInfo.ts

@@ -8,6 +8,7 @@
 import vscode = require('vscode');
 import { CancellationToken, Hover, HoverProvider, Position, TextDocument, WorkspaceConfiguration } from 'vscode';
 import { definitionLocation } from './goDeclaration';
+import { getGoConfig } from './util';
 
 export class GoHoverProvider implements HoverProvider {
 	private goConfig: WorkspaceConfiguration = null;
@@ -18,7 +19,7 @@ export class GoHoverProvider implements HoverProvider {
 
 	public provideHover(document: TextDocument, position: Position, token: CancellationToken): Thenable<Hover> {
 		if (!this.goConfig) {
-			this.goConfig = vscode.workspace.getConfiguration('go', document.uri);
+			this.goConfig = getGoConfig(document.uri);
 		}
 		let goConfig = this.goConfig;
 

src/goFormat.ts

@@ -9,7 +9,7 @@ import vscode = require('vscode');
 import cp = require('child_process');
 import path = require('path');
 import { promptForMissingTool, promptForUpdatingTool } from './goInstallTools';
-import { getBinPath, getToolsEnvVars, killTree, sendTelemetryEvent } from './util';
+import { getBinPath, getGoConfig, getToolsEnvVars, killTree, sendTelemetryEvent } from './util';
 
 export class GoDocumentFormattingEditProvider implements vscode.DocumentFormattingEditProvider {
 
@@ -19,7 +19,7 @@ export class GoDocumentFormattingEditProvider implements vscode.DocumentFormatti
 		}
 
 		const filename = document.fileName;
-		const goConfig = vscode.workspace.getConfiguration('go', document.uri);
+		const goConfig = getGoConfig(document.uri);
 		const formatTool = goConfig['formatTool'] || 'goreturns';
 		const formatFlags = goConfig['formatFlags'].slice() || [];
 

src/goGenerateTests.ts

@@ -12,7 +12,7 @@ import vscode = require('vscode');
 import { promptForMissingTool } from './goInstallTools';
 import { GoDocumentSymbolProvider } from './goOutline';
 import { outputChannel } from './goStatus';
-import { getBinPath, getToolsEnvVars } from './util';
+import { getBinPath, getGoConfig, getToolsEnvVars } from './util';
 
 const generatedWord = 'Generated ';
 
@@ -71,7 +71,7 @@ export function generateTestCurrentPackage(): Promise<boolean> {
 		return;
 	}
 	return generateTests({ dir: path.dirname(editor.document.uri.fsPath) },
-		vscode.workspace.getConfiguration('go', editor.document.uri));
+		getGoConfig(editor.document.uri));
 }
 
 export function generateTestCurrentFile(): Promise<boolean> {
@@ -80,7 +80,7 @@ export function generateTestCurrentFile(): Promise<boolean> {
 		return;
 	}
 	return generateTests({ dir: editor.document.uri.fsPath },
-		vscode.workspace.getConfiguration('go', editor.document.uri));
+		getGoConfig(editor.document.uri));
 }
 
 export async function generateTestCurrentFunction(): Promise<boolean> {
@@ -101,7 +101,7 @@ export async function generateTestCurrentFunction(): Promise<boolean> {
 	if (funcName.includes('.')) {
 		funcName = funcName.split('.')[1];
 	}
-	return generateTests({ dir: editor.document.uri.fsPath, func: funcName }, vscode.workspace.getConfiguration('go', editor.document.uri));
+	return generateTests({ dir: editor.document.uri.fsPath, func: funcName }, getGoConfig(editor.document.uri));
 }
 
 /**

src/goImplementations.ts

@@ -10,7 +10,7 @@ import cp = require('child_process');
 import path = require('path');
 import { promptForMissingTool } from './goInstallTools';
 import { envPath } from './goPath';
-import { byteOffsetAt, canonicalizeGOPATHPrefix, getBinPath, getToolsEnvVars, getWorkspaceFolderPath, killTree } from './util';
+import { byteOffsetAt, canonicalizeGOPATHPrefix, getBinPath, getGoConfig, getToolsEnvVars, getWorkspaceFolderPath, killTree } from './util';
 
 interface GoListOutput {
 	Dir: string;
@@ -62,7 +62,7 @@ export class GoImplementationProvider implements vscode.ImplementationProvider {
 				const cwd = path.dirname(filename);
 				const offset = byteOffsetAt(document, position);
 				const goGuru = getBinPath('guru');
-				const buildTags = vscode.workspace.getConfiguration('go', document.uri)['buildTags'];
+				const buildTags = getGoConfig(document.uri)['buildTags'];
 				const args = buildTags ? ['-tags', buildTags] : [];
 				if (listOutput.Root && listOutput.ImportPath) {
 					args.push('-scope', `${listOutput.ImportPath}/...`);

src/goInstall.ts

@@ -8,7 +8,7 @@ import vscode = require('vscode');
 import { isModSupported } from './goModules';
 import { envPath, getCurrentGoWorkspaceFromGOPATH } from './goPath';
 import { outputChannel } from './goStatus';
-import { getBinPath, getCurrentGoPath, getModuleCache, getToolsEnvVars } from './util';
+import { getBinPath, getCurrentGoPath, getGoConfig, getModuleCache, getToolsEnvVars } from './util';
 import cp = require('child_process');
 
 export async function installCurrentPackage(): Promise<void> {
@@ -37,7 +37,7 @@ export async function installCurrentPackage(): Promise<void> {
 		return;
 	}
 
-	const goConfig = vscode.workspace.getConfiguration('go', editor.document.uri);
+	const goConfig = getGoConfig();
 	const buildFlags = goConfig['buildFlags'] || [];
 	const args = ['install', ...buildFlags];
 

src/goInstallTools.ts

@@ -13,7 +13,7 @@ import { getLanguageServerToolPath } from './goLanguageServer';
 import { envPath, getToolFromToolPath } from './goPath';
 import { hideGoStatus, outputChannel, showGoStatus } from './goStatus';
 import { containsString, containsTool, getConfiguredTools, getImportPath, getTool, hasModSuffix, isGocode, isWildcard, Tool } from './goTools';
-import { getBinPath, getCurrentGoPath, getGoVersion, getTempFilePath, getToolsGopath, GoVersion, resolvePath } from './util';
+import { getBinPath, getCurrentGoPath, getGoConfig, getGoVersion, getTempFilePath, getToolsGopath, GoVersion, resolvePath } from './util';
 
 // declinedUpdates tracks the tools that the user has declined to update.
 const declinedUpdates: Tool[] = [];
@@ -68,7 +68,7 @@ export function installTools(missing: Tool[], goVersion: GoVersion): Promise<voi
 	}
 
 	// http.proxy setting takes precedence over environment variables
-	const httpProxy = vscode.workspace.getConfiguration('http').get('proxy');
+	const httpProxy = vscode.workspace.getConfiguration('http', null).get('proxy');
 	let envForTools = Object.assign({}, process.env);
 	if (httpProxy) {
 		envForTools = Object.assign({}, process.env, {
@@ -301,7 +301,7 @@ export async function promptForUpdatingTool(toolName: string) {
 }
 
 export function updateGoPathGoRootFromConfig(): Promise<void> {
-	const goroot = vscode.workspace.getConfiguration('go', vscode.window.activeTextEditor ? vscode.window.activeTextEditor.document.uri : null)['goroot'];
+	const goroot = getGoConfig()['goroot'];
 	if (goroot) {
 		process.env['GOROOT'] = resolvePath(goroot);
 	}
@@ -384,7 +384,7 @@ export async function offerToInstallTools() {
 							vscode.window.showInformationMessage('Reload VS Code window to enable the use of Go language server');
 						});
 				} else if (selected === disableLabel) {
-					const goConfig = vscode.workspace.getConfiguration('go');
+					const goConfig = getGoConfig();
 					const inspectLanguageServerSetting = goConfig.inspect('useLanguageServer');
 					if (inspectLanguageServerSetting.globalValue === true) {
 						goConfig.update('useLanguageServer', false, vscode.ConfigurationTarget.Global);

src/goLanguageServer.ts

@@ -31,7 +31,7 @@ import { GoCompletionItemProvider } from './goSuggest';
 import { GoWorkspaceSymbolProvider } from './goSymbol';
 import { getTool, Tool } from './goTools';
 import { GoTypeDefinitionProvider } from './goTypeDefinition';
-import { getBinPath, getCurrentGoPath, getToolsEnvVars } from './util';
+import { getBinPath, getCurrentGoPath, getGoConfig, getToolsEnvVars } from './util';
 
 interface LanguageServerConfig {
 	enabled: boolean;
@@ -288,7 +288,7 @@ function watchLanguageServerConfiguration(e: vscode.ConfigurationChangeEvent) {
 }
 
 export function parseLanguageServerConfig(): LanguageServerConfig {
-	const goConfig = vscode.workspace.getConfiguration('go');
+	const goConfig = getGoConfig();
 
 	const config = {
 		enabled: goConfig['useLanguageServer'],
@@ -323,7 +323,7 @@ export function parseLanguageServerConfig(): LanguageServerConfig {
  */
 export function getLanguageServerToolPath(): string {
 	// If language server is not enabled, return
-	const goConfig = vscode.workspace.getConfiguration('go');
+	const goConfig = getGoConfig();
 	if (!goConfig['useLanguageServer']) {
 		return;
 	}

src/goLint.ts

@@ -7,7 +7,7 @@ import path = require('path');
 import vscode = require('vscode');
 import { lintDiagnosticCollection } from './goMain';
 import { diagnosticsStatusBarItem, outputChannel } from './goStatus';
-import { getToolsEnvVars, getToolsGopath, getWorkspaceFolderPath, handleDiagnosticErrors, ICheckResult, resolvePath, runTool } from './util';
+import { getGoConfig, getToolsEnvVars, getToolsGopath, getWorkspaceFolderPath, handleDiagnosticErrors, ICheckResult, resolvePath, runTool } from './util';
 /**
  * Runs linter on the current file, package or workspace.
  */
@@ -23,7 +23,7 @@ export function lintCode(scope?: string) {
 	}
 
 	const documentUri = editor ? editor.document.uri : null;
-	const goConfig = vscode.workspace.getConfiguration('go', documentUri);
+	const goConfig = getGoConfig(documentUri);
 
 	outputChannel.clear(); // Ensures stale output from lint on save is cleared
 	diagnosticsStatusBarItem.show();

src/goLiveErrors.ts

@@ -26,7 +26,7 @@ export function goLiveErrorsEnabled() {
 	if (goConfig === null || goConfig === undefined || !goConfig.enabled) {
 		return false;
 	}
-	const files = vscode.workspace.getConfiguration('files');
+	const files = vscode.workspace.getConfiguration('files', null);
 	const autoSave = files['autoSave'];
 	const autoSaveDelay = files['autoSaveDelay'];
 	if (autoSave !== null && autoSave !== undefined &&
@@ -55,7 +55,7 @@ export function parseLiveFile(e: vscode.TextDocumentChangeEvent) {
 	runner = setTimeout(() => {
 		processFile(e);
 		runner = null;
-	}, vscode.workspace.getConfiguration('go', e.document.uri)['liveErrors']['delay']);
+	}, getGoConfig(e.document.uri)['liveErrors']['delay']);
 }
 
 // processFile does the actual work once the timeout has fired