Skip to content

Commit b0d8e1a

Browse files
authored
Marker service handling of unsupported schemas (microsoft#158176)
1 parent c3470b5 commit b0d8e1a

File tree

3 files changed

+11
-4
lines changed

3 files changed

+11
-4
lines changed

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ import { Schemas } from 'vs/base/common/network';
1212
import { URI } from 'vs/base/common/uri';
1313
import { IMarker, IMarkerData, IMarkerService, IResourceMarker, MarkerSeverity, MarkerStatistics } from './markers';
1414

15+
export const unsupportedSchemas = new Set([Schemas.inMemory, Schemas.vscodeSourceControl, Schemas.walkThrough, Schemas.walkThroughSnippet]);
16+
1517
class DoubleResourceMap<V>{
1618

1719
private _byResource = new ResourceMap<Map<string, V>>();
@@ -103,7 +105,7 @@ class MarkerStats implements MarkerStatistics {
103105
const result: MarkerStatistics = { errors: 0, warnings: 0, infos: 0, unknowns: 0 };
104106

105107
// TODO this is a hack
106-
if (resource.scheme === Schemas.inMemory || resource.scheme === Schemas.walkThrough || resource.scheme === Schemas.walkThroughSnippet || resource.scheme === Schemas.vscodeSourceControl) {
108+
if (unsupportedSchemas.has(resource.scheme)) {
107109
return result;
108110
}
109111

@@ -198,6 +200,10 @@ export class MarkerService implements IMarkerService {
198200
tags,
199201
} = data;
200202

203+
if (unsupportedSchemas.has(resource.scheme)) {
204+
return undefined;
205+
}
206+
201207
if (!message) {
202208
return undefined;
203209
}

src/vs/workbench/contrib/markers/browser/markersTable.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66
import { localize } from 'vs/nls';
77
import * as DOM from 'vs/base/browser/dom';
8-
import * as network from 'vs/base/common/network';
98
import { Event } from 'vs/base/common/event';
109
import { ITableContextMenuEvent, ITableEvent, ITableRenderer, ITableVirtualDelegate } from 'vs/base/browser/ui/table/table';
1110
import { Disposable } from 'vs/base/common/lifecycle';
@@ -29,6 +28,7 @@ import { isUndefinedOrNull } from 'vs/base/common/types';
2928
import { IProblemsWidget } from 'vs/workbench/contrib/markers/browser/markersView';
3029
import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
3130
import { Range } from 'vs/editor/common/core/range';
31+
import { unsupportedSchemas } from 'vs/platform/markers/common/markerService';
3232

3333
const $ = DOM.$;
3434

@@ -411,7 +411,7 @@ export class MarkersTable extends Disposable implements IProblemsWidget {
411411
const items: MarkerTableItem[] = [];
412412
for (const resourceMarker of this.resourceMarkers) {
413413
for (const marker of resourceMarker.markers) {
414-
if (marker.resource.scheme === network.Schemas.walkThrough || marker.resource.scheme === network.Schemas.walkThroughSnippet || marker.resource.scheme === network.Schemas.vscodeSourceControl) {
414+
if (unsupportedSchemas.has(marker.resource.scheme)) {
415415
continue;
416416
}
417417

src/vs/workbench/contrib/markers/browser/markersTreeViewer.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ import { Link } from 'vs/platform/opener/browser/link';
5050
import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
5151
import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
5252
import { MarkersContextKeys, MarkersViewMode } from 'vs/workbench/contrib/markers/common/markers';
53+
import { unsupportedSchemas } from 'vs/platform/markers/common/markerService';
5354

5455
interface IResourceMarkersTemplateData {
5556
resourceLabel: IResourceLabel;
@@ -456,7 +457,7 @@ export class Filter implements ITreeFilter<MarkerElement, FilterData> {
456457
}
457458

458459
private filterResourceMarkers(resourceMarkers: ResourceMarkers): TreeFilterResult<FilterData> {
459-
if (resourceMarkers.resource.scheme === network.Schemas.walkThrough || resourceMarkers.resource.scheme === network.Schemas.walkThroughSnippet || resourceMarkers.resource.scheme === network.Schemas.vscodeSourceControl) {
460+
if (unsupportedSchemas.has(resourceMarkers.resource.scheme)) {
460461
return false;
461462
}
462463

0 commit comments

Comments
 (0)