Marking arrays readonly in ExtensionPointUserDelta

mjbvz · mjbvz · commit 70dc55955d58 · 2019-08-16T15:12:27.000-07:00
diff --git a/src/vs/workbench/api/browser/viewsExtensionPoint.ts b/src/vs/workbench/api/browser/viewsExtensionPoint.ts
@@ -210,7 +210,7 @@ class ViewsExtensionHandler implements IWorkbenchContribution {
 		});
 	}
 
-	private addCustomViewContainers(extensionPoints: IExtensionPointUser<ViewContainerExtensionPointType>[], existingViewContainers: ViewContainer[]): void {
+	private addCustomViewContainers(extensionPoints: readonly IExtensionPointUser<ViewContainerExtensionPointType>[], existingViewContainers: ViewContainer[]): void {
 		const viewContainersRegistry = Registry.as<IViewContainersRegistry>(ViewContainerExtensions.ViewContainersRegistry);
 		let order = TEST_VIEW_CONTAINER_ORDER + viewContainersRegistry.all.filter(v => !!v.extensionId).length + 1;
 		for (let { value, collector, description } of extensionPoints) {
@@ -227,7 +227,7 @@ class ViewsExtensionHandler implements IWorkbenchContribution {
 		}
 	}
 
-	private removeCustomViewContainers(extensionPoints: IExtensionPointUser<ViewContainerExtensionPointType>[]): void {
+	private removeCustomViewContainers(extensionPoints: readonly IExtensionPointUser<ViewContainerExtensionPointType>[]): void {
 		const viewContainersRegistry = Registry.as<IViewContainersRegistry>(ViewContainerExtensions.ViewContainersRegistry);
 		const removedExtensions: Set<string> = extensionPoints.reduce((result, e) => { result.add(ExtensionIdentifier.toKey(e.description.identifier)); return result; }, new Set<string>());
 		for (const viewContainer of viewContainersRegistry.all) {
@@ -378,7 +378,7 @@ class ViewsExtensionHandler implements IWorkbenchContribution {
 		});
 	}
 
-	private addViews(extensions: IExtensionPointUser<ViewExtensionPointType>[]): void {
+	private addViews(extensions: readonly IExtensionPointUser<ViewExtensionPointType>[]): void {
 		for (const extension of extensions) {
 			const { value, collector } = extension;
 
@@ -442,7 +442,7 @@ class ViewsExtensionHandler implements IWorkbenchContribution {
 		return this.viewContainersRegistry.get(EXPLORER)!;
 	}
 
-	private removeViews(extensions: IExtensionPointUser<ViewExtensionPointType>[]): void {
+	private removeViews(extensions: readonly IExtensionPointUser<ViewExtensionPointType>[]): void {
 		const removedExtensions: Set<string> = extensions.reduce((result, e) => { result.add(ExtensionIdentifier.toKey(e.description.identifier)); return result; }, new Set<string>());
 		for (const viewContainer of this.viewContainersRegistry.all) {
 			const removedViews = this.viewsRegistry.getViews(viewContainer).filter((v: ICustomViewDescriptor) => v.extensionId && removedExtensions.has(ExtensionIdentifier.toKey(v.extensionId)));
diff --git a/src/vs/workbench/services/extensions/common/extensionsRegistry.ts b/src/vs/workbench/services/extensions/common/extensionsRegistry.ts
@@ -71,15 +71,15 @@ export interface IExtensionPoint<T> {
 
 export class ExtensionPointUserDelta<T> {
 
-	private static _toSet<T>(arr: IExtensionPointUser<T>[]): Set<string> {
+	private static _toSet<T>(arr: readonly IExtensionPointUser<T>[]): Set<string> {
 		const result = new Set<string>();
 		for (let i = 0, len = arr.length; i < len; i++) {
 			result.add(ExtensionIdentifier.toKey(arr[i].description.identifier));
 		}
 		return result;
 	}
 
-	public static compute<T>(previous: IExtensionPointUser<T>[] | null, current: IExtensionPointUser<T>[]): ExtensionPointUserDelta<T> {
+	public static compute<T>(previous: readonly IExtensionPointUser<T>[] | null, current: readonly IExtensionPointUser<T>[]): ExtensionPointUserDelta<T> {
 		if (!previous || !previous.length) {
 			return new ExtensionPointUserDelta<T>(current, []);
 		}
@@ -97,8 +97,8 @@ export class ExtensionPointUserDelta<T> {
 	}
 
 	constructor(
-		public readonly added: IExtensionPointUser<T>[],
-		public readonly removed: IExtensionPointUser<T>[],
+		public readonly added: readonly IExtensionPointUser<T>[],
+		public readonly removed: readonly IExtensionPointUser<T>[],
 	) { }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -210,7 +210,7 @@ class ViewsExtensionHandler implements IWorkbenchContribution {`
`210`	`210`	`});`
`211`	`211`	`}`
`212`	`212`
`213`		`- private addCustomViewContainers(extensionPoints: IExtensionPointUser<ViewContainerExtensionPointType>[], existingViewContainers: ViewContainer[]): void {`
	`213`	`+ private addCustomViewContainers(extensionPoints: readonly IExtensionPointUser<ViewContainerExtensionPointType>[], existingViewContainers: ViewContainer[]): void {`
`214`	`214`	`const viewContainersRegistry = Registry.as<IViewContainersRegistry>(ViewContainerExtensions.ViewContainersRegistry);`
`215`	`215`	`let order = TEST_VIEW_CONTAINER_ORDER + viewContainersRegistry.all.filter(v => !!v.extensionId).length + 1;`
`216`	`216`	`for (let { value, collector, description } of extensionPoints) {`
`@@ -227,7 +227,7 @@ class ViewsExtensionHandler implements IWorkbenchContribution {`
`227`	`227`	`}`
`228`	`228`	`}`
`229`	`229`
`230`		`- private removeCustomViewContainers(extensionPoints: IExtensionPointUser<ViewContainerExtensionPointType>[]): void {`
	`230`	`+ private removeCustomViewContainers(extensionPoints: readonly IExtensionPointUser<ViewContainerExtensionPointType>[]): void {`
`231`	`231`	`const viewContainersRegistry = Registry.as<IViewContainersRegistry>(ViewContainerExtensions.ViewContainersRegistry);`
`232`	`232`	`const removedExtensions: Set<string> = extensionPoints.reduce((result, e) => { result.add(ExtensionIdentifier.toKey(e.description.identifier)); return result; }, new Set<string>());`
`233`	`233`	`for (const viewContainer of viewContainersRegistry.all) {`
`@@ -378,7 +378,7 @@ class ViewsExtensionHandler implements IWorkbenchContribution {`
`378`	`378`	`});`
`379`	`379`	`}`
`380`	`380`
`381`		`- private addViews(extensions: IExtensionPointUser<ViewExtensionPointType>[]): void {`
	`381`	`+ private addViews(extensions: readonly IExtensionPointUser<ViewExtensionPointType>[]): void {`
`382`	`382`	`for (const extension of extensions) {`
`383`	`383`	`const { value, collector } = extension;`
`384`	`384`
`@@ -442,7 +442,7 @@ class ViewsExtensionHandler implements IWorkbenchContribution {`
`442`	`442`	`return this.viewContainersRegistry.get(EXPLORER)!;`
`443`	`443`	`}`
`444`	`444`
`445`		`- private removeViews(extensions: IExtensionPointUser<ViewExtensionPointType>[]): void {`
	`445`	`+ private removeViews(extensions: readonly IExtensionPointUser<ViewExtensionPointType>[]): void {`
`446`	`446`	`const removedExtensions: Set<string> = extensions.reduce((result, e) => { result.add(ExtensionIdentifier.toKey(e.description.identifier)); return result; }, new Set<string>());`
`447`	`447`	`for (const viewContainer of this.viewContainersRegistry.all) {`
`448`	`448`	`const removedViews = this.viewsRegistry.getViews(viewContainer).filter((v: ICustomViewDescriptor) => v.extensionId && removedExtensions.has(ExtensionIdentifier.toKey(v.extensionId)));`
Original file line number	Diff line number	Diff line change
`@@ -71,15 +71,15 @@ export interface IExtensionPoint<T> {`
`71`	`71`
`72`	`72`	`export class ExtensionPointUserDelta<T> {`
`73`	`73`
`74`		`- private static _toSet<T>(arr: IExtensionPointUser<T>[]): Set<string> {`
	`74`	`+ private static _toSet<T>(arr: readonly IExtensionPointUser<T>[]): Set<string> {`
`75`	`75`	`const result = new Set<string>();`
`76`	`76`	`for (let i = 0, len = arr.length; i < len; i++) {`
`77`	`77`	`result.add(ExtensionIdentifier.toKey(arr[i].description.identifier));`
`78`	`78`	`}`
`79`	`79`	`return result;`
`80`	`80`	`}`
`81`	`81`
`82`		`- public static compute<T>(previous: IExtensionPointUser<T>[] \| null, current: IExtensionPointUser<T>[]): ExtensionPointUserDelta<T> {`
	`82`	`+ public static compute<T>(previous: readonly IExtensionPointUser<T>[] \| null, current: readonly IExtensionPointUser<T>[]): ExtensionPointUserDelta<T> {`
`83`	`83`	`if (!previous \|\| !previous.length) {`
`84`	`84`	`return new ExtensionPointUserDelta<T>(current, []);`
`85`	`85`	`}`
`@@ -97,8 +97,8 @@ export class ExtensionPointUserDelta<T> {`
`97`	`97`	`}`
`98`	`98`
`99`	`99`	`constructor(`
`100`		`- public readonly added: IExtensionPointUser<T>[],`
`101`		`- public readonly removed: IExtensionPointUser<T>[],`
	`100`	`+ public readonly added: readonly IExtensionPointUser<T>[],`
	`101`	`+ public readonly removed: readonly IExtensionPointUser<T>[],`
`102`	`102`	`) { }`
`103`	`103`	`}`
`104`	`104`