Merge pull request #68415 from Microsoft/tyriar/strict-null-checks

Strict null check more terminal files

src/tsconfig.strictNullChecks.json

@@ -413,6 +413,7 @@
 		"./vs/workbench/api/electron-browser/mainThreadStatusBar.ts",
 		"./vs/workbench/api/electron-browser/mainThreadStorage.ts",
 		"./vs/workbench/api/electron-browser/mainThreadTelemetry.ts",
+		"./vs/workbench/api/electron-browser/mainThreadTerminalService.ts",
 		"./vs/workbench/api/electron-browser/mainThreadUrls.ts",
 		"./vs/workbench/api/electron-browser/mainThreadWindow.ts",
 		"./vs/workbench/api/electron-browser/mainThreadWorkspace.ts",
@@ -635,6 +636,7 @@
 		"./vs/workbench/contrib/terminal/common/terminalCommands.ts",
 		"./vs/workbench/contrib/terminal/common/terminalMenu.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",

src/vs/workbench/api/electron-browser/mainThreadTerminalService.ts

@@ -37,7 +37,7 @@ export class MainThreadTerminalService implements MainThreadTerminalServiceShape
 		this._toDispose.push(terminalService.onInstanceProcessIdReady(instance => this._onTerminalProcessIdReady(instance)));
 		this._toDispose.push(terminalService.onInstanceDimensionsChanged(instance => this._onInstanceDimensionsChanged(instance)));
 		this._toDispose.push(terminalService.onInstanceRequestExtHostProcess(request => this._onTerminalRequestExtHostProcess(request)));
-		this._toDispose.push(terminalService.onActiveInstanceChanged(instance => this._onActiveTerminalChanged(instance ? instance.id : undefined)));
+		this._toDispose.push(terminalService.onActiveInstanceChanged(instance => this._onActiveTerminalChanged(instance ? instance.id : null)));
 		this._toDispose.push(terminalService.onInstanceTitleChanged(instance => this._onTitleChanged(instance.id, instance.title)));
 
 		// Set initial ext host state
@@ -90,7 +90,8 @@ export class MainThreadTerminalService implements MainThreadTerminalServiceShape
 	}
 
 	public $hide(terminalId: number): void {
-		if (this.terminalService.getActiveInstance().id === terminalId) {
+		const instance = this.terminalService.getActiveInstance();
+		if (instance && instance.id === terminalId) {
 			this.terminalService.hidePanel();
 		}
 	}
@@ -164,7 +165,7 @@ export class MainThreadTerminalService implements MainThreadTerminalServiceShape
 		terminalInstance.addDisposable(this._terminalOnDidWriteDataListeners[terminalId]);
 	}
 
-	private _onActiveTerminalChanged(terminalId: number | undefined): void {
+	private _onActiveTerminalChanged(terminalId: number | null): void {
 		this._proxy.$acceptActiveTerminalChanged(terminalId);
 	}
 
@@ -195,6 +196,9 @@ export class MainThreadTerminalService implements MainThreadTerminalServiceShape
 	}
 
 	private _onTerminalProcessIdReady(terminalInstance: ITerminalInstance): void {
+		if (terminalInstance.processId === undefined) {
+			return;
+		}
 		this._proxy.$acceptTerminalProcessId(terminalInstance.id, terminalInstance.processId);
 	}
 

src/vs/workbench/api/node/extHost.protocol.ts

@@ -940,7 +940,7 @@ export interface ShellLaunchConfigDto {
 	executable?: string;
 	args?: string[] | string;
 	cwd?: string | URI;
-	env?: { [key: string]: string };
+	env?: { [key: string]: string | null };
 }
 
 export interface ExtHostTerminalServiceShape {

src/vs/workbench/contrib/terminal/electron-browser/terminalActions.ts

@@ -40,23 +40,23 @@ export const TERMINAL_PICKER_PREFIX = 'term ';
 function getCwdForSplit(configHelper: ITerminalConfigHelper, instance: ITerminalInstance, folders?: IWorkspaceFolder[], commandService?: ICommandService): Promise<string | URI> {
 	switch (configHelper.config.splitCwd) {
 		case 'workspaceRoot':
-			let pathPromise: Promise<string | URI>;
-			if (folders.length === 0) {
-				pathPromise = Promise.resolve('');
-			} else if (folders.length === 1) {
-				pathPromise = Promise.resolve(folders[0].uri);
-			} else if (folders.length > 1) {
-				// Only choose a path when there's more than 1 folder
-				const options: IPickOptions<IQuickPickItem> = {
-					placeHolder: nls.localize('workbench.action.terminal.newWorkspacePlaceholder', "Select current working directory for new terminal")
-				};
-				pathPromise = commandService.executeCommand(PICK_WORKSPACE_FOLDER_COMMAND_ID, [options]).then(workspace => {
-					if (!workspace) {
-						// Don't split the instance if the workspace picker was canceled
-						return undefined;
-					}
-					return Promise.resolve(workspace.uri);
-				});
+			let pathPromise: Promise<string | URI> = Promise.resolve('');
+			if (folders !== undefined && commandService !== undefined) {
+				if (folders.length === 1) {
+					pathPromise = Promise.resolve(folders[0].uri);
+				} else if (folders.length > 1) {
+					// Only choose a path when there's more than 1 folder
+					const options: IPickOptions<IQuickPickItem> = {
+						placeHolder: nls.localize('workbench.action.terminal.newWorkspacePlaceholder', "Select current working directory for new terminal")
+					};
+					pathPromise = commandService.executeCommand(PICK_WORKSPACE_FOLDER_COMMAND_ID, [options]).then(workspace => {
+						if (!workspace) {
+							// Don't split the instance if the workspace picker was canceled
+							return undefined;
+						}
+						return Promise.resolve(workspace.uri);
+					});
+				}
 			}
 			return pathPromise;
 		case 'initial':