get rid of IViewletService#onReady()

Benjamin Pasero · Benjamin Pasero · commit dcbfc1a9b70b · 2016-11-25T17:25:09.000+01:00
diff --git a/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts b/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts
@@ -21,6 +21,7 @@ import { IActivityService, IBadge } from 'vs/workbench/services/activity/common/
 import { IPartService, Parts } from 'vs/workbench/services/part/common/partService';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
+import { IExtensionService } from 'vs/platform/extensions/common/extensions';
 
 export class ActivitybarPart extends Part implements IActivityService {
 	public _serviceBrand: any;
@@ -32,6 +33,7 @@ export class ActivitybarPart extends Part implements IActivityService {
 	constructor(
 		id: string,
 		@IViewletService private viewletService: IViewletService,
+		@IExtensionService private extensionService: IExtensionService,
 		@IKeybindingService private keybindingService: IKeybindingService,
 		@IInstantiationService private instantiationService: IInstantiationService,
 		@IPartService private partService: IPartService
@@ -42,7 +44,7 @@ export class ActivitybarPart extends Part implements IActivityService {
 		this.compositeIdToActions = {};
 
 		// Update viewlet switcher when external viewlets become ready
-		this.viewletService.onReady().then(() => this.updateViewletSwitcher());
+		this.extensionService.onReady().then(() => this.updateViewletSwitcher());
 
 		this.registerListeners();
 	}
diff --git a/src/vs/workbench/electron-browser/integration.ts b/src/vs/workbench/electron-browser/integration.ts
@@ -42,6 +42,7 @@ import { ReloadWindowAction, ToggleDevToolsAction, ShowStartupPerformance, OpenR
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { KeyMod, KeyCode } from 'vs/base/common/keyCodes';
 import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet';
+import { IExtensionService } from 'vs/platform/extensions/common/extensions';
 
 import { ipcRenderer as ipc, webFrame, remote } from 'electron';
 
@@ -77,6 +78,7 @@ export class ElectronIntegration {
 		@IWorkbenchEditorService private editorService: IWorkbenchEditorService,
 		@IUntitledEditorService private untitledEditorService: IUntitledEditorService,
 		@IEnvironmentService private environmentService: IEnvironmentService,
+		@IExtensionService private extensionService: IExtensionService,
 		@IThemeService private themeService: IThemeService,
 		@IViewletService private viewletService: IViewletService
 	) {
@@ -110,8 +112,8 @@ export class ElectronIntegration {
 			}, () => errors.onUnexpectedError);
 		});
 
-		// Send over all extension viewlets when ready
-		this.viewletService.onReady().then(() => {
+		// Send over all extension viewlets when extensions are ready
+		this.extensionService.onReady().then(() => {
 			ipc.send('vscode:extensionViewlets', JSON.stringify(this.viewletService.getViewlets().filter(v => v.fromExtension).map(v => { return { id: v.id, label: v.name }; })));
 		});
 
diff --git a/src/vs/workbench/services/viewlet/browser/viewlet.ts b/src/vs/workbench/services/viewlet/browser/viewlet.ts
@@ -23,11 +23,6 @@ export interface IViewletService {
 	 */
 	openViewlet(id: string, focus?: boolean): TPromise<IViewlet>;
 
-	/**
-	 * Allows to wait until all viewlets are ready, including contributed ones.
-	 */
-	onReady(): TPromise<void>;
-
 	/**
 	 * Returns the current active viewlet or null if none.
 	 */
diff --git a/src/vs/workbench/services/viewlet/browser/viewletService.ts b/src/vs/workbench/services/viewlet/browser/viewletService.ts
@@ -37,10 +37,6 @@ export class ViewletService implements IViewletService {
 		this.loadExtensionViewlets();
 	}
 
-	public onReady(): TPromise<void> {
-		return this.extensionViewletsLoaded;
-	}
-
 	private loadExtensionViewlets(): void {
 		this.extensionViewlets = [];
 
@@ -70,7 +66,7 @@ export class ViewletService implements IViewletService {
 		}
 
 		// Extension viewlets need to be loaded first which can take time
-		return this.onReady().then(() => {
+		return this.extensionViewletsLoaded.then(() => {
 			if (this.viewletRegistry.getViewlet(id)) {
 				return this.sidebarPart.openViewlet(id, focus);
 			}
diff --git a/src/vs/workbench/test/browser/services.test.ts b/src/vs/workbench/test/browser/services.test.ts
@@ -104,10 +104,6 @@ class TestViewletService implements IViewletService {
 	onDidViewletOpen = this.onDidViewletOpenEmitter.event;
 	onDidViewletClose = this.onDidViewletCloseEmitter.event;
 
-	public onReady(): TPromise<void> {
-		return TPromise.as(null);
-	}
-
 	public openViewlet(id: string, focus?: boolean): TPromise<IViewlet> {
 		return TPromise.as(null);
 	}

Original file line number	Diff line number	Diff line change
`@@ -37,10 +37,6 @@ export class ViewletService implements IViewletService {`
`37`	`37`	`this.loadExtensionViewlets();`
`38`	`38`	`}`
`39`	`39`
`40`		`- public onReady(): TPromise<void> {`
`41`		`- return this.extensionViewletsLoaded;`
`42`		`- }`
`43`		`-`
`44`	`40`	`private loadExtensionViewlets(): void {`
`45`	`41`	`this.extensionViewlets = [];`
`46`	`42`
`@@ -70,7 +66,7 @@ export class ViewletService implements IViewletService {`
`70`	`66`	`}`
`71`	`67`
`72`	`68`	`// Extension viewlets need to be loaded first which can take time`
`73`		`- return this.onReady().then(() => {`
	`69`	`+ return this.extensionViewletsLoaded.then(() => {`
`74`	`70`	`if (this.viewletRegistry.getViewlet(id)) {`
`75`	`71`	`return this.sidebarPart.openViewlet(id, focus);`
`76`	`72`	`}`