Clean up RemotePty interface, use DI in remote backend

Author: Tyriar

src/vs/workbench/contrib/terminal/browser/remotePty.ts

@@ -42,14 +42,12 @@ export class RemotePty extends Disposable implements ITerminalChildProcess {
 	private readonly _onRestoreCommands = this._register(new Emitter<ISerializedCommandDetectionCapability>());
 	readonly onRestoreCommands = this._onRestoreCommands.event;
 
-	get id(): number { return this._id; }
-
 	constructor(
-		private _id: number,
+		readonly id: number,
 		readonly shouldPersist: boolean,
 		private readonly _remoteTerminalChannel: RemoteTerminalChannelClient,
-		private readonly _remoteAgentService: IRemoteAgentService,
-		private readonly _logService: ILogService
+		@IRemoteAgentService private readonly _remoteAgentService: IRemoteAgentService,
+		@ILogService private readonly _logService: ILogService
 	) {
 		super();
 		this._startBarrier = new Barrier();
@@ -63,9 +61,9 @@ export class RemotePty extends Disposable implements ITerminalChildProcess {
 			throw new Error('Could not fetch remote environment');
 		}
 
-		this._logService.trace('Spawning remote agent process', { terminalId: this._id });
+		this._logService.trace('Spawning remote agent process', { terminalId: this.id });
 
-		const startResult = await this._remoteTerminalChannel.start(this._id);
+		const startResult = await this._remoteTerminalChannel.start(this.id);
 
 		if (startResult && 'message' in startResult) {
 			// An error occurred
@@ -83,7 +81,7 @@ export class RemotePty extends Disposable implements ITerminalChildProcess {
 
 	shutdown(immediate: boolean): void {
 		this._startBarrier.wait().then(_ => {
-			this._remoteTerminalChannel.shutdown(this._id, immediate);
+			this._remoteTerminalChannel.shutdown(this.id, immediate);
 		});
 	}
 
@@ -93,7 +91,7 @@ export class RemotePty extends Disposable implements ITerminalChildProcess {
 		}
 
 		this._startBarrier.wait().then(_ => {
-			this._remoteTerminalChannel.input(this._id, data);
+			this._remoteTerminalChannel.input(this.id, data);
 		});
 	}
 
@@ -104,7 +102,7 @@ export class RemotePty extends Disposable implements ITerminalChildProcess {
 		this._startBarrier.wait().then(_ => {
 			this._lastDimensions.cols = cols;
 			this._lastDimensions.rows = rows;
-			this._remoteTerminalChannel.resize(this._id, cols, rows);
+			this._remoteTerminalChannel.resize(this.id, cols, rows);
 		});
 	}
 
@@ -126,12 +124,12 @@ export class RemotePty extends Disposable implements ITerminalChildProcess {
 		}
 
 		this._startBarrier.wait().then(_ => {
-			this._remoteTerminalChannel.acknowledgeDataEvent(this._id, charCount);
+			this._remoteTerminalChannel.acknowledgeDataEvent(this.id, charCount);
 		});
 	}
 
 	async setUnicodeVersion(version: '6' | '11'): Promise<void> {
-		return this._remoteTerminalChannel.setUnicodeVersion(this._id, version);
+		return this._remoteTerminalChannel.setUnicodeVersion(this.id, version);
 	}
 
 	async getInitialCwd(): Promise<string> {
@@ -143,11 +141,11 @@ export class RemotePty extends Disposable implements ITerminalChildProcess {
 	}
 
 	async refreshProperty<T extends ProcessPropertyType>(type: T): Promise<IProcessPropertyMap[T]> {
-		return this._remoteTerminalChannel.refreshProperty(this._id, type);
+		return this._remoteTerminalChannel.refreshProperty(this.id, type);
 	}
 
 	async updateProperty<T extends ProcessPropertyType>(type: T, value: IProcessPropertyMap[T]): Promise<void> {
-		return this._remoteTerminalChannel.updateProperty(this._id, type, value);
+		return this._remoteTerminalChannel.updateProperty(this.id, type, value);
 	}
 
 	handleData(e: string | IProcessDataEvent) {
@@ -157,7 +155,7 @@ export class RemotePty extends Disposable implements ITerminalChildProcess {
 		this._onProcessExit.fire(e);
 	}
 	processBinary(e: string): Promise<void> {
-		return this._remoteTerminalChannel.processBinary(this._id, e);
+		return this._remoteTerminalChannel.processBinary(this.id, e);
 	}
 	handleReady(e: IProcessReadyEvent) {
 		this._onProcessReady.fire(e);
@@ -203,7 +201,7 @@ export class RemotePty extends Disposable implements ITerminalChildProcess {
 	}
 
 	handleOrphanQuestion() {
-		this._remoteTerminalChannel.orphanQuestionReply(this._id);
+		this._remoteTerminalChannel.orphanQuestionReply(this.id);
 	}
 
 	async getLatency(): Promise<number> {

src/vs/workbench/contrib/terminal/browser/remoteTerminalBackend.ts

@@ -57,6 +57,7 @@ class RemoteTerminalBackend extends BaseTerminalBackend implements ITerminalBack
 		readonly remoteAuthority: string | undefined,
 		private readonly _remoteTerminalChannel: RemoteTerminalChannelClient,
 		@IRemoteAgentService private readonly _remoteAgentService: IRemoteAgentService,
+		@IInstantiationService private readonly _instantiationService: IInstantiationService,
 		@ILogService logService: ILogService,
 		@ICommandService private readonly _commandService: ICommandService,
 		@IStorageService private readonly _storageService: IStorageService,
@@ -215,7 +216,7 @@ class RemoteTerminalBackend extends BaseTerminalBackend implements ITerminalBack
 			rows,
 			unicodeVersion
 		);
-		const pty = new RemotePty(result.persistentTerminalId, shouldPersist, this._remoteTerminalChannel, this._remoteAgentService, this._logService);
+		const pty = this._instantiationService.createInstance(RemotePty, result.persistentTerminalId, shouldPersist, this._remoteTerminalChannel);
 		this._ptys.set(result.persistentTerminalId, pty);
 		return pty;
 	}
@@ -227,7 +228,7 @@ class RemoteTerminalBackend extends BaseTerminalBackend implements ITerminalBack
 
 		try {
 			await this._remoteTerminalChannel.attachToProcess(id);
-			const pty = new RemotePty(id, true, this._remoteTerminalChannel, this._remoteAgentService, this._logService);
+			const pty = this._instantiationService.createInstance(RemotePty, id, true, this._remoteTerminalChannel);
 			this._ptys.set(id, pty);
 			return pty;
 		} catch (e) {