use more ExtensionHostProfiler and less extension service

src/vs/workbench/contrib/extensions/electron-browser/extensionProfileService.ts

@@ -21,6 +21,7 @@ import { randomPort } from 'vs/base/node/ports';
 import product from 'vs/platform/product/node/product';
 import { RuntimeExtensionsInput } from 'vs/workbench/contrib/extensions/electron-browser/runtimeExtensionsInput';
 import { ExtensionIdentifier } from 'vs/platform/extensions/common/extensions';
+import { ExtensionHostProfiler } from 'vs/workbench/services/extensions/electron-browser/extensionHostProfiler';
 
 export class ExtensionHostProfileService extends Disposable implements IExtensionHostProfileService {
 
@@ -76,7 +77,8 @@ export class ExtensionHostProfileService extends Disposable implements IExtensio
 			return null;
 		}
 
-		if (!this._extensionService.canProfileExtensionHost()) {
+		const inspectPort = this._extensionService.getInspectPort();
+		if (!inspectPort) {
 			return this._dialogService.confirm({
 				type: 'info',
 				message: nls.localize('restart1', "Profile Extensions"),
@@ -92,7 +94,7 @@ export class ExtensionHostProfileService extends Disposable implements IExtensio
 
 		this._setState(ProfileSessionState.Starting);
 
-		return this._extensionService.startExtensionHostProfile().then((value) => {
+		return this._instantiationService.createInstance(ExtensionHostProfiler, inspectPort).start().then((value) => {
 			this._profileSession = value;
 			this._setState(ProfileSessionState.Running);
 		}, (err) => {

src/vs/workbench/contrib/extensions/electron-browser/extensionsAutoProfiler.ts

@@ -21,6 +21,7 @@ import { RuntimeExtensionsInput } from 'vs/workbench/contrib/extensions/electron
 import { ExtensionIdentifier } from 'vs/platform/extensions/common/extensions';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { createSlowExtensionAction } from 'vs/workbench/contrib/extensions/electron-browser/extensionsSlowActions';
+import { ExtensionHostProfiler } from 'vs/workbench/services/extensions/electron-browser/extensionHostProfiler';
 
 export class ExtensionsAutoProfiler extends Disposable implements IWorkbenchContribution {
 
@@ -41,9 +42,10 @@ export class ExtensionsAutoProfiler extends Disposable implements IWorkbenchCont
 	}
 
 	private async _onDidChangeResponsiveChange(event: IResponsiveStateChangeEvent): Promise<void> {
-		const target = this._extensionService;
 
-		if (!target.canProfileExtensionHost()) {
+		const port = this._extensionService.getInspectPort();
+
+		if (!port) {
 			return;
 		}
 
@@ -59,7 +61,8 @@ export class ExtensionsAutoProfiler extends Disposable implements IWorkbenchCont
 
 			let session: ProfileSession;
 			try {
-				session = await target.startExtensionHostProfile();
+				session = await this._instantiationService.createInstance(ExtensionHostProfiler, port).start();
+
 			} catch (err) {
 				this._session = undefined;
 				// fail silent as this is often

src/vs/workbench/services/extensions/common/extensions.ts

@@ -208,20 +208,11 @@ export interface IExtensionService {
 	getExtensionsStatus(): { [id: string]: IExtensionsStatus };
 
 	/**
-	 * Return the inspect port or 0.
+	 * Return the inspect port or `0`, the latter means inspection
+	 * is not possible.
 	 */
 	getInspectPort(): number;
 
-	/**
-	 * Can the extension host be profiled.
-	 */
-	canProfileExtensionHost(): boolean;
-
-	/**
-	 *
-	 */
-	startExtensionHostProfile(): Promise<ProfileSession>;
-
 	/**
 	 * Restarts the extension host.
 	 */
@@ -282,9 +273,7 @@ export class NullExtensionService implements IExtensionService {
 	getExtension() { return Promise.resolve(undefined); }
 	readExtensionPointContributions<T>(_extPoint: IExtensionPoint<T>): Promise<ExtensionPointContribution<T>[]> { return Promise.resolve(Object.create(null)); }
 	getExtensionsStatus(): { [id: string]: IExtensionsStatus; } { return Object.create(null); }
-	canProfileExtensionHost(): boolean { return false; }
 	getInspectPort(): number { return 0; }
-	startExtensionHostProfile(): Promise<ProfileSession> { return Promise.resolve(Object.create(null)); }
 	restartExtensionHost(): void { }
 	startExtensionHost(): void { }
 	stopExtensionHost(): void { }

src/vs/workbench/services/extensions/electron-browser/extensionService.ts

@@ -23,7 +23,7 @@ import product from 'vs/platform/product/node/product';
 import { INotificationService, Severity } from 'vs/platform/notification/common/notification';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { IWindowService, IWindowsService } from 'vs/platform/windows/common/windows';
-import { ActivationTimes, ExtensionPointContribution, IExtensionService, IExtensionsStatus, IMessage, ProfileSession, IWillActivateEvent, IResponsiveStateChangeEvent, toExtension } from 'vs/workbench/services/extensions/common/extensions';
+import { ActivationTimes, ExtensionPointContribution, IExtensionService, IExtensionsStatus, IMessage, IWillActivateEvent, IResponsiveStateChangeEvent, toExtension } from 'vs/workbench/services/extensions/common/extensions';
 import { ExtensionMessageCollector, ExtensionPoint, ExtensionsRegistry, IExtensionPoint, IExtensionPointUser, schema } from 'vs/workbench/services/extensions/common/extensionsRegistry';
 import { ExtensionHostProcessWorker } from 'vs/workbench/services/extensions/electron-browser/extensionHost';
 import { ExtensionDescriptionRegistry } from 'vs/workbench/services/extensions/common/extensionDescriptionRegistry';
@@ -35,7 +35,6 @@ import { Schemas } from 'vs/base/common/network';
 import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
 import { IFileService } from 'vs/platform/files/common/files';
 import { parseExtensionDevOptions } from 'vs/workbench/services/extensions/common/extensionDevOptions';
-import { ExtensionHostProfiler } from 'vs/workbench/services/extensions/electron-browser/extensionHostProfiler';
 
 const hasOwnProperty = Object.hasOwnProperty;
 const NO_OP_VOID_PROMISE = Promise.resolve<void>(undefined);
@@ -570,29 +569,6 @@ export class ExtensionService extends Disposable implements IExtensionService {
 		return result;
 	}
 
-	public canProfileExtensionHost(): boolean {
-		for (let i = 0, len = this._extensionHostProcessManagers.length; i < len; i++) {
-			const extHostProcessManager = this._extensionHostProcessManagers[i];
-			if (extHostProcessManager.canProfileExtensionHost()) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	public startExtensionHostProfile(): Promise<ProfileSession> {
-		for (let i = 0, len = this._extensionHostProcessManagers.length; i < len; i++) {
-			const extHostProcessManager = this._extensionHostProcessManagers[i];
-			if (extHostProcessManager.canProfileExtensionHost()) {
-				const port = extHostProcessManager.getInspectPort();
-				if (port) {
-					return this._instantiationService.createInstance(ExtensionHostProfiler, port).start();
-				}
-			}
-		}
-		throw new Error('Extension host not running or no inspect port available');
-	}
-
 	public getInspectPort(): number {
 		if (this._extensionHostProcessManagers.length > 0) {
 			return this._extensionHostProcessManagers[0].getInspectPort();