Attempt to fix smoke tests

This reverts commit be89fd2.

src/vs/server/node/remoteTerminalChannel.ts

@@ -32,7 +32,6 @@ import { IProductService } from 'vs/platform/product/common/productService';
 import { IExtensionManagementService } from 'vs/platform/extensionManagement/common/extensionManagement';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { withNullAsUndefined } from 'vs/base/common/types';
-import { getWorkspaceForTerminal } from 'vs/workbench/services/configurationResolver/common/terminalResolver';
 
 class CustomVariableResolver extends AbstractVariableResolverService {
 	constructor(
@@ -239,9 +238,8 @@ export class RemoteTerminalChannel extends Disposable implements IServerChannel<
 			}
 			const envVariableCollections = new Map<string, IEnvironmentVariableCollection>(entries);
 			const mergedCollection = new MergedEnvironmentVariableCollection(envVariableCollections);
-			const cwdWorkspaceFolder = getWorkspaceForTerminal(shellLaunchConfig.cwd, args.workspaceContextService, undefined);
 			const workspaceFolder = activeWorkspaceFolder ? withNullAsUndefined(activeWorkspaceFolder) : undefined;
-			await mergedCollection.applyToProcessEnvironment(env, { workspaceFolder: cwdWorkspaceFolder ?? workspaceFolder }, variableResolver);
+			await mergedCollection.applyToProcessEnvironment(env, { workspaceFolder }, variableResolver);
 		}
 
 		// Fork the process and listen for messages

src/vs/workbench/contrib/terminal/common/remoteTerminalChannel.ts

@@ -51,8 +51,6 @@ export interface ICreateTerminalProcessArguments {
 	rows: number;
 	unicodeVersion: '6' | '11';
 	resolverEnv: { [key: string]: string | null } | undefined;
-	// TODO: Remove this when last active workspace is fixed
-	workspaceContextService: IWorkspaceContextService;
 }
 
 export interface ICreateTerminalProcessResult {
@@ -184,8 +182,7 @@ export class RemoteTerminalChannelClient implements IPtyHostController {
 			cols,
 			rows,
 			unicodeVersion,
-			resolverEnv,
-			workspaceContextService: this._workspaceContextService,
+			resolverEnv
 		};
 		return await this._channel.call<ICreateTerminalProcessResult>('$createProcess', args);
 	}

src/vs/workbench/services/configurationResolver/common/terminalResolver.ts

@@ -8,13 +8,13 @@ import { URI } from 'vs/base/common/uri';
 import { IWorkspaceContextService, IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
 import { IHistoryService } from 'vs/workbench/services/history/common/history';
 
-export function getWorkspaceForTerminal(cwd: URI | string | undefined, workspaceContextService: IWorkspaceContextService, historyService: IHistoryService | undefined): IWorkspaceFolder | undefined {
+export function getWorkspaceForTerminal(cwd: URI | string | undefined, workspaceContextService: IWorkspaceContextService, historyService: IHistoryService): IWorkspaceFolder | undefined {
 	const cwdUri = typeof cwd === 'string' ? URI.parse(cwd) : cwd;
 	let workspaceFolder = cwdUri ? withNullAsUndefined(workspaceContextService.getWorkspaceFolder(cwdUri)) : undefined;
 	if (!workspaceFolder) {
 		// fallback to last active workspace if cwd is not available or it is not in workspace
 		// TOOD: last active workspace is known to be unreliable, we should remove this fallback eventually
-		const activeWorkspaceRootUri = historyService?.getLastActiveWorkspaceRoot();
+		const activeWorkspaceRootUri = historyService.getLastActiveWorkspaceRoot();
 		workspaceFolder = activeWorkspaceRootUri ? withNullAsUndefined(workspaceContextService.getWorkspaceFolder(activeWorkspaceRootUri)) : undefined;
 	}
 	return workspaceFolder;