fix #1195

DonJayamanne · DonJayamanne · commit fe69ea363b09 · 2017-09-12T17:00:10.000-07:00
diff --git a/src/client/common/systemVariables.ts b/src/client/common/systemVariables.ts
@@ -95,7 +95,7 @@ export abstract class AbstractSystemVariables implements ISystemVariables {
             if (Types.isString(newValue)) {
                 return newValue;
             } else {
-                return match && match.indexOf('env.') > 0 ? '' : match;
+                return match && (match.indexOf('env.') > 0 || match.indexOf('env:') > 0) ? '' : match;
             }
         });
     }
@@ -140,7 +140,7 @@ export class SystemVariables extends AbstractSystemVariables {
         this._workspaceRoot = typeof vscode.workspace.rootPath === 'string' ? vscode.workspace.rootPath : __dirname;;
         this._workspaceRootFolderName = Path.basename(this._workspaceRoot);
         Object.keys(process.env).forEach(key => {
-            this[`env.${key}`] = process.env[key];
+            this[`env:${key}`] = this[`env.${key}`] = process.env[key];
         });
     }
 

Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ export abstract class AbstractSystemVariables implements ISystemVariables {`
`95`	`95`	`if (Types.isString(newValue)) {`
`96`	`96`	`return newValue;`
`97`	`97`	`} else {`
`98`		`- return match && match.indexOf('env.') > 0 ? '' : match;`
	`98`	`+ return match && (match.indexOf('env.') > 0 \|\| match.indexOf('env:') > 0) ? '' : match;`
`99`	`99`	`}`
`100`	`100`	`});`
`101`	`101`	`}`
`@@ -140,7 +140,7 @@ export class SystemVariables extends AbstractSystemVariables {`
`140`	`140`	`this._workspaceRoot = typeof vscode.workspace.rootPath === 'string' ? vscode.workspace.rootPath : __dirname;;`
`141`	`141`	`this._workspaceRootFolderName = Path.basename(this._workspaceRoot);`
`142`	`142`	`Object.keys(process.env).forEach(key => {`
`143`		- this[`env.${key}`] = process.env[key];
	`143`	+ this[`env:${key}`] = this[`env.${key}`] = process.env[key];
`144`	`144`	`});`
`145`	`145`	`}`
`146`	`146`