Remove unneeded async

Tyriar · Tyriar · commit d8a2d483da89 · 2020-06-12T11:15:55.000-07:00
diff --git a/src/vs/workbench/api/browser/mainThreadTerminalService.ts b/src/vs/workbench/api/browser/mainThreadTerminalService.ts
@@ -22,7 +22,7 @@ export class MainThreadTerminalService implements MainThreadTerminalServiceShape
 	private _proxy: ExtHostTerminalServiceShape;
 	private _remoteAuthority: string | null;
 	private readonly _toDispose = new DisposableStore();
-	private readonly _terminalProcesses = new Map<number, Promise<ITerminalProcessExtHostProxy>>();
+	private readonly _terminalProcessProxies = new Map<number, ITerminalProcessExtHostProxy>();
 	private _dataEventTracker: TerminalDataEventTracker | undefined;
 	private _linkHandler: IDisposable | undefined;
 
@@ -230,7 +230,7 @@ export class MainThreadTerminalService implements MainThreadTerminalServiceShape
 		}
 
 		const proxy = request.proxy;
-		this._terminalProcesses.set(proxy.terminalId, Promise.resolve(proxy));
+		this._terminalProcessProxies.set(proxy.terminalId, proxy);
 		const shellLaunchConfigDto: IShellLaunchConfigDto = {
 			name: request.shellLaunchConfig.name,
 			executable: request.shellLaunchConfig.executable,
@@ -258,7 +258,7 @@ export class MainThreadTerminalService implements MainThreadTerminalServiceShape
 
 	private _onRequestStartExtensionTerminal(request: IStartExtensionTerminalRequest): void {
 		const proxy = request.proxy;
-		this._terminalProcesses.set(proxy.terminalId, Promise.resolve(proxy));
+		this._terminalProcessProxies.set(proxy.terminalId, proxy);
 
 		// Note that onReisze is not being listened to here as it needs to fire when max dimensions
 		// change, excluding the dimension override
@@ -280,38 +280,38 @@ export class MainThreadTerminalService implements MainThreadTerminalServiceShape
 	}
 
 	public $sendProcessTitle(terminalId: number, title: string): void {
-		this._getTerminalProcess(terminalId).then(e => e.emitTitle(title));
+		this._getTerminalProcess(terminalId).emitTitle(title);
 	}
 
 	public $sendProcessData(terminalId: number, data: string): void {
-		this._getTerminalProcess(terminalId).then(e => e.emitData(data));
+		this._getTerminalProcess(terminalId).emitData(data);
 	}
 
 	public $sendProcessReady(terminalId: number, pid: number, cwd: string): void {
-		this._getTerminalProcess(terminalId).then(e => e.emitReady(pid, cwd));
+		this._getTerminalProcess(terminalId).emitReady(pid, cwd);
 	}
 
 	public $sendProcessExit(terminalId: number, exitCode: number | undefined): void {
-		this._getTerminalProcess(terminalId).then(e => e.emitExit(exitCode));
-		this._terminalProcesses.delete(terminalId);
+		this._getTerminalProcess(terminalId).emitExit(exitCode);
+		this._terminalProcessProxies.delete(terminalId);
 	}
 
 	public $sendOverrideDimensions(terminalId: number, dimensions: ITerminalDimensions | undefined): void {
-		this._getTerminalProcess(terminalId).then(e => e.emitOverrideDimensions(dimensions));
+		this._getTerminalProcess(terminalId).emitOverrideDimensions(dimensions);
 	}
 
 	public $sendProcessInitialCwd(terminalId: number, initialCwd: string): void {
-		this._getTerminalProcess(terminalId).then(e => e.emitInitialCwd(initialCwd));
+		this._getTerminalProcess(terminalId).emitInitialCwd(initialCwd);
 	}
 
 	public $sendProcessCwd(terminalId: number, cwd: string): void {
-		this._getTerminalProcess(terminalId).then(e => e.emitCwd(cwd));
+		this._getTerminalProcess(terminalId).emitCwd(cwd);
 	}
 
 	public $sendResolvedLaunchConfig(terminalId: number, shellLaunchConfig: IShellLaunchConfig): void {
 		const instance = this._terminalService.getInstanceFromId(terminalId);
 		if (instance) {
-			this._getTerminalProcess(terminalId).then(e => e.emitResolvedShellLaunchConfig(shellLaunchConfig));
+			this._getTerminalProcess(terminalId).emitResolvedShellLaunchConfig(shellLaunchConfig);
 		}
 	}
 
@@ -324,7 +324,7 @@ export class MainThreadTerminalService implements MainThreadTerminalServiceShape
 			sw.stop();
 			sum += sw.elapsed();
 		}
-		this._getTerminalProcess(terminalId).then(e => e.emitLatency(sum / COUNT));
+		this._getTerminalProcess(terminalId).emitLatency(sum / COUNT);
 	}
 
 	private _isPrimaryExtHost(): boolean {
@@ -349,8 +349,8 @@ export class MainThreadTerminalService implements MainThreadTerminalServiceShape
 		}
 	}
 
-	private _getTerminalProcess(terminalId: number): Promise<ITerminalProcessExtHostProxy> {
-		const terminal = this._terminalProcesses.get(terminalId);
+	private _getTerminalProcess(terminalId: number): ITerminalProcessExtHostProxy {
+		const terminal = this._terminalProcessProxies.get(terminalId);
 		if (!terminal) {
 			throw new Error(`Unknown terminal: ${terminalId}`);
 		}

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ export class MainThreadTerminalService implements MainThreadTerminalServiceShape`
`22`	`22`	`private _proxy: ExtHostTerminalServiceShape;`
`23`	`23`	`private _remoteAuthority: string \| null;`
`24`	`24`	`private readonly _toDispose = new DisposableStore();`
`25`		`- private readonly _terminalProcesses = new Map<number, Promise<ITerminalProcessExtHostProxy>>();`
	`25`	`+ private readonly _terminalProcessProxies = new Map<number, ITerminalProcessExtHostProxy>();`
`26`	`26`	`private _dataEventTracker: TerminalDataEventTracker \| undefined;`
`27`	`27`	`private _linkHandler: IDisposable \| undefined;`
`28`	`28`
`@@ -230,7 +230,7 @@ export class MainThreadTerminalService implements MainThreadTerminalServiceShape`
`230`	`230`	`}`
`231`	`231`
`232`	`232`	`const proxy = request.proxy;`
`233`		`- this._terminalProcesses.set(proxy.terminalId, Promise.resolve(proxy));`
	`233`	`+ this._terminalProcessProxies.set(proxy.terminalId, proxy);`
`234`	`234`	`const shellLaunchConfigDto: IShellLaunchConfigDto = {`
`235`	`235`	`name: request.shellLaunchConfig.name,`
`236`	`236`	`executable: request.shellLaunchConfig.executable,`
`@@ -258,7 +258,7 @@ export class MainThreadTerminalService implements MainThreadTerminalServiceShape`
`258`	`258`
`259`	`259`	`private _onRequestStartExtensionTerminal(request: IStartExtensionTerminalRequest): void {`
`260`	`260`	`const proxy = request.proxy;`
`261`		`- this._terminalProcesses.set(proxy.terminalId, Promise.resolve(proxy));`
	`261`	`+ this._terminalProcessProxies.set(proxy.terminalId, proxy);`
`262`	`262`
`263`	`263`	`// Note that onReisze is not being listened to here as it needs to fire when max dimensions`
`264`	`264`	`// change, excluding the dimension override`
`@@ -280,38 +280,38 @@ export class MainThreadTerminalService implements MainThreadTerminalServiceShape`
`280`	`280`	`}`
`281`	`281`
`282`	`282`	`public $sendProcessTitle(terminalId: number, title: string): void {`
`283`		`- this._getTerminalProcess(terminalId).then(e => e.emitTitle(title));`
	`283`	`+ this._getTerminalProcess(terminalId).emitTitle(title);`
`284`	`284`	`}`
`285`	`285`
`286`	`286`	`public $sendProcessData(terminalId: number, data: string): void {`
`287`		`- this._getTerminalProcess(terminalId).then(e => e.emitData(data));`
	`287`	`+ this._getTerminalProcess(terminalId).emitData(data);`
`288`	`288`	`}`
`289`	`289`
`290`	`290`	`public $sendProcessReady(terminalId: number, pid: number, cwd: string): void {`
`291`		`- this._getTerminalProcess(terminalId).then(e => e.emitReady(pid, cwd));`
	`291`	`+ this._getTerminalProcess(terminalId).emitReady(pid, cwd);`
`292`	`292`	`}`
`293`	`293`
`294`	`294`	`public $sendProcessExit(terminalId: number, exitCode: number \| undefined): void {`
`295`		`- this._getTerminalProcess(terminalId).then(e => e.emitExit(exitCode));`
`296`		`- this._terminalProcesses.delete(terminalId);`
	`295`	`+ this._getTerminalProcess(terminalId).emitExit(exitCode);`
	`296`	`+ this._terminalProcessProxies.delete(terminalId);`
`297`	`297`	`}`
`298`	`298`
`299`	`299`	`public $sendOverrideDimensions(terminalId: number, dimensions: ITerminalDimensions \| undefined): void {`
`300`		`- this._getTerminalProcess(terminalId).then(e => e.emitOverrideDimensions(dimensions));`
	`300`	`+ this._getTerminalProcess(terminalId).emitOverrideDimensions(dimensions);`
`301`	`301`	`}`
`302`	`302`
`303`	`303`	`public $sendProcessInitialCwd(terminalId: number, initialCwd: string): void {`
`304`		`- this._getTerminalProcess(terminalId).then(e => e.emitInitialCwd(initialCwd));`
	`304`	`+ this._getTerminalProcess(terminalId).emitInitialCwd(initialCwd);`
`305`	`305`	`}`
`306`	`306`
`307`	`307`	`public $sendProcessCwd(terminalId: number, cwd: string): void {`
`308`		`- this._getTerminalProcess(terminalId).then(e => e.emitCwd(cwd));`
	`308`	`+ this._getTerminalProcess(terminalId).emitCwd(cwd);`
`309`	`309`	`}`
`310`	`310`
`311`	`311`	`public $sendResolvedLaunchConfig(terminalId: number, shellLaunchConfig: IShellLaunchConfig): void {`
`312`	`312`	`const instance = this._terminalService.getInstanceFromId(terminalId);`
`313`	`313`	`if (instance) {`
`314`		`- this._getTerminalProcess(terminalId).then(e => e.emitResolvedShellLaunchConfig(shellLaunchConfig));`
	`314`	`+ this._getTerminalProcess(terminalId).emitResolvedShellLaunchConfig(shellLaunchConfig);`
`315`	`315`	`}`
`316`	`316`	`}`
`317`	`317`
`@@ -324,7 +324,7 @@ export class MainThreadTerminalService implements MainThreadTerminalServiceShape`
`324`	`324`	`sw.stop();`
`325`	`325`	`sum += sw.elapsed();`
`326`	`326`	`}`
`327`		`- this._getTerminalProcess(terminalId).then(e => e.emitLatency(sum / COUNT));`
	`327`	`+ this._getTerminalProcess(terminalId).emitLatency(sum / COUNT);`
`328`	`328`	`}`
`329`	`329`
`330`	`330`	`private _isPrimaryExtHost(): boolean {`
`@@ -349,8 +349,8 @@ export class MainThreadTerminalService implements MainThreadTerminalServiceShape`
`349`	`349`	`}`
`350`	`350`	`}`
`351`	`351`
`352`		`- private _getTerminalProcess(terminalId: number): Promise<ITerminalProcessExtHostProxy> {`
`353`		`- const terminal = this._terminalProcesses.get(terminalId);`
	`352`	`+ private _getTerminalProcess(terminalId: number): ITerminalProcessExtHostProxy {`
	`353`	`+ const terminal = this._terminalProcessProxies.get(terminalId);`
`354`	`354`	`if (!terminal) {`
`355`	`355`	throw new Error(`Unknown terminal: ${terminalId}`);
`356`	`356`	`}`