env support in terminal api #20446

microsoft · Jul 10, 2017 · ee91eeb · ee91eeb
1 parent 5d024c8
commit ee91eeb
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git a/src/vs/vscode.d.ts b/src/vs/vscode.d.ts
@@ -4452,6 +4452,11 @@ declare module 'vscode' {
 		 * Args for the custom shell executable, this does not work on Windows (see #8429)
 		 */
 		shellArgs?: string[];
+		/**
+		 * A custom environment for the terminal, if this is not set the environment will be inherited
+		 * from the VS Code process.
+		 */
+		env?: { [key: string]: string };
 	}
 
 	/**

diff --git a/src/vs/workbench/api/electron-browser/mainThreadTerminalService.ts b/src/vs/workbench/api/electron-browser/mainThreadTerminalService.ts
@@ -31,13 +31,14 @@ export class MainThreadTerminalService extends MainThreadTerminalServiceShape {
 		this._toDispose = dispose(this._toDispose);
 	}
 
-	public $createTerminal(name?: string, shellPath?: string, shellArgs?: string[], waitOnExit?: boolean): TPromise<number> {
+	public $createTerminal(name?: string, shellPath?: string, shellArgs?: string[], env?: { [key: string]: string }, waitOnExit?: boolean): TPromise<number> {
 		const shellLaunchConfig: IShellLaunchConfig = {
 			name,
 			executable: shellPath,
 			args: shellArgs,
 			waitOnExit,
-			ignoreConfigurationCwd: true
+			ignoreConfigurationCwd: true,
+			env
 		};
 		return TPromise.as(this.terminalService.createInstance(shellLaunchConfig).id);
 	}

diff --git a/src/vs/workbench/api/node/extHost.protocol.ts b/src/vs/workbench/api/node/extHost.protocol.ts
@@ -257,7 +257,7 @@ export abstract class MainThreadProgressShape {
 }
 
 export abstract class MainThreadTerminalServiceShape {
-	$createTerminal(name?: string, shellPath?: string, shellArgs?: string[], waitOnExit?: boolean): TPromise<number> { throw ni(); }
+	$createTerminal(name?: string, shellPath?: string, shellArgs?: string[], env?: { [key: string]: string }, waitOnExit?: boolean): TPromise<number> { throw ni(); }
 	$dispose(terminalId: number): void { throw ni(); }
 	$hide(terminalId: number): void { throw ni(); }
 	$sendText(terminalId: number, text: string, addNewLine: boolean): void { throw ni(); }

diff --git a/src/vs/workbench/api/node/extHostTerminalService.ts b/src/vs/workbench/api/node/extHostTerminalService.ts
@@ -27,6 +27,7 @@ export class ExtHostTerminal implements vscode.Terminal {
 		name?: string,
 		shellPath?: string,
 		shellArgs?: string[],
+		env?: { [key: string]: string },
 		waitOnExit?: boolean
 	) {
 		this._name = name;
@@ -35,7 +36,7 @@ export class ExtHostTerminal implements vscode.Terminal {
 		this._pidPromise = new TPromise<number>(c => {
 			this._pidPromiseComplete = c;
 		});
-		this._proxy.$createTerminal(name, shellPath, shellArgs, waitOnExit).then((id) => {
+		this._proxy.$createTerminal(name, shellPath, shellArgs, env, waitOnExit).then((id) => {
 			this._id = id;
 			this._queuedRequests.forEach((r) => {
 				r.run(this._proxy, this._id);
@@ -125,7 +126,7 @@ export class ExtHostTerminalService implements ExtHostTerminalServiceShape {
 	}
 
 	public createTerminalFromOptions(options: vscode.TerminalOptions): vscode.Terminal {
-		let terminal = new ExtHostTerminal(this._proxy, options.name, options.shellPath, options.shellArgs/*, options.waitOnExit*/);
+		let terminal = new ExtHostTerminal(this._proxy, options.name, options.shellPath, options.shellArgs, options.env/*, options.waitOnExit*/);
 		this._terminals.push(terminal);
 		return terminal;
 	}