fix double terminal

sbatten · sbatten · commit ee183be23836 · 2020-05-14T11:58:43.000-07:00
diff --git a/src/vs/workbench/services/views/browser/viewDescriptorService.ts b/src/vs/workbench/services/views/browser/viewDescriptorService.ts
@@ -156,7 +156,11 @@ export class ViewDescriptorService extends Disposable implements IViewDescriptor
 				continue;
 			}
 
-			this.addViews(viewContainer, containerData.views);
+			// Filter out views that have already been added to the view container model
+			// This is needed when statically-registered views are moved to
+			// other statically registered containers as they will both try to add on startup
+			const viewsToAdd = containerData.views.filter(view => this.getViewContainerModel(viewContainer).allViewDescriptors.filter(vd => vd.id === view.id).length === 0);
+			this.addViews(viewContainer, viewsToAdd);
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -156,7 +156,11 @@ export class ViewDescriptorService extends Disposable implements IViewDescriptor`
`156`	`156`	`continue;`
`157`	`157`	`}`
`158`	`158`
`159`		`- this.addViews(viewContainer, containerData.views);`
	`159`	`+ // Filter out views that have already been added to the view container model`
	`160`	`+ // This is needed when statically-registered views are moved to`
	`161`	`+ // other statically registered containers as they will both try to add on startup`
	`162`	`+ const viewsToAdd = containerData.views.filter(view => this.getViewContainerModel(viewContainer).allViewDescriptors.filter(vd => vd.id === view.id).length === 0);`
	`163`	`+ this.addViews(viewContainer, viewsToAdd);`
`160`	`164`	`}`
`161`	`165`	`}`
`162`	`166`