From f630d58220579fd359cc308d5d5e69baa43dea05 Mon Sep 17 00:00:00 2001 From: Sandeep Somavarapu Date: Thu, 6 Jul 2017 16:46:14 +0200 Subject: [PATCH] #30120 Sort always by default order --- src/vs/workbench/parts/views/browser/views.ts | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/src/vs/workbench/parts/views/browser/views.ts b/src/vs/workbench/parts/views/browser/views.ts index 4bfc9f235a1..dcf51da901f 100644 --- a/src/vs/workbench/parts/views/browser/views.ts +++ b/src/vs/workbench/parts/views/browser/views.ts @@ -653,16 +653,13 @@ export class ComposedViewsViewlet extends Viewlet { return this.getViewDescriptorsFromRegistry().filter(viewDescriptor => viewDescriptor.canToggleVisibility); } - private getViewDescriptorsFromRegistry(): IViewDescriptor[] { + private getViewDescriptorsFromRegistry(defaultOrder: boolean = true): IViewDescriptor[] { return ViewsRegistry.getViews(this.location) .sort((a, b) => { - // const viewStateA = this.viewsStates.get(a.id); - // const viewStateB = this.viewsStates.get(b.id); - // const orderA = viewStateA ? viewStateA.order : a.order; - // const orderB = viewStateB ? viewStateB.order : b.order; - - const orderA = a.order; - const orderB = b.order; + const viewStateA = this.viewsStates.get(a.id); + const viewStateB = this.viewsStates.get(b.id); + const orderA = !defaultOrder && viewStateA ? viewStateA.order : a.order; + const orderB = !defaultOrder && viewStateB ? viewStateB.order : b.order; if (orderB === void 0 || orderB === null) { return -1; -- GitLab