onMarkerChanged firing with immutable array

mjbvz · mjbvz · commit 13574e60d834 · 2019-09-25T18:05:46.000-07:00
diff --git a/src/vs/editor/common/services/markerDecorationsServiceImpl.ts b/src/vs/editor/common/services/markerDecorationsServiceImpl.ts
@@ -95,7 +95,7 @@ export class MarkerDecorationsService extends Disposable implements IMarkerDecor
 		return markerDecorations ? markerDecorations.getMarkers() : [];
 	}
 
-	private _handleMarkerChange(changedResources: URI[]): void {
+	private _handleMarkerChange(changedResources: readonly URI[]): void {
 		changedResources.forEach((resource) => {
 			const markerDecorations = this._markerDecorations.get(MODEL_ID(resource));
 			if (markerDecorations) {
diff --git a/src/vs/platform/markers/common/markerService.ts b/src/vs/platform/markers/common/markerService.ts
@@ -123,8 +123,8 @@ export class MarkerService implements IMarkerService {
 
 	_serviceBrand: undefined;
 
-	private readonly _onMarkerChanged = new Emitter<URI[]>();
-	private _onMarkerChangedEvent: Event<URI[]> = Event.debounce(this._onMarkerChanged.event, MarkerService._debouncer, 0);
+	private readonly _onMarkerChanged = new Emitter<readonly URI[]>();
+	private _onMarkerChangedEvent: Event<readonly URI[]> = Event.debounce(this._onMarkerChanged.event, MarkerService._debouncer, 0);
 	private _byResource: MapMap<IMarker[]> = Object.create(null);
 	private _byOwner: MapMap<IMarker[]> = Object.create(null);
 	private _stats: MarkerStats;
@@ -137,7 +137,7 @@ export class MarkerService implements IMarkerService {
 		this._stats.dispose();
 	}
 
-	get onMarkerChanged(): Event<URI[]> {
+	get onMarkerChanged(): Event<readonly URI[]> {
 		return this._onMarkerChangedEvent;
 	}
 
diff --git a/src/vs/platform/markers/common/markers.ts b/src/vs/platform/markers/common/markers.ts
@@ -22,7 +22,7 @@ export interface IMarkerService {
 
 	read(filter?: { owner?: string; resource?: URI; severities?: number, take?: number; }): IMarker[];
 
-	onMarkerChanged: Event<URI[]>;
+	readonly onMarkerChanged: Event<readonly URI[]>;
 }
 
 /**
diff --git a/src/vs/workbench/contrib/markers/browser/markers.ts b/src/vs/workbench/contrib/markers/browser/markers.ts
@@ -41,7 +41,7 @@ export class MarkersWorkbenchService extends Disposable implements IMarkersWorkb
 		this.markersModel = this._register(instantiationService.createInstance(MarkersModel, this.readMarkers()));
 
 		this.markersModel.setResourceMarkers(groupBy(this.readMarkers(), compareMarkersByUri).map(group => [group[0].resource, group]));
-		this._register(Event.debounce<URI[], ResourceMap<URI>>(markerService.onMarkerChanged, (resourcesMap, resources) => {
+		this._register(Event.debounce<readonly URI[], ResourceMap<URI>>(markerService.onMarkerChanged, (resourcesMap, resources) => {
 			resourcesMap = resourcesMap ? resourcesMap : new ResourceMap<URI>();
 			resources.forEach(resource => resourcesMap!.set(resource, resource));
 			return resourcesMap;
diff --git a/src/vs/workbench/contrib/markers/browser/markersFileDecorations.ts b/src/vs/workbench/contrib/markers/browser/markersFileDecorations.ts
@@ -19,7 +19,7 @@ import { LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
 class MarkersDecorationsProvider implements IDecorationsProvider {
 
 	readonly label: string = localize('label', "Problems");
-	readonly onDidChange: Event<URI[]>;
+	readonly onDidChange: Event<readonly URI[]>;
 
 	constructor(
 		private readonly _markerService: IMarkerService
diff --git a/src/vs/workbench/services/decorations/browser/decorations.ts b/src/vs/workbench/services/decorations/browser/decorations.ts
@@ -28,7 +28,7 @@ export interface IDecoration {
 
 export interface IDecorationsProvider {
 	readonly label: string;
-	readonly onDidChange: Event<URI[]>;
+	readonly onDidChange: Event<readonly URI[]>;
 	provideDecorations(uri: URI, token: CancellationToken): IDecorationData | Promise<IDecorationData | undefined> | undefined;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ export class MarkerDecorationsService extends Disposable implements IMarkerDecor`
`95`	`95`	`return markerDecorations ? markerDecorations.getMarkers() : [];`
`96`	`96`	`}`
`97`	`97`
`98`		`- private _handleMarkerChange(changedResources: URI[]): void {`
	`98`	`+ private _handleMarkerChange(changedResources: readonly URI[]): void {`
`99`	`99`	`changedResources.forEach((resource) => {`
`100`	`100`	`const markerDecorations = this._markerDecorations.get(MODEL_ID(resource));`
`101`	`101`	`if (markerDecorations) {`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ export interface IMarkerService {`
`22`	`22`
`23`	`23`	`read(filter?: { owner?: string; resource?: URI; severities?: number, take?: number; }): IMarker[];`
`24`	`24`
`25`		`- onMarkerChanged: Event<URI[]>;`
	`25`	`+ readonly onMarkerChanged: Event<readonly URI[]>;`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ export interface IDecoration {`
`28`	`28`
`29`	`29`	`export interface IDecorationsProvider {`
`30`	`30`	`readonly label: string;`
`31`		`- readonly onDidChange: Event<URI[]>;`
	`31`	`+ readonly onDidChange: Event<readonly URI[]>;`
`32`	`32`	`provideDecorations(uri: URI, token: CancellationToken): IDecorationData \| Promise<IDecorationData \| undefined> \| undefined;`
`33`	`33`	`}`
`34`	`34`