better shared process disposal

Benjamin Pasero · Benjamin Pasero · commit f2abadb1ac28 · 2018-03-09T16:46:49.000+01:00
diff --git a/src/vs/code/electron-main/app.ts b/src/vs/code/electron-main/app.ts
@@ -278,7 +278,6 @@ export class CodeApplication {
 
 			// Spawn shared process
 			this.sharedProcess = new SharedProcess(this.environmentService, this.lifecycleService, this.logService, machineId, this.userEnv);
-			this.toDispose.push(this.sharedProcess);
 			this.sharedProcessClient = this.sharedProcess.whenReady().then(() => connect(this.environmentService.sharedIPCHandle, 'main'));
 
 			// Services
diff --git a/src/vs/code/electron-main/sharedProcess.ts b/src/vs/code/electron-main/sharedProcess.ts
@@ -5,7 +5,6 @@
 
 import { assign } from 'vs/base/common/objects';
 import { memoize } from 'vs/base/common/decorators';
-import { IDisposable, toDisposable, dispose } from 'vs/base/common/lifecycle';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { IProcessEnvironment } from 'vs/base/common/platform';
@@ -20,7 +19,6 @@ export class SharedProcess implements ISharedProcess {
 	private barrier = new Barrier();
 
 	private window: Electron.BrowserWindow;
-	private disposables: IDisposable[] = [];
 
 	constructor(
 		private readonly environmentService: IEnvironmentService,
@@ -29,20 +27,6 @@ export class SharedProcess implements ISharedProcess {
 		private readonly machineId: string,
 		private readonly userEnv: IProcessEnvironment,
 	) {
-		this.registerListeners();
-	}
-
-	private registerListeners(): void {
-
-		// Shut the shared process down when we are quitting
-		//
-		// Note: because we veto the window close, we must call our dispose() method,
-		// which removes the veto. Otherwise the application would never quit because
-		// the shared process window is refusing to close!
-		//
-		this.lifecycleService.onShutdown(() => {
-			this.dispose();
-		});
 	}
 
 	@memoize
@@ -79,9 +63,15 @@ export class SharedProcess implements ISharedProcess {
 		};
 
 		this.window.on('close', onClose);
-		this.disposables.push(toDisposable(() => this.window.removeListener('close', onClose)));
 
-		this.disposables.push(toDisposable(() => {
+		this.lifecycleService.onShutdown(() => {
+			// Shut the shared process down when we are quitting
+			//
+			// Note: because we veto the window close, we must first remove our veto.
+			// Otherwise the application would never quit because the shared process
+			// window is refusing to close!
+			//
+			this.window.removeListener('close', onClose);
 
 			// Electron seems to crash on Windows without this setTimeout :|
 			setTimeout(() => {
@@ -93,7 +83,7 @@ export class SharedProcess implements ISharedProcess {
 
 				this.window = null;
 			}, 0);
-		}));
+		});
 
 		return new TPromise<void>((c, e) => {
 			ipcMain.once('handshake:hello', ({ sender }: { sender: any }) => {
@@ -133,8 +123,4 @@ export class SharedProcess implements ISharedProcess {
 		this.window.webContents.closeDevTools();
 		this.window.hide();
 	}
-
-	dispose(): void {
-		this.disposables = dispose(this.disposables);
-	}
 }
