Remove options from composite bar and use addComposite for adding

src/vs/workbench/browser/parts/activitybar/activitybarPart.ts

@@ -66,7 +66,6 @@ export class ActivitybarPart extends Part {
 			icon: true,
 			storageId: ActivitybarPart.PINNED_VIEWLETS,
 			orientation: ActionsOrientation.VERTICAL,
-			composites: this.viewletService.getViewlets().filter(v => this.canShow(v)),
 			openComposite: (compositeId: string) => this.viewletService.openViewlet(compositeId, true),
 			getActivityAction: (compositeId: string) => this.getCompositeActions(compositeId).activityAction,
 			getCompositePinnedAction: (compositeId: string) => this.getCompositeActions(compositeId).pinnedAction,

src/vs/workbench/browser/parts/compositebar/compositeBar.ts

@@ -25,7 +25,6 @@ export interface ICompositeBarOptions {
 	icon: boolean;
 	storageId: string;
 	orientation: ActionsOrientation;
-	composites: { id: string, name: string, order: number }[];
 	colors: ICompositeBarColors;
 	compositeSize: number;
 	overflowActionSize: number;
@@ -62,14 +61,6 @@ export class CompositeBar extends Widget implements ICompositeBar {
 		this.storedState = this.loadCompositeItemsFromStorage();
 		this.visibleComposites = [];
 		this.compositeSizeInBar = new Map<string, number>();
-
-		let index = 0;
-		for (const state of this.storedState) {
-			const composite = this.options.composites.filter(c => c.id === state.id)[0];
-			if (composite) {
-				this.addToModel(composite.id, composite.name, composite.order, state.pinned, index++);
-			}
-		}
 	}
 
 	public create(parent: HTMLElement): HTMLElement {
@@ -449,16 +440,8 @@ export class CompositeBar extends Widget implements ICompositeBar {
 
 	private loadCompositeItemsFromStorage(): ISerializedCompositeBarItem[] {
 		const storedStates = <Array<string | ISerializedCompositeBarItem>>JSON.parse(this.storageService.get(this.options.storageId, StorageScope.GLOBAL, '[]'));
-		const isOldData = storedStates && storedStates.length && typeof storedStates[0] === 'string';
 		const compositeStates = <ISerializedCompositeBarItem[]>storedStates.map(c =>
 			typeof c === 'string' /* migration from pinned states to composites states */ ? { id: c, pinned: true } : c);
-
-		if (!isOldData) { /* Add new composites only if it is new data */
-			const newComposites = this.options.composites.filter(c => compositeStates.every(s => s.id !== c.id));
-			newComposites.sort((c1, c2) => c1.order < c2.order ? -1 : 1);
-			newComposites.forEach(c => compositeStates.push({ id: c.id, pinned: true, order: c.order /* new composites are pinned by default */ }));
-		}
-
 		return compositeStates;
 	}
 

src/vs/workbench/browser/parts/panel/panelPart.ts

@@ -80,7 +80,6 @@ export class PanelPart extends CompositePart<Panel> implements IPanelService {
 			icon: false,
 			storageId: PanelPart.PINNED_PANELS,
 			orientation: ActionsOrientation.HORIZONTAL,
-			composites: this.getPanels(),
 			openComposite: (compositeId: string) => this.openPanel(compositeId, true),
 			getActivityAction: (compositeId: string) => this.getCompositeActions(compositeId).activityAction,
 			getCompositePinnedAction: (compositeId: string) => this.getCompositeActions(compositeId).pinnedAction,
@@ -98,6 +97,9 @@ export class PanelPart extends CompositePart<Panel> implements IPanelService {
 			}
 		});
 		this.toUnbind.push(this.compositeBar);
+		for (const panel of this.getPanels()) {
+			this.compositeBar.addComposite(panel, false);
+		}
 
 		this.registerListeners();
 	}