Fix errors after 1.60.0 update

Author: jeanp413

src/vs/gitpod/node/server.ts

@@ -21,7 +21,7 @@ import { RemoteTerminalChannelServer } from 'vs/gitpod/node/remoteTerminalChanne
 import type { ServerExtensionHostConnection } from 'vs/gitpod/node/server-extension-host-connection';
 import { infoServiceClient, statusServiceClient, supervisorAddr, supervisorDeadlines, supervisorMetadata } from 'vs/gitpod/node/supervisor-client';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IExtensionGalleryService, IExtensionManagementCLIService, IExtensionManagementService } from 'vs/platform/extensionManagement/common/extensionManagement';
+import { IExtensionGalleryService, IExtensionManagementCLIService, IExtensionManagementService, CURRENT_TARGET_PLATFORM } from 'vs/platform/extensionManagement/common/extensionManagement';
 import { ExtensionManagementCLIService } from 'vs/platform/extensionManagement/common/extensionManagementCLIService';
 import { ExtensionType } from 'vs/platform/extensions/common/extensions';
 import { IFileService } from 'vs/platform/files/common/files';
@@ -296,7 +296,7 @@ main({
 			const lookup = new Set(param.extensions.map(({ id }) => id));
 			const uninstalled = new Set<string>([...lookup]);
 			lookup.add('github.vscode-pull-request-github');
-			const extensionIds = param.extensions.filter(({ version }) => version === undefined).map(({ id }) => id);
+			const extensionIds = param.extensions.filter(({ version }) => version === undefined).map(({ id }) => ({ id }));
 			const extensionsWithIdAndVersion = param.extensions.filter(({ version }) => version !== undefined);
 			await Promise.all([
 				extensionManagementService.getInstalled(ExtensionType.User).then(extensions => {
@@ -311,7 +311,7 @@ main({
 				extensionGalleryService.getExtensions(extensionIds, token).then(result =>
 					result.forEach(extension => extensions.add(extension.identifier.id.toLocaleLowerCase())), () => { }),
 				...extensionsWithIdAndVersion.map(({ id, version }) =>
-					extensionGalleryService.getCompatibleExtension({ id }, version, token).
+					extensionGalleryService.getCompatibleExtension({ id }, CURRENT_TARGET_PLATFORM).
 						then(extension => extension && extensions.add(extension.identifier.id.toLocaleLowerCase()), () => { })),
 				...param.links.map(async vsix => {
 					try {

src/vs/gitpod/node/supervisorTerminalProcess.ts

@@ -90,7 +90,7 @@ export class SupervisorTerminalProcess extends DisposableStore implements ITermi
 		this.add(this.onProcessExit(() => this._bufferer.stopBuffering(this.id)));
 
 		// Data recording for reconnect
-		this.add(this._onProcessData.event(e => this._recorder.recordData(e)));
+		this.add(this._onProcessData.event(e => this._recorder.handleData(e)));
 
 		this.add({
 			dispose: () => {
@@ -112,7 +112,7 @@ export class SupervisorTerminalProcess extends DisposableStore implements ITermi
 			this._onProcessReady.fire({ pid: this.syncState.getPid(), cwd: this.syncState.getCurrentWorkdir() });
 			this._onProcessTitleChanged.fire(this.syncState.getTitle());
 			this.monitorChildProcess();
-			this.triggerReplay();
+			await this.triggerReplay();
 			this.listen();
 			return undefined;
 		}
@@ -398,6 +398,10 @@ export class SupervisorTerminalProcess extends DisposableStore implements ITermi
 		});
 	}
 
+	async setUnicodeVersion(version: '6' | '11'): Promise<void> {
+		// No-op
+	}
+
 	getInitialCwd(): Promise<string> {
 		return Promise.resolve(this.initialCwd);
 	}
@@ -429,7 +433,7 @@ export class SupervisorTerminalProcess extends DisposableStore implements ITermi
 	}
 
 	private toSize(cols: number, rows: number): TerminalSize | undefined {
-		this._recorder.recordResize(cols, rows);
+		this._recorder.handleResize(cols, rows);
 
 		if (typeof cols !== 'number' || typeof rows !== 'number' || isNaN(cols) || isNaN(rows)) {
 			return undefined;
@@ -440,8 +444,8 @@ export class SupervisorTerminalProcess extends DisposableStore implements ITermi
 		return size;
 	}
 
-	private triggerReplay(): void {
-		const event = this._recorder.generateReplayEvent();
+	private async triggerReplay(): Promise<void> {
+		const event = await this._recorder.generateReplayEvent();
 		this._onProcessReplay.fire(event);
 	}