Merge pull request #2168 from Microsoft/master

bobbrow · web-flow · commit 9604256fb8ea · 2018-06-21T18:42:58.000-07:00
Fix ${config:a.b} https://github.com/Microsoft/vscode-cpptools/issues…
diff --git a/Extension/src/common.ts b/Extension/src/common.ts
@@ -175,9 +175,9 @@ export function resolveVariables(input: string, additionalEnvironment: {[key: st
             }
             case "config": {
                 let config: vscode.WorkspaceConfiguration = vscode.workspace.getConfiguration();
-                let keys: string[] = name.split('.');
-                keys.forEach((key: string) => { config = (config) ? config.get(key) : config; });
-                newValue = (config) ? config.toString() : undefined;
+                if (config) {
+                    newValue = config.get<string>(name);
+                }
                 break;
             }
             case "workspaceFolder": {

Original file line number	Diff line number	Diff line change
`@@ -175,9 +175,9 @@ export function resolveVariables(input: string, additionalEnvironment: {[key: st`
`175`	`175`	`}`
`176`	`176`	`case "config": {`
`177`	`177`	`let config: vscode.WorkspaceConfiguration = vscode.workspace.getConfiguration();`
`178`		`- let keys: string[] = name.split('.');`
`179`		`- keys.forEach((key: string) => { config = (config) ? config.get(key) : config; });`
`180`		`- newValue = (config) ? config.toString() : undefined;`
	`178`	`+ if (config) {`
	`179`	`+ newValue = config.get<string>(name);`
	`180`	`+ }`
`181`	`181`	`break;`
`182`	`182`	`}`
`183`	`183`	`case "workspaceFolder": {`