#85178 emit the right visible indices

src/vs/workbench/browser/parts/views/views.ts

@@ -432,24 +432,27 @@ export class ContributableViewsModel extends Disposable {
 		const toRemove: { index: number, viewDescriptor: IViewDescriptor; }[] = [];
 		const toAdd: { index: number, viewDescriptor: IViewDescriptor, size?: number, collapsed: boolean; }[] = [];
 
-		const previous = this._viewDescriptors;
-		this._viewDescriptors = viewDescriptors.sort(this.compareViewDescriptors.bind(this));
+		viewDescriptors = viewDescriptors.sort(this.compareViewDescriptors.bind(this));
 
-		for (let index = 0; index < previous.length; index++) {
-			const previousViewDescriptor = previous[index];
-			if (this.isViewDescriptorVisible(previousViewDescriptor) && this._viewDescriptors.every(viewDescriptor => viewDescriptor.id !== previousViewDescriptor.id)) {
-				toRemove.push({ index, viewDescriptor: previousViewDescriptor });
+		for (let index = 0; index < this._viewDescriptors.length; index++) {
+			const currentViewDescriptor = this._viewDescriptors[index];
+			if (this.isViewDescriptorVisible(currentViewDescriptor) && viewDescriptors.every(viewDescriptor => viewDescriptor.id !== currentViewDescriptor.id)) {
+				const { visibleIndex } = this.find(currentViewDescriptor.id);
+				toRemove.push({ index: visibleIndex, viewDescriptor: currentViewDescriptor });
 			}
 		}
 
-		for (let index = 0; index < this._viewDescriptors.length; index++) {
-			const viewDescriptor = this._viewDescriptors[index];
+		const previous = this._viewDescriptors;
+		this._viewDescriptors = viewDescriptors.slice(0);
+		for (let i = 0; i < this._viewDescriptors.length; i++) {
+			const viewDescriptor = this._viewDescriptors[i];
 			if (this.isViewDescriptorVisible(viewDescriptor) && previous.every(previousViewDescriptor => previousViewDescriptor.id !== viewDescriptor.id)) {
-				const state = this.viewStates.get(viewDescriptor.id)!;
-				toAdd.push({ index, viewDescriptor, size: state.size, collapsed: !!state.collapsed });
+				const { visibleIndex, state } = this.find(viewDescriptor.id);
+				toAdd.push({ index: visibleIndex, viewDescriptor, size: state.size, collapsed: !!state.collapsed });
 			}
 		}
 
+
 		if (toRemove.length) {
 			this._onDidRemove.fire(toRemove);
 		}

src/vs/workbench/test/browser/parts/views/views.test.ts

@@ -296,6 +296,52 @@ suite('ContributableViewsModel', () => {
 		assert.equal(seq.elements.length, 0);
 	});
 
+	test('view states and when contexts multiple views', async function () {
+		const viewStates = new Map<string, IViewState>();
+		viewStates.set('view1', { visibleGlobal: false, collapsed: false, visibleWorkspace: undefined });
+		const model = new ContributableViewsModel(container, viewsService, viewStates);
+		const seq = new ViewDescriptorSequence(model);
+
+		assert.equal(model.visibleViewDescriptors.length, 0);
+		assert.equal(seq.elements.length, 0);
+
+		const view1: IViewDescriptor = {
+			id: 'view1',
+			ctorDescriptor: null!,
+			name: 'Test View 1',
+			when: ContextKeyExpr.equals('showview', true)
+		};
+		const view2: IViewDescriptor = {
+			id: 'view2',
+			ctorDescriptor: null!,
+			name: 'Test View 2',
+		};
+		const view3: IViewDescriptor = {
+			id: 'view3',
+			ctorDescriptor: null!,
+			name: 'Test View 3',
+			when: ContextKeyExpr.equals('showview', true)
+		};
+
+		ViewsRegistry.registerViews([view1, view2, view3], container);
+		assert.deepEqual(model.visibleViewDescriptors, [view2], 'Only view2 should be visible');
+		assert.deepEqual(seq.elements, [view2]);
+
+		const key = contextKeyService.createKey('showview', false);
+		assert.deepEqual(model.visibleViewDescriptors, [view2], 'Only view2 should be visible');
+		assert.deepEqual(seq.elements, [view2]);
+
+		key.set(true);
+		await new Promise(c => setTimeout(c, 30));
+		assert.deepEqual(model.visibleViewDescriptors, [view2, view3], 'view3 should be visible');
+		assert.deepEqual(seq.elements, [view2, view3]);
+
+		key.set(false);
+		await new Promise(c => setTimeout(c, 30));
+		assert.deepEqual(model.visibleViewDescriptors, [view2], 'Only view2 should be visible');
+		assert.deepEqual(seq.elements, [view2]);
+	});
+
 	test('remove event is not triggered if view was hidden and removed', async function () {
 		const model = new ContributableViewsModel(container, viewsService);
 		const seq = new ViewDescriptorSequence(model);
@@ -324,4 +370,5 @@ suite('ContributableViewsModel', () => {
 		await new Promise(c => setTimeout(c, 30));
 		assert.ok(!target.called, 'remove event should not be called since it is already hidden');
 	});
+
 });