composite bar: respect order of composites when adding

fixes #44306

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

@@ -24,7 +24,7 @@ export interface ICompositeBarOptions {
 	icon: boolean;
 	storageId: string;
 	orientation: ActionsOrientation;
-	composites: { id: string, name: string }[];
+	composites: { id: string, name: string, order: number }[];
 	colors: ICompositeBarColors;
 	overflowActionSize: number;
 	getActivityAction: (compositeId: string) => ActivityAction;
@@ -81,13 +81,16 @@ export class CompositeBar implements ICompositeBar {
 		return this._onDidContextMenu.event;
 	}
 
-	public addComposite(compositeData: { id: string; name: string }): void {
+	public addComposite(compositeData: { id: string; name: string, order: number }): void {
 		if (this.options.composites.filter(c => c.id === compositeData.id).length) {
 			return;
 		}
-
+		let i = 0;
+		while (i < this.options.composites.length && this.options.composites[i].order < compositeData.order) {
+			i++;
+		}
 		this.options.composites.push(compositeData);
-		this.pin(compositeData.id);
+		this.pin(compositeData.id, true, i);
 	}
 
 	public removeComposite(id: string): void {
@@ -431,13 +434,13 @@ export class CompositeBar implements ICompositeBar {
 		return this.pinnedComposites.indexOf(compositeId) >= 0;
 	}
 
-	public pin(compositeId: string, update = true): void {
+	public pin(compositeId: string, update = true, index = this.pinnedComposites.length): void {
 		if (this.isPinned(compositeId)) {
 			return;
 		}
 
 		this.options.openComposite(compositeId).then(() => {
-			this.pinnedComposites.push(compositeId);
+			this.pinnedComposites.splice(index, 0, compositeId);
 			this.pinnedComposites = arrays.distinct(this.pinnedComposites);
 
 			if (update) {

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

@@ -12,7 +12,7 @@ import { Registry } from 'vs/platform/registry/common/platform';
 import { ActionsOrientation } from 'vs/base/browser/ui/actionbar/actionbar';
 import { IPanel } from 'vs/workbench/common/panel';
 import { CompositePart, ICompositeTitleLabel } from 'vs/workbench/browser/parts/compositePart';
-import { Panel, PanelRegistry, Extensions as PanelExtensions } from 'vs/workbench/browser/panel';
+import { Panel, PanelRegistry, Extensions as PanelExtensions, PanelDescriptor } from 'vs/workbench/browser/panel';
 import { IPanelService, IPanelIdentifier } from 'vs/workbench/services/panel/common/panelService';
 import { IPartService, Parts, Position } from 'vs/workbench/services/part/common/partService';
 import { IStorageService } from 'vs/platform/storage/common/storage';
@@ -169,7 +169,7 @@ export class PanelPart extends CompositePart<Panel> implements IPanelService {
 		});
 	}
 
-	public getPanels(): IPanelIdentifier[] {
+	public getPanels(): PanelDescriptor[] {
 		return Registry.as<PanelRegistry>(PanelExtensions.Panels).getPanels()
 			.filter(p => p.enabled)
 			.sort((v1, v2) => v1.order - v2.order);