Move parts of contrib/terminal to browser layer

src/tsconfig.strictNullChecks.json

@@ -278,31 +278,31 @@
 		"./vs/workbench/contrib/surveys/electron-browser/languageSurveys.contribution.ts",
 		"./vs/workbench/contrib/surveys/electron-browser/nps.contribution.ts",
 
+		"./vs/workbench/contrib/terminal/browser/terminalActions.ts",
+		"./vs/workbench/contrib/terminal/browser/terminalCommandTracker.ts",
+		"./vs/workbench/contrib/terminal/browser/terminalConfigHelper.ts",
 		"./vs/workbench/contrib/terminal/browser/terminalFindWidget.ts",
+		"./vs/workbench/contrib/terminal/browser/terminalInstance.ts",
+		"./vs/workbench/contrib/terminal/browser/terminalLinkHandler.ts",
+		"./vs/workbench/contrib/terminal/browser/terminalPanel.ts",
+		"./vs/workbench/contrib/terminal/browser/terminalProcessManager.ts",
 		"./vs/workbench/contrib/terminal/browser/terminalQuickOpen.ts",
 		"./vs/workbench/contrib/terminal/browser/terminalTab.ts",
 		"./vs/workbench/contrib/terminal/browser/terminalWidgetManager.ts",
 		"./vs/workbench/contrib/terminal/common/terminal.ts",
 		"./vs/workbench/contrib/terminal/common/terminalColorRegistry.ts",
 		"./vs/workbench/contrib/terminal/common/terminalCommands.ts",
+		"./vs/workbench/contrib/terminal/common/terminalEnvironment.ts",
 		"./vs/workbench/contrib/terminal/common/terminalMenu.ts",
+		"./vs/workbench/contrib/terminal/common/terminalProcessExtHostProxy.ts",
 		"./vs/workbench/contrib/terminal/common/terminalService.ts",
-		"./vs/workbench/contrib/terminal/electron-browser/terminalActions.ts",
-		"./vs/workbench/contrib/terminal/electron-browser/terminalConfigHelper.ts",
-		"./vs/workbench/contrib/terminal/electron-browser/terminalInstance.ts",
-		"./vs/workbench/contrib/terminal/electron-browser/terminalLinkHandler.ts",
-		"./vs/workbench/contrib/terminal/electron-browser/terminalPanel.ts",
-		"./vs/workbench/contrib/terminal/electron-browser/terminalProcessManager.ts",
 		"./vs/workbench/contrib/terminal/node/terminal.ts",
-		"./vs/workbench/contrib/terminal/node/terminalCommandTracker.ts",
-		"./vs/workbench/contrib/terminal/node/terminalEnvironment.ts",
 		"./vs/workbench/contrib/terminal/node/terminalProcess.ts",
-		"./vs/workbench/contrib/terminal/node/terminalProcessExtHostProxy.ts",
 		"./vs/workbench/contrib/terminal/node/windowsShellHelper.ts",
 		"./vs/workbench/contrib/terminal/test/electron-browser/terminalColorRegistry.test.ts",
+		"./vs/workbench/contrib/terminal/test/electron-browser/terminalCommandTracker.test.ts",
 		"./vs/workbench/contrib/terminal/test/electron-browser/terminalConfigHelper.test.ts",
 		"./vs/workbench/contrib/terminal/test/electron-browser/terminalLinkHandler.test.ts",
-		"./vs/workbench/contrib/terminal/test/node/terminalCommandTracker.test.ts",
 		"./vs/workbench/contrib/terminal/test/node/terminalEnvironment.test.ts",
 		"./vs/workbench/contrib/themes/browser/themes.contribution.ts",
 		"./vs/workbench/contrib/themes/test/electron-browser/themes.test.contribution.ts",

src/vs/base/common/processes.ts

@@ -3,6 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { IProcessEnvironment } from 'vs/base/common/platform';
+
 /**
  * Options to be passed to the external program or shell.
  */
@@ -84,3 +86,30 @@ export const enum TerminateResponseCode {
 	AccessDenied = 2,
 	ProcessNotFound = 3,
 }
+
+/**
+ * Sanitizes a VS Code process environment by removing all Electron/VS Code-related values.
+ */
+export function sanitizeProcessEnvironment(env: IProcessEnvironment, ...preserve: string[]): void {
+	const set = preserve.reduce((set, key) => {
+		set[key] = true;
+		return set;
+	}, {} as Record<string, boolean>);
+	const keysToRemove = [
+		/^ELECTRON_.+$/,
+		/^GOOGLE_API_KEY$/,
+		/^VSCODE_.+$/,
+		/^SNAP(|_.*)$/
+	];
+	const envKeys = Object.keys(env);
+	envKeys
+		.filter(key => !set[key])
+		.forEach(envKey => {
+			for (let i = 0; i < keysToRemove.length; i++) {
+				if (envKey.search(keysToRemove[i]) !== -1) {
+					delete env[envKey];
+					break;
+				}
+			}
+		});
+}

src/vs/base/node/processes.ts

@@ -72,33 +72,6 @@ export function getWindowsShell(): string {
 	return process.env['comspec'] || 'cmd.exe';
 }
 
-/**
- * Sanitizes a VS Code process environment by removing all Electron/VS Code-related values.
- */
-export function sanitizeProcessEnvironment(env: Platform.IProcessEnvironment, ...preserve: string[]): void {
-	const set = preserve.reduce((set, key) => {
-		set[key] = true;
-		return set;
-	}, {} as Record<string, boolean>);
-	const keysToRemove = [
-		/^ELECTRON_.+$/,
-		/^GOOGLE_API_KEY$/,
-		/^VSCODE_.+$/,
-		/^SNAP(|_.*)$/
-	];
-	const envKeys = Object.keys(env);
-	envKeys
-		.filter(key => !set[key])
-		.forEach(envKey => {
-			for (let i = 0; i < keysToRemove.length; i++) {
-				if (envKey.search(keysToRemove[i]) !== -1) {
-					delete env[envKey];
-					break;
-				}
-			}
-		});
-}
-
 export abstract class AbstractProcess<TProgressData> {
 	private cmd: string;
 	private args: string[];

src/vs/base/test/common/processes.test.ts

@@ -0,0 +1,33 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as assert from 'assert';
+import * as processes from 'vs/base/common/processes';
+
+suite('Processes', () => {
+	test('sanitizeProcessEnvironment', () => {
+		let env = {
+			FOO: 'bar',
+			ELECTRON_ENABLE_STACK_DUMPING: 'x',
+			ELECTRON_ENABLE_LOGGING: 'x',
+			ELECTRON_NO_ASAR: 'x',
+			ELECTRON_NO_ATTACH_CONSOLE: 'x',
+			ELECTRON_RUN_AS_NODE: 'x',
+			GOOGLE_API_KEY: 'x',
+			VSCODE_CLI: 'x',
+			VSCODE_DEV: 'x',
+			VSCODE_IPC_HOOK: 'x',
+			VSCODE_LOGS: 'x',
+			VSCODE_NLS_CONFIG: 'x',
+			VSCODE_PORTABLE: 'x',
+			VSCODE_PID: 'x',
+			VSCODE_NODE_CACHED_DATA_DIR: 'x',
+			VSCODE_NEW_VAR: 'x'
+		};
+		processes.sanitizeProcessEnvironment(env);
+		assert.equal(env['FOO'], 'bar');
+		assert.equal(Object.keys(env).length, 1);
+	});
+});

src/vs/base/test/node/processes/processes.test.ts

@@ -84,29 +84,4 @@ suite('Processes', () => {
 			}
 		});
 	});
-
-
-	test('sanitizeProcessEnvironment', () => {
-		let env = {
-			FOO: 'bar',
-			ELECTRON_ENABLE_STACK_DUMPING: 'x',
-			ELECTRON_ENABLE_LOGGING: 'x',
-			ELECTRON_NO_ASAR: 'x',
-			ELECTRON_NO_ATTACH_CONSOLE: 'x',
-			ELECTRON_RUN_AS_NODE: 'x',
-			GOOGLE_API_KEY: 'x',
-			VSCODE_CLI: 'x',
-			VSCODE_DEV: 'x',
-			VSCODE_IPC_HOOK: 'x',
-			VSCODE_LOGS: 'x',
-			VSCODE_NLS_CONFIG: 'x',
-			VSCODE_PORTABLE: 'x',
-			VSCODE_PID: 'x',
-			VSCODE_NODE_CACHED_DATA_DIR: 'x',
-			VSCODE_NEW_VAR: 'x'
-		};
-		processes.sanitizeProcessEnvironment(env);
-		assert.equal(env['FOO'], 'bar');
-		assert.equal(Object.keys(env).length, 1);
-	});
 });

src/vs/workbench/api/node/extHostTerminalService.ts

@@ -4,17 +4,19 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as vscode from 'vscode';
+import pkg from 'vs/platform/product/node/package';
+import * as os from 'os';
 import { URI, UriComponents } from 'vs/base/common/uri';
 import * as platform from 'vs/base/common/platform';
-import * as terminalEnvironment from 'vs/workbench/contrib/terminal/node/terminalEnvironment';
+import * as terminalEnvironment from 'vs/workbench/contrib/terminal/common/terminalEnvironment';
 import { Event, Emitter } from 'vs/base/common/event';
 import { ExtHostTerminalServiceShape, MainContext, MainThreadTerminalServiceShape, IMainContext, ShellLaunchConfigDto } from 'vs/workbench/api/node/extHost.protocol';
 import { ExtHostConfiguration } from 'vs/workbench/api/node/extHostConfiguration';
 import { ILogService } from 'vs/platform/log/common/log';
 import { EXT_HOST_CREATION_DELAY } from 'vs/workbench/contrib/terminal/common/terminal';
 import { TerminalProcess } from 'vs/workbench/contrib/terminal/node/terminalProcess';
 import { timeout } from 'vs/base/common/async';
-import { sanitizeProcessEnvironment } from 'vs/base/node/processes';
+import { sanitizeProcessEnvironment } from 'vs/base/common/processes';
 
 const RENDERER_NO_PROCESS_ID = -1;
 
@@ -429,7 +431,7 @@ export class ExtHostTerminalService implements ExtHostTerminalServiceShape {
 
 		// TODO: @daniel
 		const activeWorkspaceRootUri = URI.revive(activeWorkspaceRootUriComponents);
-		const initialCwd = terminalEnvironment.getCwd(shellLaunchConfig, activeWorkspaceRootUri, terminalConfig.cwd);
+		const initialCwd = terminalEnvironment.getCwd(shellLaunchConfig, os.homedir(), activeWorkspaceRootUri, terminalConfig.cwd);
 
 		// TODO: Pull in and resolve config settings
 		// // Resolve env vars from config and shell
@@ -450,7 +452,7 @@ export class ExtHostTerminalService implements ExtHostTerminalServiceShape {
 
 		// Continue env initialization, merging in the env from the launch
 		// config and adding keys that are needed to create the process
-		terminalEnvironment.addTerminalEnvironmentKeys(env, platform.locale, terminalConfig.get('setLocaleVariables'));
+		terminalEnvironment.addTerminalEnvironmentKeys(env, pkg.version, platform.locale, terminalConfig.get('setLocaleVariables'));
 
 		// Fork the process and listen for messages
 		this._logService.debug(`Terminal process launching on ext host`, shellLaunchConfig, initialCwd, cols, rows, env);

src/vs/workbench/contrib/tasks/electron-browser/terminalTaskSystem.ts

@@ -9,7 +9,6 @@ import * as Objects from 'vs/base/common/objects';
 import * as Types from 'vs/base/common/types';
 import * as Platform from 'vs/base/common/platform';
 import * as Async from 'vs/base/common/async';
-import * as os from 'os';
 import { IStringDictionary, values } from 'vs/base/common/collections';
 import { LinkedMap, Touch } from 'vs/base/common/map';
 import Severity from 'vs/base/common/severity';
@@ -42,6 +41,7 @@ import { REMOTE_HOST_SCHEME } from 'vs/platform/remote/common/remoteHosts';
 import { URI } from 'vs/base/common/uri';
 import { IWindowService } from 'vs/platform/windows/common/windows';
 import { Schemas } from 'vs/base/common/network';
+import { getWindowsBuildNumber } from 'vs/workbench/contrib/terminal/node/terminal';
 
 interface TerminalData {
 	terminal: ITerminalInstance;
@@ -745,7 +745,7 @@ export class TerminalTaskSystem implements ITaskSystem {
 					if (!shellSpecified) {
 						toAdd.push('-Command');
 					}
-				} else if ((basename === 'bash.exe') || (basename === 'zsh.exe') || ((basename === 'wsl.exe') && (this.getWindowsBuildNumber() < 17763))) { // See https://github.com/Microsoft/vscode/issues/67855
+				} else if ((basename === 'bash.exe') || (basename === 'zsh.exe') || ((basename === 'wsl.exe') && (getWindowsBuildNumber() < 17763))) { // See https://github.com/Microsoft/vscode/issues/67855
 					windowsShellArgs = false;
 					if (!shellSpecified) {
 						toAdd.push('-c');
@@ -1213,15 +1213,6 @@ export class TerminalTaskSystem implements ITaskSystem {
 		return result;
 	}
 
-	private getWindowsBuildNumber(): number {
-		const osVersion = (/(\d+)\.(\d+)\.(\d+)/g).exec(os.release());
-		let buildNumber: number = 0;
-		if (osVersion && osVersion.length === 4) {
-			buildNumber = parseInt(osVersion[3]);
-		}
-		return buildNumber;
-	}
-
 	private registerLinkMatchers(terminal: ITerminalInstance, problemMatchers: ProblemMatcher[]): number[] {
 		let result: number[] = [];
 		/*