Add resolveWithEnvironment to config resovler

Part of microsoft#120328

Author: alexr00

src/vs/workbench/services/configurationResolver/common/configurationResolver.ts

@@ -7,6 +7,7 @@ import { IStringDictionary } from 'vs/base/common/collections';
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
 import { IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
 import { ConfigurationTarget } from 'vs/platform/configuration/common/configuration';
+import { IProcessEnvironment } from 'vs/base/common/platform';
 
 export const IConfigurationResolverService = createDecorator<IConfigurationResolverService>('configurationResolverService');
 
@@ -33,6 +34,8 @@ export interface IConfigurationResolverService {
 	 */
 	resolveAny(folder: IWorkspaceFolder | undefined, config: any, commandValueMapping?: IStringDictionary<string>): any;
 
+	resolveWithEnvironment(environment: IProcessEnvironment, folder: IWorkspaceFolder | undefined, value: string): string;
+
 	resolveAsync(folder: IWorkspaceFolder | undefined, value: string): Promise<string>;
 	resolveAsync(folder: IWorkspaceFolder | undefined, value: string[]): Promise<string[]>;
 	resolveAsync(folder: IWorkspaceFolder | undefined, value: IStringDictionary<string>): Promise<IStringDictionary<string>>;

src/vs/workbench/services/configurationResolver/common/variableResolver.ts

@@ -58,11 +58,15 @@ export class AbstractVariableResolverService implements IConfigurationResolverSe
 		}
 	}
 
+	public resolveWithEnvironment(environment: IProcessEnvironment, root: IWorkspaceFolder | undefined, value: string): string {
+		return this.recursiveResolve(environment, root ? root.uri : undefined, value);
+	}
+
 	public async resolveAsync(root: IWorkspaceFolder | undefined, value: string): Promise<string>;
 	public async resolveAsync(root: IWorkspaceFolder | undefined, value: string[]): Promise<string[]>;
 	public async resolveAsync(root: IWorkspaceFolder | undefined, value: IStringDictionary<string>): Promise<IStringDictionary<string>>;
 	public async resolveAsync(root: IWorkspaceFolder | undefined, value: any): Promise<any> {
-		return this.recursiveResolve(root ? root.uri : undefined, value);
+		return this.recursiveResolve(this._envVariables, root ? root.uri : undefined, value);
 	}
 
 	/**
@@ -72,7 +76,7 @@ export class AbstractVariableResolverService implements IConfigurationResolverSe
 	public resolve(root: IWorkspaceFolder | undefined, value: string[]): string[];
 	public resolve(root: IWorkspaceFolder | undefined, value: IStringDictionary<string>): IStringDictionary<string>;
 	public resolve(root: IWorkspaceFolder | undefined, value: any): any {
-		return this.recursiveResolve(root ? root.uri : undefined, value);
+		return this.recursiveResolve(this._envVariables, root ? root.uri : undefined, value);
 	}
 
 	/**
@@ -97,7 +101,7 @@ export class AbstractVariableResolverService implements IConfigurationResolverSe
 		delete result.linux;
 
 		// substitute all variables recursively in string values
-		return this.recursiveResolve(workspaceFolder ? workspaceFolder.uri : undefined, result, commandValueMapping, resolvedVariables);
+		return this.recursiveResolve(this._envVariables, workspaceFolder ? workspaceFolder.uri : undefined, result, commandValueMapping, resolvedVariables);
 	}
 
 	public resolveAny(workspaceFolder: IWorkspaceFolder | undefined, config: any, commandValueMapping?: IStringDictionary<string>): any {
@@ -130,23 +134,23 @@ export class AbstractVariableResolverService implements IConfigurationResolverSe
 		}
 	}
 
-	private recursiveResolve(folderUri: uri | undefined, value: any, commandValueMapping?: IStringDictionary<string>, resolvedVariables?: Map<string, string>): any {
+	private recursiveResolve(environment: IProcessEnvironment | undefined, folderUri: uri | undefined, value: any, commandValueMapping?: IStringDictionary<string>, resolvedVariables?: Map<string, string>): any {
 		if (types.isString(value)) {
-			return this.resolveString(folderUri, value, commandValueMapping, resolvedVariables);
+			return this.resolveString(environment, folderUri, value, commandValueMapping, resolvedVariables);
 		} else if (types.isArray(value)) {
-			return value.map(s => this.recursiveResolve(folderUri, s, commandValueMapping, resolvedVariables));
+			return value.map(s => this.recursiveResolve(environment, folderUri, s, commandValueMapping, resolvedVariables));
 		} else if (types.isObject(value)) {
 			let result: IStringDictionary<string | IStringDictionary<string> | string[]> = Object.create(null);
 			Object.keys(value).forEach(key => {
-				const replaced = this.resolveString(folderUri, key, commandValueMapping, resolvedVariables);
-				result[replaced] = this.recursiveResolve(folderUri, value[key], commandValueMapping, resolvedVariables);
+				const replaced = this.resolveString(environment, folderUri, key, commandValueMapping, resolvedVariables);
+				result[replaced] = this.recursiveResolve(environment, folderUri, value[key], commandValueMapping, resolvedVariables);
 			});
 			return result;
 		}
 		return value;
 	}
 
-	private resolveString(folderUri: uri | undefined, value: string, commandValueMapping: IStringDictionary<string> | undefined, resolvedVariables?: Map<string, string>): string {
+	private resolveString(environment: IProcessEnvironment | undefined, folderUri: uri | undefined, value: string, commandValueMapping: IStringDictionary<string> | undefined, resolvedVariables?: Map<string, string>): string {
 
 		// loop through all variables occurrences in 'value'
 		const replaced = value.replace(AbstractVariableResolverService.VARIABLE_REGEXP, (match: string, variable: string) => {
@@ -155,7 +159,7 @@ export class AbstractVariableResolverService implements IConfigurationResolverSe
 				return match;
 			}
 
-			let resolvedValue = this.evaluateSingleVariable(match, variable, folderUri, commandValueMapping);
+			let resolvedValue = this.evaluateSingleVariable(environment, match, variable, folderUri, commandValueMapping);
 
 			if (resolvedVariables) {
 				resolvedVariables.set(variable, resolvedValue);
@@ -171,7 +175,7 @@ export class AbstractVariableResolverService implements IConfigurationResolverSe
 		return this._labelService ? this._labelService.getUriLabel(displayUri, { noPrefix: true }) : displayUri.fsPath;
 	}
 
-	private evaluateSingleVariable(match: string, variable: string, folderUri: uri | undefined, commandValueMapping: IStringDictionary<string> | undefined): string {
+	private evaluateSingleVariable(environment: IProcessEnvironment | undefined, match: string, variable: string, folderUri: uri | undefined, commandValueMapping: IStringDictionary<string> | undefined): string {
 
 		// try to separate variable arguments from variable name
 		let argument: string | undefined;
@@ -230,8 +234,8 @@ export class AbstractVariableResolverService implements IConfigurationResolverSe
 
 			case 'env':
 				if (argument) {
-					if (this._envVariables) {
-						const env = this._envVariables[isWindows ? argument.toLowerCase() : argument];
+					if (environment) {
+						const env = environment[isWindows ? argument.toLowerCase() : argument];
 						if (types.isString(env)) {
 							return env;
 						}