Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-07-13 15:35:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

limit view ids globally

Browse Source
This commit is contained in:
SteVen Batten
2020-02-18 10:00:07 -08:00
parent abe68eb7a1
commit c303fc0ab2
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/workbench/api/browser/viewsExtensionPoint.ts
+3 -4
View File
@@ -375,16 +375,15 @@ class ViewsExtensionHandler implements IWorkbenchContribution {
collector.warn(localize('ViewContainerDoesnotExist', "View container '{0}' does not exist and all views registered to it will be added to 'Explorer'.", entry.key));
}
const container = viewContainer || this.getDefaultViewContainer();
const registeredViews = this.viewsRegistry.getViews(container);
const viewIds: string[] = [];
const viewDescriptors = coalesce(entry.value.map((item, index) => {
// validate
if (viewIds.indexOf(item.id) !== -1) {
collector.error(localize('duplicateView1', "Cannot register multiple views with same id `{0}` in the view container `{1}`", item.id, container.id));
collector.error(localize('duplicateView1', "Cannot register multiple views with same id `{0}`", item.id));
return null;
}
if (registeredViews.some(v => v.id === item.id)) {
collector.error(localize('duplicateView2', "A view with id `{0}` is already registered in the view container `{1}`", item.id, container.id));
if (this.viewsRegistry.getView(item.id) !== null) {
collector.error(localize('duplicateView2', "A view with id `{0}` is already registered.", item.id));
return null;
}
src/vs/workbench/common/views.ts
+2 -2
View File
@@ -336,8 +336,8 @@ class ViewsRegistry extends Disposable implements IViewsRegistry {
this._viewContainers.push(viewContainer);
}
for (const viewDescriptor of viewDescriptors) {
if (views.some(v => v.id === viewDescriptor.id)) {
throw new Error(localize('duplicateId', "A view with id '{0}' is already registered in the container '{1}'", viewDescriptor.id, viewContainer.id));
if (this.getView(viewDescriptor.id) !== null) {
throw new Error(localize('duplicateId', "A view with id '{0}' is already registered", viewDescriptor.id));
}
views.push(viewDescriptor);
}