onDidChangeMarker-event have no marker before or after, microsoft#96914

jrieken · jrieken · commit d2c6b2cd073e · 2020-05-05T16:35:57.000+02:00
diff --git a/src/vs/editor/common/services/markerDecorationsServiceImpl.ts b/src/vs/editor/common/services/markerDecorationsServiceImpl.ts
@@ -41,13 +41,14 @@ class MarkerDecorations extends Disposable {
 		return super._register(t);
 	}
 
-	public update(markers: IMarker[], newDecorations: IModelDeltaDecoration[]): void {
+	public update(markers: IMarker[], newDecorations: IModelDeltaDecoration[]): boolean {
 		const oldIds = keys(this._markersData);
 		this._markersData.clear();
 		const ids = this.model.deltaDecorations(oldIds, newDecorations);
 		for (let index = 0; index < ids.length; index++) {
 			this._markersData.set(ids[index], markers[index]);
 		}
+		return oldIds.length !== 0 || ids.length !== 0;
 	}
 
 	getMarker(decoration: IModelDecoration): IMarker | undefined {
@@ -144,8 +145,9 @@ export class MarkerDecorationsService extends Disposable implements IMarkerDecor
 				options: this._createDecorationOption(marker)
 			};
 		});
-		markerDecorations.update(markers, newModelDecorations);
-		this._onDidChangeMarker.fire(markerDecorations.model);
+		if (markerDecorations.update(markers, newModelDecorations)) {
+			this._onDidChangeMarker.fire(markerDecorations.model);
+		}
 	}
 
 	private _createDecorationRange(model: ITextModel, rawMarker: IMarker): Range {

Original file line number	Diff line number	Diff line change
`@@ -41,13 +41,14 @@ class MarkerDecorations extends Disposable {`
`41`	`41`	`return super._register(t);`
`42`	`42`	`}`
`43`	`43`
`44`		`- public update(markers: IMarker[], newDecorations: IModelDeltaDecoration[]): void {`
	`44`	`+ public update(markers: IMarker[], newDecorations: IModelDeltaDecoration[]): boolean {`
`45`	`45`	`const oldIds = keys(this._markersData);`
`46`	`46`	`this._markersData.clear();`
`47`	`47`	`const ids = this.model.deltaDecorations(oldIds, newDecorations);`
`48`	`48`	`for (let index = 0; index < ids.length; index++) {`
`49`	`49`	`this._markersData.set(ids[index], markers[index]);`
`50`	`50`	`}`
	`51`	`+ return oldIds.length !== 0 \|\| ids.length !== 0;`
`51`	`52`	`}`
`52`	`53`
`53`	`54`	`getMarker(decoration: IModelDecoration): IMarker \| undefined {`
`@@ -144,8 +145,9 @@ export class MarkerDecorationsService extends Disposable implements IMarkerDecor`
`144`	`145`	`options: this._createDecorationOption(marker)`
`145`	`146`	`};`
`146`	`147`	`});`
`147`		`- markerDecorations.update(markers, newModelDecorations);`
`148`		`- this._onDidChangeMarker.fire(markerDecorations.model);`
	`148`	`+ if (markerDecorations.update(markers, newModelDecorations)) {`
	`149`	`+ this._onDidChangeMarker.fire(markerDecorations.model);`
	`150`	`+ }`
`149`	`151`	`}`
`150`	`152`
`151`	`153`	`private _createDecorationRange(model: ITextModel, rawMarker: IMarker): Range {`