Fix microsoft#88814

sandy081 · sandy081 · commit f8a19b58c7c4 · 2020-01-17T14:58:56.000+01:00
diff --git a/src/vs/workbench/browser/parts/views/views.ts b/src/vs/workbench/browser/parts/views/views.ts
@@ -845,13 +845,7 @@ export class ViewDescriptorService extends Disposable implements IViewDescriptor
 	}
 
 	getViewDescriptors(container: ViewContainer): ViewDescriptorCollection {
-		let viewDescriptorCollectionItem = this.viewDescriptorCollections.get(container);
-		if (!viewDescriptorCollectionItem) {
-			// Create and register the collection if does not exist
-			this.onDidRegisterViewContainer(container);
-			viewDescriptorCollectionItem = this.viewDescriptorCollections.get(container);
-		}
-		return viewDescriptorCollectionItem!.viewDescriptorCollection;
+		return this.getOrRegisterViewDescriptorCollection(container);
 	}
 
 	moveViews(views: IViewDescriptor[], viewContainer: ViewContainer): void {
@@ -942,18 +936,28 @@ export class ViewDescriptorService extends Disposable implements IViewDescriptor
 	}
 
 	private onDidRegisterViewContainer(viewContainer: ViewContainer): void {
-		const disposables = new DisposableStore();
-		const viewDescriptorCollection = disposables.add(new ViewDescriptorCollection(this.contextKeyService));
+		this.getOrRegisterViewDescriptorCollection(viewContainer);
+	}
 
-		this.onDidChangeActiveViews({ added: viewDescriptorCollection.activeViewDescriptors, removed: [] });
-		viewDescriptorCollection.onDidChangeActiveViews(changed => this.onDidChangeActiveViews(changed), this, disposables);
+	private getOrRegisterViewDescriptorCollection(viewContainer: ViewContainer): ViewDescriptorCollection {
+		let viewDescriptorCollection = this.viewDescriptorCollections.get(viewContainer)?.viewDescriptorCollection;
+
+		if (!viewDescriptorCollection) {
+			const disposables = new DisposableStore();
+			viewDescriptorCollection = disposables.add(new ViewDescriptorCollection(this.contextKeyService));
 
-		this.viewDescriptorCollections.set(viewContainer, { viewDescriptorCollection, disposable: disposables });
+			this.onDidChangeActiveViews({ added: viewDescriptorCollection.activeViewDescriptors, removed: [] });
+			viewDescriptorCollection.onDidChangeActiveViews(changed => this.onDidChangeActiveViews(changed), this, disposables);
 
-		const viewsToRegister = this.getViewsByContainer(viewContainer);
-		if (viewsToRegister.length) {
-			this.addViews(viewContainer, viewsToRegister);
+			this.viewDescriptorCollections.set(viewContainer, { viewDescriptorCollection, disposable: disposables });
+
+			const viewsToRegister = this.getViewsByContainer(viewContainer);
+			if (viewsToRegister.length) {
+				this.addViews(viewContainer, viewsToRegister);
+			}
 		}
+
+		return viewDescriptorCollection;
 	}
 
 	private onDidDeregisterViewContainer(viewContainer: ViewContainer): void {
