fix microsoft#199947 (microsoft#202654)

Author: sandy081

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

@@ -13,7 +13,7 @@ import { IAction } from 'vs/base/common/actions';
 import { RunOnceScheduler } from 'vs/base/common/async';
 import { Emitter, Event } from 'vs/base/common/event';
 import { KeyChord, KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { combinedDisposable, DisposableStore, dispose, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
+import { combinedDisposable, DisposableStore, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
 import { assertIsDefined } from 'vs/base/common/types';
 import 'vs/css!./media/paneviewlet';
 import * as nls from 'vs/nls';
@@ -324,7 +324,6 @@ export class ViewPaneContainer extends Component implements IViewPaneContainer {
 	private readonly visibleViewsCountFromCache: number | undefined;
 	private readonly visibleViewsStorageId: string;
 	protected readonly viewContainerModel: IViewContainerModel;
-	private viewDisposables: IDisposable[] = [];
 
 	private readonly _onTitleAreaUpdate: Emitter<void> = this._register(new Emitter<void>());
 	readonly onTitleAreaUpdate: Event<void> = this._onTitleAreaUpdate.event;
@@ -394,7 +393,6 @@ export class ViewPaneContainer extends Component implements IViewPaneContainer {
 		this.viewContainer = container;
 		this.visibleViewsStorageId = `${id}.numberOfVisibleViews`;
 		this.visibleViewsCountFromCache = this.storageService.getNumber(this.visibleViewsStorageId, StorageScope.WORKSPACE, undefined);
-		this._register(toDisposable(() => this.viewDisposables = dispose(this.viewDisposables)));
 		this.viewContainerModel = this.viewDescriptorService.getViewContainerModel(container);
 	}
 
@@ -657,11 +655,11 @@ export class ViewPaneContainer extends Component implements IViewPaneContainer {
 		return optimalWidth + additionalMargin;
 	}
 
-	addPanes(panes: { pane: ViewPane; size: number; index?: number }[]): void {
+	addPanes(panes: { pane: ViewPane; size: number; index?: number; disposable: IDisposable }[]): void {
 		const wasMerged = this.isViewMergedWithContainer();
 
-		for (const { pane: pane, size, index } of panes) {
-			this.addPane(pane, size, index);
+		for (const { pane: pane, size, index, disposable } of panes) {
+			this.addPane(pane, size, disposable, index);
 		}
 
 		this.updateViewHeaders();
@@ -773,7 +771,7 @@ export class ViewPaneContainer extends Component implements IViewPaneContainer {
 	}
 
 	protected onDidAddViewDescriptors(added: IAddedViewDescriptorRef[]): ViewPane[] {
-		const panesToAdd: { pane: ViewPane; size: number; index: number }[] = [];
+		const panesToAdd: { pane: ViewPane; size: number; index: number; disposable: IDisposable }[] = [];
 
 		for (const { viewDescriptor, collapsed, index, size } of added) {
 			const pane = this.createView(viewDescriptor,
@@ -795,8 +793,7 @@ export class ViewPaneContainer extends Component implements IViewPaneContainer {
 				this.viewContainerModel.setCollapsed(viewDescriptor.id, collapsed);
 			});
 
-			this.viewDisposables.splice(index, 0, combinedDisposable(contextMenuDisposable, collapseDisposable));
-			panesToAdd.push({ pane, size: size || pane.minimumSize, index });
+			panesToAdd.push({ pane, size: size || pane.minimumSize, index, disposable: combinedDisposable(contextMenuDisposable, collapseDisposable) });
 		}
 
 		this.addPanes(panesToAdd);
@@ -814,14 +811,18 @@ export class ViewPaneContainer extends Component implements IViewPaneContainer {
 		removed = removed.sort((a, b) => b.index - a.index);
 		const panesToRemove: ViewPane[] = [];
 		for (const { index } of removed) {
-			const [disposable] = this.viewDisposables.splice(index, 1);
-			disposable.dispose();
-			panesToRemove.push(this.panes[index]);
+			const paneItem = this.paneItems[index];
+			if (paneItem) {
+				panesToRemove.push(this.paneItems[index].pane);
+			}
 		}
-		this.removePanes(panesToRemove);
 
-		for (const pane of panesToRemove) {
-			pane.setVisible(false);
+		if (panesToRemove.length) {
+			this.removePanes(panesToRemove);
+
+			for (const pane of panesToRemove) {
+				pane.setVisible(false);
+			}
 		}
 	}
 
@@ -833,7 +834,7 @@ export class ViewPaneContainer extends Component implements IViewPaneContainer {
 		}
 	}
 
-	private addPane(pane: ViewPane, size: number, index = this.paneItems.length - 1): void {
+	private addPane(pane: ViewPane, size: number, disposable: IDisposable, index = this.paneItems.length - 1): void {
 		const onDidFocus = pane.onDidFocus(() => {
 			this._onDidFocusView.fire(pane);
 			this.lastFocusedPane = pane;
@@ -862,6 +863,7 @@ export class ViewPaneContainer extends Component implements IViewPaneContainer {
 		});
 
 		const store = new DisposableStore();
+		store.add(disposable);
 		store.add(combinedDisposable(pane, onDidFocus, onDidBlur, onDidChangeTitleArea, onDidChange, onDidChangeVisibility));
 		const paneItem: IViewPaneItem = { pane, disposable: store };
 

src/vs/workbench/contrib/debug/browser/debugViewlet.ts

@@ -133,7 +133,7 @@ export class DebugViewPaneContainer extends ViewPaneContainer {
 		}
 	}
 
-	override addPanes(panes: { pane: ViewPane; size: number; index?: number }[]): void {
+	override addPanes(panes: { pane: ViewPane; size: number; index?: number; disposable: IDisposable }[]): void {
 		super.addPanes(panes);
 
 		for (const { pane: pane } of panes) {