fix microsoft/vscode#136955

benoitf · Nov 11, 2021 · bf523f8 · bf523f8
1 parent cfebd1d
commit bf523f8
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/src/vs/workbench/api/browser/mainThreadDiagnostics.ts b/src/vs/workbench/api/browser/mainThreadDiagnostics.ts
@@ -37,9 +37,14 @@ export class MainThreadDiagnostics implements MainThreadDiagnosticsShape {
 	private _forwardMarkers(resources: readonly URI[]): void {
 		const data: [UriComponents, IMarkerData[]][] = [];
 		for (const resource of resources) {
-			const markerData = this._markerService.read({ resource }).filter(marker => !this._activeOwners.has(marker.owner));
-			if (markerData.length > 0) {
-				data.push([resource, markerData]);
+			const allMarkerData = this._markerService.read({ resource });
+			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]);
+				}
 			}
 		}
 		if (data.length > 0) {

diff --git a/src/vs/workbench/test/browser/api/mainThreadDiagnostics.test.ts b/src/vs/workbench/test/browser/api/mainThreadDiagnostics.test.ts
@@ -107,11 +107,12 @@ suite('MainThreadDiagnostics', function () {
 			await timeout(0);
 			assert.strictEqual(markerService.read().length, 2);
 			assert.strictEqual(changedData.length, 1);
+			assert.strictEqual(changedData[0].length, 1);
 			assert.strictEqual(changedData[0][0][1][0].message, 'forgein_owner');
 		});
 	});
 
-	test.skip('onDidChangeDiagnostics different behavior when "extensionKind" ui running on remote workspace #136955', function () {
+	test('onDidChangeDiagnostics different behavior when "extensionKind" ui running on remote workspace #136955', function () {
 		return runWithFakedTimers({}, async () => {
 
 			const markerData: IMarkerData = {
@@ -150,14 +151,9 @@ suite('MainThreadDiagnostics', function () {
 				}
 			);
 
-
 			diag.$clear('bar');
-
-			// added one marker via the API and one via the ext host. the latter must not
-			// trigger an event to the extension host
-
 			await timeout(0);
-			assert.strictEqual(markerService.read().length, 1);
+			assert.strictEqual(markerService.read().length, 0);
 			assert.strictEqual(changedData.length, 1);
 		});
 	});