debt - adopt host service in extension host debug service

//cc @weinand

src/vs/workbench/contrib/debug/browser/extensionHostDebugService.ts

@@ -18,6 +18,7 @@ import { IWorkspaceProvider, IWorkspace } from 'vs/workbench/services/host/brows
 import { IProcessEnvironment } from 'vs/base/common/platform';
 import { hasWorkspaceFileExtension } from 'vs/platform/workspaces/common/workspaces';
 import { ILogService } from 'vs/platform/log/common/log';
+import { IHostService } from 'vs/workbench/services/host/browser/host';
 
 class BrowserExtensionHostDebugService extends ExtensionHostDebugChannelClient implements IExtensionHostDebugService {
 
@@ -26,7 +27,8 @@ class BrowserExtensionHostDebugService extends ExtensionHostDebugChannelClient i
 	constructor(
 		@IRemoteAgentService remoteAgentService: IRemoteAgentService,
 		@IWorkbenchEnvironmentService environmentService: IWorkbenchEnvironmentService,
-		@ILogService logService: ILogService
+		@ILogService logService: ILogService,
+		@IHostService hostService: IHostService
 	) {
 		const connection = remoteAgentService.getConnection();
 		let channel: IChannel;
@@ -49,14 +51,14 @@ class BrowserExtensionHostDebugService extends ExtensionHostDebugChannelClient i
 		// Reload window on reload request
 		this._register(this.onReload(event => {
 			if (environmentService.isExtensionDevelopment && environmentService.debugExtensionHost.debugId === event.sessionId) {
-				window.location.reload();
+				hostService.reload();
 			}
 		}));
 
 		// Close window on close request
 		this._register(this.onClose(event => {
 			if (environmentService.isExtensionDevelopment && environmentService.debugExtensionHost.debugId === event.sessionId) {
-				window.close();
+				hostService.close();
 			}
 		}));
 	}

src/vs/workbench/services/host/browser/browserHostService.ts

@@ -413,6 +413,15 @@ export class BrowserHostService extends Disposable implements IHostService {
 		window.location.reload();
 	}
 
+	async close(): Promise<void> {
+
+		// We know that `window.close` will trigger a shutdown
+		// so we update `shutdownReason` to reflect that
+		this.shutdownReason = HostShutdownReason.Api;
+
+		window.close();
+	}
+
 	//#endregion
 }
 

src/vs/workbench/services/host/browser/host.ts

@@ -83,5 +83,10 @@ export interface IHostService {
 	 */
 	reload(): Promise<void>;
 
+	/**
+	 * Attempt to close the active window.
+	 */
+	close(): Promise<void>;
+
 	//#endregion
 }

src/vs/workbench/services/host/electron-sandbox/nativeHostService.ts

@@ -106,6 +106,10 @@ export class NativeHostService extends Disposable implements IHostService {
 		return this.nativeHostService.reload();
 	}
 
+	close(): Promise<void> {
+		return this.nativeHostService.closeWindow();
+	}
+
 	//#endregion
 }
 

src/vs/workbench/test/browser/workbenchTestServices.ts

@@ -1046,6 +1046,7 @@ export class TestHostService implements IHostService {
 
 	async restart(): Promise<void> { }
 	async reload(): Promise<void> { }
+	async close(): Promise<void> { }
 
 	async focus(options?: { force: boolean }): Promise<void> { }