Merge pull request microsoft#253368 from microsoft/dbaeumer/glad-guineafowl-lime

Fixes 251268: Errors from task with same owner as extension don't propagate to the EH

Author: dbaeumer

src/vs/monaco.d.ts

@@ -1471,6 +1471,7 @@ declare namespace monaco.editor {
 		modelVersionId?: number;
 		relatedInformation?: IRelatedInformation[];
 		tags?: MarkerTag[];
+		origin?: string | undefined;
 	}
 
 	/**
@@ -1491,6 +1492,7 @@ declare namespace monaco.editor {
 		modelVersionId?: number;
 		relatedInformation?: IRelatedInformation[];
 		tags?: MarkerTag[];
+		origin?: string | undefined;
 	}
 
 	/**

src/vs/platform/markers/common/markerService.ts

@@ -232,7 +232,7 @@ export class MarkerService implements IMarkerService {
 			message, source,
 			startLineNumber, startColumn, endLineNumber, endColumn,
 			relatedInformation,
-			tags,
+			tags, origin
 		} = data;
 
 		if (!message) {
@@ -258,6 +258,7 @@ export class MarkerService implements IMarkerService {
 			endColumn,
 			relatedInformation,
 			tags,
+			origin
 		};
 	}
 

src/vs/platform/markers/common/markers.ts

@@ -118,6 +118,7 @@ export interface IMarkerData {
 	modelVersionId?: number;
 	relatedInformation?: IRelatedInformation[];
 	tags?: MarkerTag[];
+	origin?: string | undefined;
 }
 
 export interface IResourceMarker {
@@ -139,6 +140,7 @@ export interface IMarker {
 	modelVersionId?: number;
 	relatedInformation?: IRelatedInformation[];
 	tags?: MarkerTag[];
+	origin?: string | undefined;
 }
 
 export interface MarkerStatistics {

src/vs/workbench/api/browser/mainThreadDiagnostics.ts

@@ -3,12 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IMarkerService, IMarkerData } from '../../../platform/markers/common/markers.js';
+import { IMarkerService, IMarkerData, type IMarker } from '../../../platform/markers/common/markers.js';
 import { URI, UriComponents } from '../../../base/common/uri.js';
 import { MainThreadDiagnosticsShape, MainContext, ExtHostDiagnosticsShape, ExtHostContext } from '../common/extHost.protocol.js';
 import { extHostNamedCustomer, IExtHostContext } from '../../services/extensions/common/extHostCustomers.js';
 import { IDisposable } from '../../../base/common/lifecycle.js';
 import { IUriIdentityService } from '../../../platform/uriIdentity/common/uriIdentity.js';
+import { ResourceMap } from '../../../base/common/map.js';
 
 @extHostNamedCustomer(MainContext.MainThreadDiagnostics)
 export class MainThreadDiagnostics implements MainThreadDiagnosticsShape {
@@ -18,6 +19,9 @@ export class MainThreadDiagnostics implements MainThreadDiagnosticsShape {
 	private readonly _proxy: ExtHostDiagnosticsShape;
 	private readonly _markerListener: IDisposable;
 
+	private static ExtHostCounter: number = 1;
+	private readonly extHostId: string;
+
 	constructor(
 		extHostContext: IExtHostContext,
 		@IMarkerService private readonly _markerService: IMarkerService,
@@ -26,11 +30,27 @@ export class MainThreadDiagnostics implements MainThreadDiagnosticsShape {
 		this._proxy = extHostContext.getProxy(ExtHostContext.ExtHostDiagnostics);
 
 		this._markerListener = this._markerService.onMarkerChanged(this._forwardMarkers, this);
+		this.extHostId = `extHost${MainThreadDiagnostics.ExtHostCounter++}`;
 	}
 
 	dispose(): void {
 		this._markerListener.dispose();
-		this._activeOwners.forEach(owner => this._markerService.changeAll(owner, []));
+		for (const owner of this._activeOwners) {
+			const markersData: ResourceMap<IMarker[]> = new ResourceMap<IMarker[]>();
+			for (const marker of this._markerService.read({ owner })) {
+				let data = markersData.get(marker.resource);
+				if (data === undefined) {
+					data = [];
+					markersData.set(marker.resource, data);
+				}
+				if (marker.origin !== this.extHostId) {
+					data.push(marker);
+				}
+			}
+			for (const [resource, local] of markersData.entries()) {
+				this._markerService.changeOne(owner, resource, local);
+			}
+		}
 		this._activeOwners.clear();
 	}
 
@@ -41,9 +61,9 @@ export class MainThreadDiagnostics implements MainThreadDiagnosticsShape {
 			if (allMarkerData.length === 0) {
 				data.push([resource, []]);
 			} else {
-				const forgeinMarkerData = allMarkerData.filter(marker => !this._activeOwners.has(marker.owner));
-				if (forgeinMarkerData.length > 0) {
-					data.push([resource, forgeinMarkerData]);
+				const foreignMarkerData = allMarkerData.filter(marker => marker?.origin !== this.extHostId);
+				if (foreignMarkerData.length > 0) {
+					data.push([resource, foreignMarkerData]);
 				}
 			}
 		}
@@ -65,6 +85,9 @@ export class MainThreadDiagnostics implements MainThreadDiagnosticsShape {
 					if (marker.code && typeof marker.code !== 'string') {
 						marker.code.target = URI.revive(marker.code.target);
 					}
+					if (marker.origin === undefined) {
+						marker.origin = this.extHostId;
+					}
 				}
 			}
 			this._markerService.changeOne(owner, this._uriIdentService.asCanonicalUri(URI.revive(uri)), markers);