@codingame/monaco-vscode-markers-service-override 11.1.2 → 12.0.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/index.d.ts +2 -1
- package/index.js +9 -1
- package/package.json +20 -7
- package/vscode/src/vs/workbench/contrib/markers/browser/markers.contribution.d.ts +1 -0
- package/vscode/src/vs/workbench/contrib/markers/browser/markers.contribution.js +114 -123
- package/vscode/src/vs/workbench/contrib/markers/browser/markers.d.ts +19 -0
- package/vscode/src/vs/workbench/contrib/markers/browser/markersFileDecorations.d.ts +1 -0
- package/vscode/src/vs/workbench/contrib/markers/browser/markersFileDecorations.js +16 -14
- package/vscode/src/vs/workbench/contrib/markers/browser/markersFilterOptions.d.ts +33 -0
- package/vscode/src/vs/workbench/contrib/markers/browser/markersFilterOptions.js +1 -0
- package/vscode/src/vs/workbench/contrib/markers/browser/markersModel.d.ts +71 -0
- package/vscode/src/vs/workbench/contrib/markers/browser/markersModel.js +1 -0
- package/vscode/src/vs/workbench/contrib/markers/browser/markersTable.d.ts +46 -0
- package/vscode/src/vs/workbench/contrib/markers/browser/markersTable.js +53 -53
- package/vscode/src/vs/workbench/contrib/markers/browser/markersTreeViewer.d.ts +185 -0
- package/vscode/src/vs/workbench/contrib/markers/browser/markersTreeViewer.js +116 -109
- package/vscode/src/vs/workbench/contrib/markers/browser/markersView.d.ts +138 -0
- package/vscode/src/vs/workbench/contrib/markers/browser/markersView.js +79 -83
- package/vscode/src/vs/workbench/contrib/markers/browser/markersViewActions.css.js +1 -1
- package/vscode/src/vs/workbench/contrib/markers/browser/markersViewActions.d.ts +65 -0
- package/vscode/src/vs/workbench/contrib/markers/browser/markersViewActions.js +3 -2
- package/vscode/src/vs/workbench/contrib/markers/browser/media/markers.css.js +1 -1
- package/vscode/src/vs/workbench/contrib/markers/browser/messages.d.ts +45 -0
- package/vscode/src/vs/workbench/contrib/markers/browser/messages.js +50 -49
- package/markers.js +0 -7
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
|
|
1
|
+
|
|
2
|
+
import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
|
|
2
3
|
import { Extensions as Extensions$1 } from 'vscode/vscode/vs/workbench/common/contributions';
|
|
3
4
|
import { MarkerSeverity } from 'vscode/vscode/vs/platform/markers/common/markers';
|
|
4
5
|
import { IMarkerService } from 'vscode/vscode/vs/platform/markers/common/markers.service';
|
|
@@ -19,11 +20,12 @@ import 'vscode/vscode/vs/platform/theme/common/colors/quickpickColors';
|
|
|
19
20
|
import 'vscode/vscode/vs/platform/theme/common/colors/searchColors';
|
|
20
21
|
import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
|
|
21
22
|
import { Extensions } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
|
|
23
|
+
import { LifecyclePhase } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
|
|
22
24
|
|
|
23
25
|
class MarkersDecorationsProvider {
|
|
24
26
|
constructor(_markerService) {
|
|
25
27
|
this._markerService = _markerService;
|
|
26
|
-
this.label = ( localize(
|
|
28
|
+
this.label = ( localize(7078, "Problems"));
|
|
27
29
|
this.onDidChange = _markerService.onMarkerChanged;
|
|
28
30
|
}
|
|
29
31
|
provideDecorations(resource) {
|
|
@@ -43,8 +45,8 @@ class MarkersDecorationsProvider {
|
|
|
43
45
|
return {
|
|
44
46
|
weight: 100 * first.severity,
|
|
45
47
|
bubble: true,
|
|
46
|
-
tooltip: markers.length === 1 ? ( localize(
|
|
47
|
-
letter: markers.length < 10 ? (
|
|
48
|
+
tooltip: markers.length === 1 ? ( localize(7079, "1 problem in this file")) : ( localize(7080, "{0} problems in this file", markers.length)),
|
|
49
|
+
letter: markers.length < 10 ? ( markers.length.toString()) : '9+',
|
|
48
50
|
color: first.severity === MarkerSeverity.Error ? listErrorForeground : listWarningForeground,
|
|
49
51
|
};
|
|
50
52
|
}
|
|
@@ -83,7 +85,7 @@ let MarkersFileDecorations = class MarkersFileDecorations {
|
|
|
83
85
|
}
|
|
84
86
|
this._enabled = shouldEnable;
|
|
85
87
|
if (this._enabled) {
|
|
86
|
-
const provider = (
|
|
88
|
+
const provider = ( new MarkersDecorationsProvider(this._markerService));
|
|
87
89
|
this._provider = this._decorationsService.registerDecorationsProvider(provider);
|
|
88
90
|
}
|
|
89
91
|
else if (this._provider) {
|
|
@@ -91,19 +93,19 @@ let MarkersFileDecorations = class MarkersFileDecorations {
|
|
|
91
93
|
}
|
|
92
94
|
}
|
|
93
95
|
};
|
|
94
|
-
MarkersFileDecorations = (
|
|
95
|
-
(
|
|
96
|
-
(
|
|
97
|
-
(
|
|
98
|
-
], MarkersFileDecorations))
|
|
99
|
-
(
|
|
96
|
+
MarkersFileDecorations = ( __decorate([
|
|
97
|
+
( __param(0, IMarkerService)),
|
|
98
|
+
( __param(1, IDecorationsService)),
|
|
99
|
+
( __param(2, IConfigurationService))
|
|
100
|
+
], MarkersFileDecorations));
|
|
101
|
+
( Registry.as(Extensions.Configuration)).registerConfiguration({
|
|
100
102
|
'id': 'problems',
|
|
101
103
|
'order': 101,
|
|
102
104
|
'type': 'object',
|
|
103
105
|
'properties': {
|
|
104
106
|
'problems.decorations.enabled': {
|
|
105
107
|
'markdownDescription': ( localize(
|
|
106
|
-
|
|
108
|
+
7081,
|
|
107
109
|
"Show Errors & Warnings on files and folder. Overwritten by {0} when it is off.",
|
|
108
110
|
'`#problems.visibility#`'
|
|
109
111
|
)),
|
|
@@ -112,5 +114,5 @@ MarkersFileDecorations = ( (__decorate([
|
|
|
112
114
|
}
|
|
113
115
|
}
|
|
114
116
|
});
|
|
115
|
-
(
|
|
116
|
-
.registerWorkbenchContribution(MarkersFileDecorations,
|
|
117
|
+
( Registry.as(Extensions$1.Workbench))
|
|
118
|
+
.registerWorkbenchContribution(MarkersFileDecorations, LifecyclePhase.Restored);
|
|
@@ -0,0 +1,33 @@
|
|
|
1
|
+
import { IFilter } from "vscode/vscode/vs/base/common/filters";
|
|
2
|
+
import { IExpression } from "vscode/vscode/vs/base/common/glob";
|
|
3
|
+
import { URI } from "vscode/vscode/vs/base/common/uri";
|
|
4
|
+
import { IUriIdentityService } from "vscode/vscode/vs/platform/uriIdentity/common/uriIdentity.service";
|
|
5
|
+
export declare class ResourceGlobMatcher {
|
|
6
|
+
private readonly globalExpression;
|
|
7
|
+
private readonly expressionsByRoot;
|
|
8
|
+
constructor(globalExpression: IExpression, rootExpressions: {
|
|
9
|
+
root: URI;
|
|
10
|
+
expression: IExpression;
|
|
11
|
+
}[], uriIdentityService: IUriIdentityService);
|
|
12
|
+
matches(resource: URI): boolean;
|
|
13
|
+
}
|
|
14
|
+
export declare class FilterOptions {
|
|
15
|
+
readonly filter: string;
|
|
16
|
+
static readonly _filter: IFilter;
|
|
17
|
+
static readonly _messageFilter: IFilter;
|
|
18
|
+
readonly showWarnings: boolean;
|
|
19
|
+
readonly showErrors: boolean;
|
|
20
|
+
readonly showInfos: boolean;
|
|
21
|
+
readonly textFilter: {
|
|
22
|
+
readonly text: string;
|
|
23
|
+
readonly negate: boolean;
|
|
24
|
+
};
|
|
25
|
+
readonly excludesMatcher: ResourceGlobMatcher;
|
|
26
|
+
readonly includesMatcher: ResourceGlobMatcher;
|
|
27
|
+
static EMPTY(uriIdentityService: IUriIdentityService): FilterOptions;
|
|
28
|
+
constructor(filter: string, filesExclude: {
|
|
29
|
+
root: URI;
|
|
30
|
+
expression: IExpression;
|
|
31
|
+
}[] | IExpression, showWarnings: boolean, showErrors: boolean, showInfos: boolean, uriIdentityService: IUriIdentityService);
|
|
32
|
+
private setPattern;
|
|
33
|
+
}
|
|
@@ -0,0 +1,71 @@
|
|
|
1
|
+
import { Event } from "vscode/vscode/vs/base/common/event";
|
|
2
|
+
import { IMatch } from "vscode/vscode/vs/base/common/filters";
|
|
3
|
+
import { URI } from "vscode/vscode/vs/base/common/uri";
|
|
4
|
+
import { IRange } from "vscode/vscode/vs/editor/common/core/range";
|
|
5
|
+
import { IMarker, IRelatedInformation } from "vscode/vscode/vs/platform/markers/common/markers";
|
|
6
|
+
export type MarkerElement = ResourceMarkers | Marker | RelatedInformation;
|
|
7
|
+
export declare function compareMarkersByUri(a: IMarker, b: IMarker): number;
|
|
8
|
+
export declare class ResourceMarkers {
|
|
9
|
+
readonly id: string;
|
|
10
|
+
readonly resource: URI;
|
|
11
|
+
readonly path: string;
|
|
12
|
+
readonly name: string;
|
|
13
|
+
private _markersMap;
|
|
14
|
+
private _cachedMarkers;
|
|
15
|
+
private _total;
|
|
16
|
+
constructor(id: string, resource: URI);
|
|
17
|
+
get markers(): readonly Marker[];
|
|
18
|
+
has(uri: URI): boolean;
|
|
19
|
+
set(uri: URI, marker: Marker[]): void;
|
|
20
|
+
delete(uri: URI): void;
|
|
21
|
+
get total(): number;
|
|
22
|
+
private static _compareMarkers;
|
|
23
|
+
}
|
|
24
|
+
export declare class Marker {
|
|
25
|
+
readonly id: string;
|
|
26
|
+
readonly marker: IMarker;
|
|
27
|
+
readonly relatedInformation: RelatedInformation[];
|
|
28
|
+
get resource(): URI;
|
|
29
|
+
get range(): IRange;
|
|
30
|
+
private _lines;
|
|
31
|
+
get lines(): string[];
|
|
32
|
+
constructor(id: string, marker: IMarker, relatedInformation?: RelatedInformation[]);
|
|
33
|
+
toString(): string;
|
|
34
|
+
}
|
|
35
|
+
export declare class MarkerTableItem extends Marker {
|
|
36
|
+
readonly sourceMatches?: IMatch[] | undefined;
|
|
37
|
+
readonly codeMatches?: IMatch[] | undefined;
|
|
38
|
+
readonly messageMatches?: IMatch[] | undefined;
|
|
39
|
+
readonly fileMatches?: IMatch[] | undefined;
|
|
40
|
+
readonly ownerMatches?: IMatch[] | undefined;
|
|
41
|
+
constructor(marker: Marker, sourceMatches?: IMatch[] | undefined, codeMatches?: IMatch[] | undefined, messageMatches?: IMatch[] | undefined, fileMatches?: IMatch[] | undefined, ownerMatches?: IMatch[] | undefined);
|
|
42
|
+
}
|
|
43
|
+
export declare class RelatedInformation {
|
|
44
|
+
readonly id: string;
|
|
45
|
+
readonly marker: IMarker;
|
|
46
|
+
readonly raw: IRelatedInformation;
|
|
47
|
+
constructor(id: string, marker: IMarker, raw: IRelatedInformation);
|
|
48
|
+
}
|
|
49
|
+
export interface MarkerChangesEvent {
|
|
50
|
+
readonly added: Set<ResourceMarkers>;
|
|
51
|
+
readonly removed: Set<ResourceMarkers>;
|
|
52
|
+
readonly updated: Set<ResourceMarkers>;
|
|
53
|
+
}
|
|
54
|
+
export declare class MarkersModel {
|
|
55
|
+
private cachedSortedResources;
|
|
56
|
+
private readonly _onDidChange;
|
|
57
|
+
readonly onDidChange: Event<MarkerChangesEvent>;
|
|
58
|
+
get resourceMarkers(): ResourceMarkers[];
|
|
59
|
+
private resourcesByUri;
|
|
60
|
+
constructor();
|
|
61
|
+
reset(): void;
|
|
62
|
+
private _total;
|
|
63
|
+
get total(): number;
|
|
64
|
+
getResourceMarkers(resource: URI): ResourceMarkers | null;
|
|
65
|
+
setResourceMarkers(resourcesMarkers: [
|
|
66
|
+
URI,
|
|
67
|
+
IMarker[]
|
|
68
|
+
][]): void;
|
|
69
|
+
private id;
|
|
70
|
+
dispose(): void;
|
|
71
|
+
}
|
|
@@ -0,0 +1,46 @@
|
|
|
1
|
+
import { Event } from "vscode/vscode/vs/base/common/event";
|
|
2
|
+
import { ITableContextMenuEvent, ITableEvent } from "vscode/vscode/vs/base/browser/ui/table/table";
|
|
3
|
+
import { Disposable } from "vscode/vscode/vs/base/common/lifecycle";
|
|
4
|
+
import { IInstantiationService } from "vscode/vscode/vs/platform/instantiation/common/instantiation";
|
|
5
|
+
import { IOpenEvent, IWorkbenchTableOptions } from "vscode/vscode/vs/platform/list/browser/listService";
|
|
6
|
+
import { Marker, MarkerTableItem, ResourceMarkers } from "./markersModel.js";
|
|
7
|
+
import { ILabelService } from "vscode/vscode/vs/platform/label/common/label.service";
|
|
8
|
+
import { FilterOptions } from "./markersFilterOptions.js";
|
|
9
|
+
import { MarkersViewModel } from "./markersTreeViewer.js";
|
|
10
|
+
import { IProblemsWidget } from "./markersView.js";
|
|
11
|
+
import { IContextKeyService } from "vscode/vscode/vs/platform/contextkey/common/contextkey.service";
|
|
12
|
+
export declare class MarkersTable extends Disposable implements IProblemsWidget {
|
|
13
|
+
private readonly container;
|
|
14
|
+
private readonly markersViewModel;
|
|
15
|
+
private resourceMarkers;
|
|
16
|
+
private filterOptions;
|
|
17
|
+
private readonly instantiationService;
|
|
18
|
+
private readonly labelService;
|
|
19
|
+
private _itemCount;
|
|
20
|
+
private readonly table;
|
|
21
|
+
constructor(container: HTMLElement, markersViewModel: MarkersViewModel, resourceMarkers: ResourceMarkers[], filterOptions: FilterOptions, options: IWorkbenchTableOptions<MarkerTableItem>, instantiationService: IInstantiationService, labelService: ILabelService);
|
|
22
|
+
get contextKeyService(): IContextKeyService;
|
|
23
|
+
get onContextMenu(): Event<ITableContextMenuEvent<MarkerTableItem>>;
|
|
24
|
+
get onDidOpen(): Event<IOpenEvent<MarkerTableItem | undefined>>;
|
|
25
|
+
get onDidChangeFocus(): Event<ITableEvent<MarkerTableItem>>;
|
|
26
|
+
get onDidChangeSelection(): Event<ITableEvent<MarkerTableItem>>;
|
|
27
|
+
collapseMarkers(): void;
|
|
28
|
+
domFocus(): void;
|
|
29
|
+
filterMarkers(resourceMarkers: ResourceMarkers[], filterOptions: FilterOptions): void;
|
|
30
|
+
getFocus(): (MarkerTableItem | null)[];
|
|
31
|
+
getHTMLElement(): HTMLElement;
|
|
32
|
+
getRelativeTop(marker: MarkerTableItem | null): number | null;
|
|
33
|
+
getSelection(): (MarkerTableItem | null)[];
|
|
34
|
+
getVisibleItemCount(): number;
|
|
35
|
+
isVisible(): boolean;
|
|
36
|
+
layout(height: number, width: number): void;
|
|
37
|
+
reset(resourceMarkers: ResourceMarkers[]): void;
|
|
38
|
+
revealMarkers(activeResource: ResourceMarkers | null, focus: boolean, lastSelectedRelativeTop: number): void;
|
|
39
|
+
setAriaLabel(label: string): void;
|
|
40
|
+
setMarkerSelection(selection?: Marker[], focus?: Marker[]): void;
|
|
41
|
+
toggleVisibility(hide: boolean): void;
|
|
42
|
+
update(resourceMarkers: ResourceMarkers[]): void;
|
|
43
|
+
updateMarker(marker: Marker): void;
|
|
44
|
+
private findMarkerIndex;
|
|
45
|
+
private hasSelectedMarkerFor;
|
|
46
|
+
}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
|
|
1
|
+
|
|
2
|
+
import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
|
|
2
3
|
import { localize } from 'vscode/vscode/vs/nls';
|
|
3
4
|
import { $ as $$1, append, findParentWithClass } from 'vscode/vscode/vs/base/browser/dom';
|
|
4
5
|
import { Event } from 'vscode/vscode/vs/base/common/event';
|
|
@@ -20,7 +21,7 @@ import Messages from './messages.js';
|
|
|
20
21
|
import { isUndefinedOrNull } from 'vscode/vscode/vs/base/common/types';
|
|
21
22
|
import { Range } from 'vscode/vscode/vs/editor/common/core/range';
|
|
22
23
|
import { unsupportedSchemas } from 'vscode/vscode/vs/platform/markers/common/markerService';
|
|
23
|
-
import Severity
|
|
24
|
+
import Severity from 'vscode/vscode/vs/base/common/severity';
|
|
24
25
|
import { IHoverService } from 'vscode/vscode/vs/platform/hover/browser/hover.service';
|
|
25
26
|
|
|
26
27
|
var MarkerSeverityColumnRenderer_1, MarkerCodeColumnRenderer_1, MarkerFileColumnRenderer_1;
|
|
@@ -37,9 +38,9 @@ let MarkerSeverityColumnRenderer = class MarkerSeverityColumnRenderer {
|
|
|
37
38
|
const severityColumn = append(container, $('.severity'));
|
|
38
39
|
const icon = append(severityColumn, $(''));
|
|
39
40
|
const actionBarColumn = append(container, $('.actions'));
|
|
40
|
-
const actionBar = (
|
|
41
|
+
const actionBar = ( new ActionBar(actionBarColumn, {
|
|
41
42
|
actionViewItemProvider: (action, options) => action.id === QuickFixAction.ID ? this.instantiationService.createInstance(QuickFixActionViewItem, action, options) : undefined
|
|
42
|
-
}))
|
|
43
|
+
}));
|
|
43
44
|
return { actionBar, icon };
|
|
44
45
|
}
|
|
45
46
|
renderElement(element, index, templateData, height) {
|
|
@@ -49,8 +50,8 @@ let MarkerSeverityColumnRenderer = class MarkerSeverityColumnRenderer {
|
|
|
49
50
|
container.classList.toggle('quickFix', enabled);
|
|
50
51
|
}
|
|
51
52
|
};
|
|
52
|
-
templateData.icon.title = (
|
|
53
|
-
templateData.icon.className = `marker-icon ${(
|
|
53
|
+
templateData.icon.title = ( MarkerSeverity.toString(element.marker.severity));
|
|
54
|
+
templateData.icon.className = `marker-icon ${( Severity.toString(MarkerSeverity.toSeverity(element.marker.severity)))} codicon ${SeverityIcon.className(MarkerSeverity.toSeverity(element.marker.severity))}`;
|
|
54
55
|
templateData.actionBar.clear();
|
|
55
56
|
const viewModel = this.markersViewModel.getViewModel(element);
|
|
56
57
|
if (viewModel) {
|
|
@@ -68,9 +69,9 @@ let MarkerSeverityColumnRenderer = class MarkerSeverityColumnRenderer {
|
|
|
68
69
|
}
|
|
69
70
|
disposeTemplate(templateData) { }
|
|
70
71
|
};
|
|
71
|
-
MarkerSeverityColumnRenderer = MarkerSeverityColumnRenderer_1 = (
|
|
72
|
-
(
|
|
73
|
-
], MarkerSeverityColumnRenderer))
|
|
72
|
+
MarkerSeverityColumnRenderer = MarkerSeverityColumnRenderer_1 = ( __decorate([
|
|
73
|
+
( __param(1, IInstantiationService))
|
|
74
|
+
], MarkerSeverityColumnRenderer));
|
|
74
75
|
let MarkerCodeColumnRenderer = class MarkerCodeColumnRenderer {
|
|
75
76
|
static { MarkerCodeColumnRenderer_1 = this; }
|
|
76
77
|
static { this.TEMPLATE_ID = 'code'; }
|
|
@@ -80,19 +81,19 @@ let MarkerCodeColumnRenderer = class MarkerCodeColumnRenderer {
|
|
|
80
81
|
this.templateId = MarkerCodeColumnRenderer_1.TEMPLATE_ID;
|
|
81
82
|
}
|
|
82
83
|
renderTemplate(container) {
|
|
83
|
-
const templateDisposable = (
|
|
84
|
+
const templateDisposable = ( new DisposableStore());
|
|
84
85
|
const codeColumn = append(container, $('.code'));
|
|
85
|
-
const sourceLabel = templateDisposable.add((
|
|
86
|
+
const sourceLabel = templateDisposable.add(( new HighlightedLabel(codeColumn)));
|
|
86
87
|
sourceLabel.element.classList.add('source-label');
|
|
87
|
-
const codeLabel = templateDisposable.add((
|
|
88
|
+
const codeLabel = templateDisposable.add(( new HighlightedLabel(codeColumn)));
|
|
88
89
|
codeLabel.element.classList.add('code-label');
|
|
89
|
-
const codeLink = templateDisposable.add((
|
|
90
|
+
const codeLink = templateDisposable.add(( new Link(
|
|
90
91
|
codeColumn,
|
|
91
92
|
{ href: '', label: '' },
|
|
92
93
|
{},
|
|
93
94
|
this.hoverService,
|
|
94
95
|
this.openerService
|
|
95
|
-
)))
|
|
96
|
+
)));
|
|
96
97
|
return { codeColumn, sourceLabel, codeLabel, codeLink, templateDisposable };
|
|
97
98
|
}
|
|
98
99
|
renderElement(element, index, templateData, height) {
|
|
@@ -109,11 +110,11 @@ let MarkerCodeColumnRenderer = class MarkerCodeColumnRenderer {
|
|
|
109
110
|
templateData.codeColumn.classList.add('code-link');
|
|
110
111
|
templateData.codeColumn.title = `${element.marker.source} (${element.marker.code.value})`;
|
|
111
112
|
templateData.sourceLabel.set(element.marker.source, element.sourceMatches);
|
|
112
|
-
const codeLinkLabel = templateData.templateDisposable.add((
|
|
113
|
+
const codeLinkLabel = templateData.templateDisposable.add(( new HighlightedLabel($('.code-link-label'))));
|
|
113
114
|
codeLinkLabel.set(element.marker.code.value, element.codeMatches);
|
|
114
115
|
templateData.codeLink.link = {
|
|
115
|
-
href: (
|
|
116
|
-
title: (
|
|
116
|
+
href: ( element.marker.code.target.toString(true)),
|
|
117
|
+
title: ( element.marker.code.target.toString(true)),
|
|
117
118
|
label: codeLinkLabel.element,
|
|
118
119
|
};
|
|
119
120
|
}
|
|
@@ -127,10 +128,10 @@ let MarkerCodeColumnRenderer = class MarkerCodeColumnRenderer {
|
|
|
127
128
|
templateData.templateDisposable.dispose();
|
|
128
129
|
}
|
|
129
130
|
};
|
|
130
|
-
MarkerCodeColumnRenderer = MarkerCodeColumnRenderer_1 = (
|
|
131
|
-
(
|
|
132
|
-
(
|
|
133
|
-
], MarkerCodeColumnRenderer))
|
|
131
|
+
MarkerCodeColumnRenderer = MarkerCodeColumnRenderer_1 = ( __decorate([
|
|
132
|
+
( __param(0, IHoverService)),
|
|
133
|
+
( __param(1, IOpenerService))
|
|
134
|
+
], MarkerCodeColumnRenderer));
|
|
134
135
|
class MarkerMessageColumnRenderer {
|
|
135
136
|
constructor() {
|
|
136
137
|
this.templateId = MarkerMessageColumnRenderer.TEMPLATE_ID;
|
|
@@ -138,7 +139,7 @@ class MarkerMessageColumnRenderer {
|
|
|
138
139
|
static { this.TEMPLATE_ID = 'message'; }
|
|
139
140
|
renderTemplate(container) {
|
|
140
141
|
const columnElement = append(container, $('.message'));
|
|
141
|
-
const highlightedLabel = (
|
|
142
|
+
const highlightedLabel = ( new HighlightedLabel(columnElement));
|
|
142
143
|
return { columnElement, highlightedLabel };
|
|
143
144
|
}
|
|
144
145
|
renderElement(element, index, templateData, height) {
|
|
@@ -158,9 +159,9 @@ let MarkerFileColumnRenderer = class MarkerFileColumnRenderer {
|
|
|
158
159
|
}
|
|
159
160
|
renderTemplate(container) {
|
|
160
161
|
const columnElement = append(container, $('.file'));
|
|
161
|
-
const fileLabel = (
|
|
162
|
+
const fileLabel = ( new HighlightedLabel(columnElement));
|
|
162
163
|
fileLabel.element.classList.add('file-label');
|
|
163
|
-
const positionLabel = (
|
|
164
|
+
const positionLabel = ( new HighlightedLabel(columnElement));
|
|
164
165
|
positionLabel.element.classList.add('file-position');
|
|
165
166
|
return { columnElement, fileLabel, positionLabel };
|
|
166
167
|
}
|
|
@@ -175,9 +176,9 @@ let MarkerFileColumnRenderer = class MarkerFileColumnRenderer {
|
|
|
175
176
|
templateData.positionLabel.dispose();
|
|
176
177
|
}
|
|
177
178
|
};
|
|
178
|
-
MarkerFileColumnRenderer = MarkerFileColumnRenderer_1 = (
|
|
179
|
-
(
|
|
180
|
-
], MarkerFileColumnRenderer))
|
|
179
|
+
MarkerFileColumnRenderer = MarkerFileColumnRenderer_1 = ( __decorate([
|
|
180
|
+
( __param(0, ILabelService))
|
|
181
|
+
], MarkerFileColumnRenderer));
|
|
181
182
|
class MarkerOwnerColumnRenderer {
|
|
182
183
|
constructor() {
|
|
183
184
|
this.templateId = MarkerOwnerColumnRenderer.TEMPLATE_ID;
|
|
@@ -185,7 +186,7 @@ class MarkerOwnerColumnRenderer {
|
|
|
185
186
|
static { this.TEMPLATE_ID = 'owner'; }
|
|
186
187
|
renderTemplate(container) {
|
|
187
188
|
const columnElement = append(container, $('.owner'));
|
|
188
|
-
const highlightedLabel = (
|
|
189
|
+
const highlightedLabel = ( new HighlightedLabel(columnElement));
|
|
189
190
|
return { columnElement, highlightedLabel };
|
|
190
191
|
}
|
|
191
192
|
renderElement(element, index, templateData, height) {
|
|
@@ -216,7 +217,7 @@ let MarkersTable = class MarkersTable extends Disposable {
|
|
|
216
217
|
this.instantiationService = instantiationService;
|
|
217
218
|
this.labelService = labelService;
|
|
218
219
|
this._itemCount = 0;
|
|
219
|
-
this.table = this.instantiationService.createInstance(WorkbenchTable, 'Markers', this.container, (
|
|
220
|
+
this.table = this.instantiationService.createInstance(WorkbenchTable, 'Markers', this.container, ( new MarkersTableVirtualDelegate()), [
|
|
220
221
|
{
|
|
221
222
|
label: '',
|
|
222
223
|
tooltip: '',
|
|
@@ -227,7 +228,7 @@ let MarkersTable = class MarkersTable extends Disposable {
|
|
|
227
228
|
project(row) { return row; }
|
|
228
229
|
},
|
|
229
230
|
{
|
|
230
|
-
label: ( localize(
|
|
231
|
+
label: ( localize(7082, "Code")),
|
|
231
232
|
tooltip: '',
|
|
232
233
|
weight: 1,
|
|
233
234
|
minimumWidth: 100,
|
|
@@ -236,21 +237,21 @@ let MarkersTable = class MarkersTable extends Disposable {
|
|
|
236
237
|
project(row) { return row; }
|
|
237
238
|
},
|
|
238
239
|
{
|
|
239
|
-
label: ( localize(
|
|
240
|
+
label: ( localize(7083, "Message")),
|
|
240
241
|
tooltip: '',
|
|
241
242
|
weight: 4,
|
|
242
243
|
templateId: MarkerMessageColumnRenderer.TEMPLATE_ID,
|
|
243
244
|
project(row) { return row; }
|
|
244
245
|
},
|
|
245
246
|
{
|
|
246
|
-
label: ( localize(
|
|
247
|
+
label: ( localize(7084, "File")),
|
|
247
248
|
tooltip: '',
|
|
248
249
|
weight: 2,
|
|
249
250
|
templateId: MarkerFileColumnRenderer.TEMPLATE_ID,
|
|
250
251
|
project(row) { return row; }
|
|
251
252
|
},
|
|
252
253
|
{
|
|
253
|
-
label: ( localize(
|
|
254
|
+
label: ( localize(7085, "Source")),
|
|
254
255
|
tooltip: '',
|
|
255
256
|
weight: 1,
|
|
256
257
|
minimumWidth: 100,
|
|
@@ -266,13 +267,12 @@ let MarkersTable = class MarkersTable extends Disposable {
|
|
|
266
267
|
this.instantiationService.createInstance(MarkerOwnerColumnRenderer),
|
|
267
268
|
], options);
|
|
268
269
|
const list = this.table.domNode.querySelector('.monaco-list-rows');
|
|
269
|
-
const onRowHover = Event.chain(this._register((
|
|
270
|
+
const onRowHover = Event.chain(this._register(( new DomEmitter(list, 'mouseover'))).event, $ => ( ( $.map(
|
|
271
|
+
e => findParentWithClass(e.target, 'monaco-list-row', 'monaco-list-rows')
|
|
272
|
+
))
|
|
270
273
|
.filter(((e) => !!e))
|
|
271
|
-
.map(e => parseInt(e.getAttribute('data-index')))))
|
|
272
|
-
const onListLeave = (
|
|
273
|
-
this._register(( (new DomEmitter(list, 'mouseleave')))).event,
|
|
274
|
-
() => -1
|
|
275
|
-
)));
|
|
274
|
+
.map(e => parseInt(e.getAttribute('data-index')))));
|
|
275
|
+
const onListLeave = ( Event.map(this._register(( new DomEmitter(list, 'mouseleave'))).event, () => -1));
|
|
276
276
|
const onRowHoverOrLeave = Event.latch(Event.any(onRowHover, onListLeave));
|
|
277
277
|
const onRowPermanentHover = Event.debounce(onRowHoverOrLeave, (_, e) => e, 500);
|
|
278
278
|
this._register(onRowPermanentHover(e => {
|
|
@@ -306,7 +306,7 @@ let MarkersTable = class MarkersTable extends Disposable {
|
|
|
306
306
|
}
|
|
307
307
|
getFocus() {
|
|
308
308
|
const focus = this.table.getFocus();
|
|
309
|
-
return focus.length > 0 ? [...(
|
|
309
|
+
return focus.length > 0 ? [...( focus.map(f => this.table.row(f)))] : [];
|
|
310
310
|
}
|
|
311
311
|
getHTMLElement() {
|
|
312
312
|
return this.table.getHTMLElement();
|
|
@@ -316,7 +316,7 @@ let MarkersTable = class MarkersTable extends Disposable {
|
|
|
316
316
|
}
|
|
317
317
|
getSelection() {
|
|
318
318
|
const selection = this.table.getSelection();
|
|
319
|
-
return selection.length > 0 ? [...(
|
|
319
|
+
return selection.length > 0 ? [...( selection.map(i => this.table.row(i)))] : [];
|
|
320
320
|
}
|
|
321
321
|
getVisibleItemCount() {
|
|
322
322
|
return this._itemCount;
|
|
@@ -333,14 +333,14 @@ let MarkersTable = class MarkersTable extends Disposable {
|
|
|
333
333
|
const items = [];
|
|
334
334
|
for (const resourceMarker of this.resourceMarkers) {
|
|
335
335
|
for (const marker of resourceMarker.markers) {
|
|
336
|
-
if ((
|
|
336
|
+
if (( unsupportedSchemas.has(marker.resource.scheme))) {
|
|
337
337
|
continue;
|
|
338
338
|
}
|
|
339
339
|
if (this.filterOptions.excludesMatcher.matches(marker.resource)) {
|
|
340
340
|
continue;
|
|
341
341
|
}
|
|
342
342
|
if (this.filterOptions.includesMatcher.matches(marker.resource)) {
|
|
343
|
-
items.push((
|
|
343
|
+
items.push(( new MarkerTableItem(marker)));
|
|
344
344
|
continue;
|
|
345
345
|
}
|
|
346
346
|
const matchesSeverity = this.filterOptions.showErrors && MarkerSeverity.Error === marker.marker.severity ||
|
|
@@ -357,18 +357,18 @@ let MarkersTable = class MarkersTable extends Disposable {
|
|
|
357
357
|
const ownerMatches = FilterOptions._messageFilter(this.filterOptions.textFilter.text, marker.marker.owner) ?? undefined;
|
|
358
358
|
const matched = sourceMatches || codeMatches || messageMatches || fileMatches || ownerMatches;
|
|
359
359
|
if ((matched && !this.filterOptions.textFilter.negate) || (!matched && this.filterOptions.textFilter.negate)) {
|
|
360
|
-
items.push((
|
|
360
|
+
items.push(( new MarkerTableItem(
|
|
361
361
|
marker,
|
|
362
362
|
sourceMatches,
|
|
363
363
|
codeMatches,
|
|
364
364
|
messageMatches,
|
|
365
365
|
fileMatches,
|
|
366
366
|
ownerMatches
|
|
367
|
-
)))
|
|
367
|
+
)));
|
|
368
368
|
}
|
|
369
369
|
continue;
|
|
370
370
|
}
|
|
371
|
-
items.push((
|
|
371
|
+
items.push(( new MarkerTableItem(marker)));
|
|
372
372
|
}
|
|
373
373
|
}
|
|
374
374
|
this._itemCount = items.length;
|
|
@@ -414,9 +414,9 @@ let MarkersTable = class MarkersTable extends Disposable {
|
|
|
414
414
|
setMarkerSelection(selection, focus) {
|
|
415
415
|
if (this.isVisible()) {
|
|
416
416
|
if (selection && selection.length > 0) {
|
|
417
|
-
this.table.setSelection((
|
|
417
|
+
this.table.setSelection(( selection.map(m => this.findMarkerIndex(m))));
|
|
418
418
|
if (focus && focus.length > 0) {
|
|
419
|
-
this.table.setFocus((
|
|
419
|
+
this.table.setFocus(( focus.map(f => this.findMarkerIndex(f))));
|
|
420
420
|
}
|
|
421
421
|
else {
|
|
422
422
|
this.table.setFocus([this.findMarkerIndex(selection[0])]);
|
|
@@ -455,7 +455,7 @@ let MarkersTable = class MarkersTable extends Disposable {
|
|
|
455
455
|
const selectedElement = this.getSelection();
|
|
456
456
|
if (selectedElement && selectedElement.length > 0) {
|
|
457
457
|
if (selectedElement[0] instanceof Marker) {
|
|
458
|
-
if ((
|
|
458
|
+
if (( resource.has(selectedElement[0].marker.resource))) {
|
|
459
459
|
return true;
|
|
460
460
|
}
|
|
461
461
|
}
|
|
@@ -463,9 +463,9 @@ let MarkersTable = class MarkersTable extends Disposable {
|
|
|
463
463
|
return false;
|
|
464
464
|
}
|
|
465
465
|
};
|
|
466
|
-
MarkersTable = (
|
|
467
|
-
(
|
|
468
|
-
(
|
|
469
|
-
], MarkersTable))
|
|
466
|
+
MarkersTable = ( __decorate([
|
|
467
|
+
( __param(5, IInstantiationService)),
|
|
468
|
+
( __param(6, ILabelService))
|
|
469
|
+
], MarkersTable));
|
|
470
470
|
|
|
471
471
|
export { MarkersTable };
|