@codingame/monaco-vscode-markers-service-override 4.5.1 → 5.0.0
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/package.json +2 -2
- package/vscode/src/vs/workbench/contrib/markers/browser/markers.contribution.js +83 -213
- package/vscode/src/vs/workbench/contrib/markers/browser/markersFileDecorations.js +14 -26
- package/vscode/src/vs/workbench/contrib/markers/browser/markersTable.js +60 -65
- package/vscode/src/vs/workbench/contrib/markers/browser/markersTreeViewer.js +102 -115
- package/vscode/src/vs/workbench/contrib/markers/browser/markersView.js +82 -87
- package/vscode/src/vs/workbench/contrib/markers/browser/messages.js +60 -205
|
@@ -21,8 +21,10 @@ import { isUndefinedOrNull } from 'vscode/vscode/vs/base/common/types';
|
|
|
21
21
|
import { Range } from 'vscode/vscode/vs/editor/common/core/range';
|
|
22
22
|
import { unsupportedSchemas } from 'vscode/vscode/vs/platform/markers/common/markerService';
|
|
23
23
|
import Severity$1 from 'vscode/vscode/vs/base/common/severity';
|
|
24
|
+
import { IHoverService } from 'vscode/vscode/vs/platform/hover/browser/hover.service';
|
|
24
25
|
|
|
25
26
|
var MarkerSeverityColumnRenderer_1, MarkerCodeColumnRenderer_1, MarkerFileColumnRenderer_1;
|
|
27
|
+
const _moduleId = "vs/workbench/contrib/markers/browser/markersTable";
|
|
26
28
|
const $ = $$1;
|
|
27
29
|
let MarkerSeverityColumnRenderer = class MarkerSeverityColumnRenderer {
|
|
28
30
|
static { MarkerSeverityColumnRenderer_1 = this; }
|
|
@@ -36,9 +38,9 @@ let MarkerSeverityColumnRenderer = class MarkerSeverityColumnRenderer {
|
|
|
36
38
|
const severityColumn = append(container, $('.severity'));
|
|
37
39
|
const icon = append(severityColumn, $(''));
|
|
38
40
|
const actionBarColumn = append(container, $('.actions'));
|
|
39
|
-
const actionBar = ( new ActionBar(actionBarColumn, {
|
|
41
|
+
const actionBar = ( (new ActionBar(actionBarColumn, {
|
|
40
42
|
actionViewItemProvider: (action, options) => action.id === QuickFixAction.ID ? this.instantiationService.createInstance(QuickFixActionViewItem, action, options) : undefined
|
|
41
|
-
}));
|
|
43
|
+
})));
|
|
42
44
|
return { actionBar, icon };
|
|
43
45
|
}
|
|
44
46
|
renderElement(element, index, templateData, height) {
|
|
@@ -48,8 +50,8 @@ let MarkerSeverityColumnRenderer = class MarkerSeverityColumnRenderer {
|
|
|
48
50
|
container.classList.toggle('quickFix', enabled);
|
|
49
51
|
}
|
|
50
52
|
};
|
|
51
|
-
templateData.icon.title = ( MarkerSeverity.toString(element.marker.severity));
|
|
52
|
-
templateData.icon.className = `marker-icon ${( Severity$1.toString(MarkerSeverity.toSeverity(element.marker.severity)))} codicon ${SeverityIcon.className(MarkerSeverity.toSeverity(element.marker.severity))}`;
|
|
53
|
+
templateData.icon.title = ( (MarkerSeverity.toString(element.marker.severity)));
|
|
54
|
+
templateData.icon.className = `marker-icon ${( (Severity$1.toString(MarkerSeverity.toSeverity(element.marker.severity))))} codicon ${SeverityIcon.className(MarkerSeverity.toSeverity(element.marker.severity))}`;
|
|
53
55
|
templateData.actionBar.clear();
|
|
54
56
|
const viewModel = this.markersViewModel.getViewModel(element);
|
|
55
57
|
if (viewModel) {
|
|
@@ -67,24 +69,31 @@ let MarkerSeverityColumnRenderer = class MarkerSeverityColumnRenderer {
|
|
|
67
69
|
}
|
|
68
70
|
disposeTemplate(templateData) { }
|
|
69
71
|
};
|
|
70
|
-
MarkerSeverityColumnRenderer = MarkerSeverityColumnRenderer_1 = ( __decorate([
|
|
71
|
-
( __param(1, IInstantiationService))
|
|
72
|
-
], MarkerSeverityColumnRenderer));
|
|
72
|
+
MarkerSeverityColumnRenderer = MarkerSeverityColumnRenderer_1 = ( (__decorate([
|
|
73
|
+
( (__param(1, IInstantiationService)))
|
|
74
|
+
], MarkerSeverityColumnRenderer)));
|
|
73
75
|
let MarkerCodeColumnRenderer = class MarkerCodeColumnRenderer {
|
|
74
76
|
static { MarkerCodeColumnRenderer_1 = this; }
|
|
75
77
|
static { this.TEMPLATE_ID = 'code'; }
|
|
76
|
-
constructor(openerService) {
|
|
78
|
+
constructor(hoverService, openerService) {
|
|
79
|
+
this.hoverService = hoverService;
|
|
77
80
|
this.openerService = openerService;
|
|
78
81
|
this.templateId = MarkerCodeColumnRenderer_1.TEMPLATE_ID;
|
|
79
82
|
}
|
|
80
83
|
renderTemplate(container) {
|
|
81
|
-
const templateDisposable = ( new DisposableStore());
|
|
84
|
+
const templateDisposable = ( (new DisposableStore()));
|
|
82
85
|
const codeColumn = append(container, $('.code'));
|
|
83
|
-
const sourceLabel = templateDisposable.add(( new HighlightedLabel(codeColumn)));
|
|
86
|
+
const sourceLabel = templateDisposable.add(( (new HighlightedLabel(codeColumn))));
|
|
84
87
|
sourceLabel.element.classList.add('source-label');
|
|
85
|
-
const codeLabel = templateDisposable.add(( new HighlightedLabel(codeColumn)));
|
|
88
|
+
const codeLabel = templateDisposable.add(( (new HighlightedLabel(codeColumn))));
|
|
86
89
|
codeLabel.element.classList.add('code-label');
|
|
87
|
-
const codeLink = templateDisposable.add(( new Link(
|
|
90
|
+
const codeLink = templateDisposable.add(( (new Link(
|
|
91
|
+
codeColumn,
|
|
92
|
+
{ href: '', label: '' },
|
|
93
|
+
{},
|
|
94
|
+
this.hoverService,
|
|
95
|
+
this.openerService
|
|
96
|
+
))));
|
|
88
97
|
return { codeColumn, sourceLabel, codeLabel, codeLink, templateDisposable };
|
|
89
98
|
}
|
|
90
99
|
renderElement(element, index, templateData, height) {
|
|
@@ -101,11 +110,11 @@ let MarkerCodeColumnRenderer = class MarkerCodeColumnRenderer {
|
|
|
101
110
|
templateData.codeColumn.classList.add('code-link');
|
|
102
111
|
templateData.codeColumn.title = `${element.marker.source} (${element.marker.code.value})`;
|
|
103
112
|
templateData.sourceLabel.set(element.marker.source, element.sourceMatches);
|
|
104
|
-
const codeLinkLabel = templateData.templateDisposable.add(( new HighlightedLabel($('.code-link-label'))));
|
|
113
|
+
const codeLinkLabel = templateData.templateDisposable.add(( (new HighlightedLabel($('.code-link-label')))));
|
|
105
114
|
codeLinkLabel.set(element.marker.code.value, element.codeMatches);
|
|
106
115
|
templateData.codeLink.link = {
|
|
107
|
-
href: ( element.marker.code.target.toString()),
|
|
108
|
-
title: ( element.marker.code.target.toString()),
|
|
116
|
+
href: ( (element.marker.code.target.toString())),
|
|
117
|
+
title: ( (element.marker.code.target.toString())),
|
|
109
118
|
label: codeLinkLabel.element,
|
|
110
119
|
};
|
|
111
120
|
}
|
|
@@ -119,9 +128,10 @@ let MarkerCodeColumnRenderer = class MarkerCodeColumnRenderer {
|
|
|
119
128
|
templateData.templateDisposable.dispose();
|
|
120
129
|
}
|
|
121
130
|
};
|
|
122
|
-
MarkerCodeColumnRenderer = MarkerCodeColumnRenderer_1 = ( __decorate([
|
|
123
|
-
( __param(0,
|
|
124
|
-
|
|
131
|
+
MarkerCodeColumnRenderer = MarkerCodeColumnRenderer_1 = ( (__decorate([
|
|
132
|
+
( (__param(0, IHoverService))),
|
|
133
|
+
( (__param(1, IOpenerService)))
|
|
134
|
+
], MarkerCodeColumnRenderer)));
|
|
125
135
|
class MarkerMessageColumnRenderer {
|
|
126
136
|
constructor() {
|
|
127
137
|
this.templateId = MarkerMessageColumnRenderer.TEMPLATE_ID;
|
|
@@ -129,7 +139,7 @@ class MarkerMessageColumnRenderer {
|
|
|
129
139
|
static { this.TEMPLATE_ID = 'message'; }
|
|
130
140
|
renderTemplate(container) {
|
|
131
141
|
const columnElement = append(container, $('.message'));
|
|
132
|
-
const highlightedLabel = ( new HighlightedLabel(columnElement));
|
|
142
|
+
const highlightedLabel = ( (new HighlightedLabel(columnElement)));
|
|
133
143
|
return { columnElement, highlightedLabel };
|
|
134
144
|
}
|
|
135
145
|
renderElement(element, index, templateData, height) {
|
|
@@ -149,9 +159,9 @@ let MarkerFileColumnRenderer = class MarkerFileColumnRenderer {
|
|
|
149
159
|
}
|
|
150
160
|
renderTemplate(container) {
|
|
151
161
|
const columnElement = append(container, $('.file'));
|
|
152
|
-
const fileLabel = ( new HighlightedLabel(columnElement));
|
|
162
|
+
const fileLabel = ( (new HighlightedLabel(columnElement)));
|
|
153
163
|
fileLabel.element.classList.add('file-label');
|
|
154
|
-
const positionLabel = ( new HighlightedLabel(columnElement));
|
|
164
|
+
const positionLabel = ( (new HighlightedLabel(columnElement)));
|
|
155
165
|
positionLabel.element.classList.add('file-position');
|
|
156
166
|
return { columnElement, fileLabel, positionLabel };
|
|
157
167
|
}
|
|
@@ -166,9 +176,9 @@ let MarkerFileColumnRenderer = class MarkerFileColumnRenderer {
|
|
|
166
176
|
templateData.positionLabel.dispose();
|
|
167
177
|
}
|
|
168
178
|
};
|
|
169
|
-
MarkerFileColumnRenderer = MarkerFileColumnRenderer_1 = ( __decorate([
|
|
170
|
-
( __param(0, ILabelService))
|
|
171
|
-
], MarkerFileColumnRenderer));
|
|
179
|
+
MarkerFileColumnRenderer = MarkerFileColumnRenderer_1 = ( (__decorate([
|
|
180
|
+
( (__param(0, ILabelService)))
|
|
181
|
+
], MarkerFileColumnRenderer)));
|
|
172
182
|
class MarkerOwnerColumnRenderer {
|
|
173
183
|
constructor() {
|
|
174
184
|
this.templateId = MarkerOwnerColumnRenderer.TEMPLATE_ID;
|
|
@@ -176,7 +186,7 @@ class MarkerOwnerColumnRenderer {
|
|
|
176
186
|
static { this.TEMPLATE_ID = 'owner'; }
|
|
177
187
|
renderTemplate(container) {
|
|
178
188
|
const columnElement = append(container, $('.owner'));
|
|
179
|
-
const highlightedLabel = ( new HighlightedLabel(columnElement));
|
|
189
|
+
const highlightedLabel = ( (new HighlightedLabel(columnElement)));
|
|
180
190
|
return { columnElement, highlightedLabel };
|
|
181
191
|
}
|
|
182
192
|
renderElement(element, index, templateData, height) {
|
|
@@ -207,7 +217,7 @@ let MarkersTable = class MarkersTable extends Disposable {
|
|
|
207
217
|
this.instantiationService = instantiationService;
|
|
208
218
|
this.labelService = labelService;
|
|
209
219
|
this._itemCount = 0;
|
|
210
|
-
this.table = this.instantiationService.createInstance(WorkbenchTable, 'Markers', this.container, ( new MarkersTableVirtualDelegate()), [
|
|
220
|
+
this.table = this.instantiationService.createInstance(WorkbenchTable, 'Markers', this.container, ( (new MarkersTableVirtualDelegate())), [
|
|
211
221
|
{
|
|
212
222
|
label: '',
|
|
213
223
|
tooltip: '',
|
|
@@ -218,11 +228,7 @@ let MarkersTable = class MarkersTable extends Disposable {
|
|
|
218
228
|
project(row) { return row; }
|
|
219
229
|
},
|
|
220
230
|
{
|
|
221
|
-
label: ( localizeWithPath(
|
|
222
|
-
'vs/workbench/contrib/markers/browser/markersTable',
|
|
223
|
-
'codeColumnLabel',
|
|
224
|
-
"Code"
|
|
225
|
-
)),
|
|
231
|
+
label: ( localizeWithPath(_moduleId, 0, "Code")),
|
|
226
232
|
tooltip: '',
|
|
227
233
|
weight: 1,
|
|
228
234
|
minimumWidth: 100,
|
|
@@ -231,33 +237,21 @@ let MarkersTable = class MarkersTable extends Disposable {
|
|
|
231
237
|
project(row) { return row; }
|
|
232
238
|
},
|
|
233
239
|
{
|
|
234
|
-
label: ( localizeWithPath(
|
|
235
|
-
'vs/workbench/contrib/markers/browser/markersTable',
|
|
236
|
-
'messageColumnLabel',
|
|
237
|
-
"Message"
|
|
238
|
-
)),
|
|
240
|
+
label: ( localizeWithPath(_moduleId, 1, "Message")),
|
|
239
241
|
tooltip: '',
|
|
240
242
|
weight: 4,
|
|
241
243
|
templateId: MarkerMessageColumnRenderer.TEMPLATE_ID,
|
|
242
244
|
project(row) { return row; }
|
|
243
245
|
},
|
|
244
246
|
{
|
|
245
|
-
label: ( localizeWithPath(
|
|
246
|
-
'vs/workbench/contrib/markers/browser/markersTable',
|
|
247
|
-
'fileColumnLabel',
|
|
248
|
-
"File"
|
|
249
|
-
)),
|
|
247
|
+
label: ( localizeWithPath(_moduleId, 2, "File")),
|
|
250
248
|
tooltip: '',
|
|
251
249
|
weight: 2,
|
|
252
250
|
templateId: MarkerFileColumnRenderer.TEMPLATE_ID,
|
|
253
251
|
project(row) { return row; }
|
|
254
252
|
},
|
|
255
253
|
{
|
|
256
|
-
label: ( localizeWithPath(
|
|
257
|
-
'vs/workbench/contrib/markers/browser/markersTable',
|
|
258
|
-
'sourceColumnLabel',
|
|
259
|
-
"Source"
|
|
260
|
-
)),
|
|
254
|
+
label: ( localizeWithPath(_moduleId, 3, "Source")),
|
|
261
255
|
tooltip: '',
|
|
262
256
|
weight: 1,
|
|
263
257
|
minimumWidth: 100,
|
|
@@ -273,12 +267,13 @@ let MarkersTable = class MarkersTable extends Disposable {
|
|
|
273
267
|
this.instantiationService.createInstance(MarkerOwnerColumnRenderer),
|
|
274
268
|
], options);
|
|
275
269
|
const list = this.table.domNode.querySelector('.monaco-list-rows');
|
|
276
|
-
const onRowHover = Event.chain(this._register(( new DomEmitter(list, 'mouseover'))).event, $ => ( ( $.map(
|
|
277
|
-
e => findParentWithClass(e.target, 'monaco-list-row', 'monaco-list-rows')
|
|
278
|
-
))
|
|
270
|
+
const onRowHover = Event.chain(this._register(( (new DomEmitter(list, 'mouseover')))).event, $ => ( (( ($.map(e => findParentWithClass(e.target, 'monaco-list-row', 'monaco-list-rows'))))
|
|
279
271
|
.filter(((e) => !!e))
|
|
280
|
-
.map(e => parseInt(e.getAttribute('data-index')))));
|
|
281
|
-
const onListLeave = ( Event.map(
|
|
272
|
+
.map(e => parseInt(e.getAttribute('data-index'))))));
|
|
273
|
+
const onListLeave = ( (Event.map(
|
|
274
|
+
this._register(( (new DomEmitter(list, 'mouseleave')))).event,
|
|
275
|
+
() => -1
|
|
276
|
+
)));
|
|
282
277
|
const onRowHoverOrLeave = Event.latch(Event.any(onRowHover, onListLeave));
|
|
283
278
|
const onRowPermanentHover = Event.debounce(onRowHoverOrLeave, (_, e) => e, 500);
|
|
284
279
|
this._register(onRowPermanentHover(e => {
|
|
@@ -312,7 +307,7 @@ let MarkersTable = class MarkersTable extends Disposable {
|
|
|
312
307
|
}
|
|
313
308
|
getFocus() {
|
|
314
309
|
const focus = this.table.getFocus();
|
|
315
|
-
return focus.length > 0 ? [...( focus.map(f => this.table.row(f)))] : [];
|
|
310
|
+
return focus.length > 0 ? [...( (focus.map(f => this.table.row(f))))] : [];
|
|
316
311
|
}
|
|
317
312
|
getHTMLElement() {
|
|
318
313
|
return this.table.getHTMLElement();
|
|
@@ -322,7 +317,7 @@ let MarkersTable = class MarkersTable extends Disposable {
|
|
|
322
317
|
}
|
|
323
318
|
getSelection() {
|
|
324
319
|
const selection = this.table.getSelection();
|
|
325
|
-
return selection.length > 0 ? [...( selection.map(i => this.table.row(i)))] : [];
|
|
320
|
+
return selection.length > 0 ? [...( (selection.map(i => this.table.row(i))))] : [];
|
|
326
321
|
}
|
|
327
322
|
getVisibleItemCount() {
|
|
328
323
|
return this._itemCount;
|
|
@@ -339,14 +334,14 @@ let MarkersTable = class MarkersTable extends Disposable {
|
|
|
339
334
|
const items = [];
|
|
340
335
|
for (const resourceMarker of this.resourceMarkers) {
|
|
341
336
|
for (const marker of resourceMarker.markers) {
|
|
342
|
-
if (( unsupportedSchemas.has(marker.resource.scheme))) {
|
|
337
|
+
if (( (unsupportedSchemas.has(marker.resource.scheme)))) {
|
|
343
338
|
continue;
|
|
344
339
|
}
|
|
345
340
|
if (this.filterOptions.excludesMatcher.matches(marker.resource)) {
|
|
346
341
|
continue;
|
|
347
342
|
}
|
|
348
343
|
if (this.filterOptions.includesMatcher.matches(marker.resource)) {
|
|
349
|
-
items.push(( new MarkerTableItem(marker)));
|
|
344
|
+
items.push(( (new MarkerTableItem(marker))));
|
|
350
345
|
continue;
|
|
351
346
|
}
|
|
352
347
|
const matchesSeverity = this.filterOptions.showErrors && MarkerSeverity.Error === marker.marker.severity ||
|
|
@@ -363,18 +358,18 @@ let MarkersTable = class MarkersTable extends Disposable {
|
|
|
363
358
|
const ownerMatches = FilterOptions._messageFilter(this.filterOptions.textFilter.text, marker.marker.owner) ?? undefined;
|
|
364
359
|
const matched = sourceMatches || codeMatches || messageMatches || fileMatches || ownerMatches;
|
|
365
360
|
if ((matched && !this.filterOptions.textFilter.negate) || (!matched && this.filterOptions.textFilter.negate)) {
|
|
366
|
-
items.push(( new MarkerTableItem(
|
|
361
|
+
items.push(( (new MarkerTableItem(
|
|
367
362
|
marker,
|
|
368
363
|
sourceMatches,
|
|
369
364
|
codeMatches,
|
|
370
365
|
messageMatches,
|
|
371
366
|
fileMatches,
|
|
372
367
|
ownerMatches
|
|
373
|
-
)));
|
|
368
|
+
))));
|
|
374
369
|
}
|
|
375
370
|
continue;
|
|
376
371
|
}
|
|
377
|
-
items.push(( new MarkerTableItem(marker)));
|
|
372
|
+
items.push(( (new MarkerTableItem(marker))));
|
|
378
373
|
}
|
|
379
374
|
}
|
|
380
375
|
this._itemCount = items.length;
|
|
@@ -420,9 +415,9 @@ let MarkersTable = class MarkersTable extends Disposable {
|
|
|
420
415
|
setMarkerSelection(selection, focus) {
|
|
421
416
|
if (this.isVisible()) {
|
|
422
417
|
if (selection && selection.length > 0) {
|
|
423
|
-
this.table.setSelection(( selection.map(m => this.findMarkerIndex(m))));
|
|
418
|
+
this.table.setSelection(( (selection.map(m => this.findMarkerIndex(m)))));
|
|
424
419
|
if (focus && focus.length > 0) {
|
|
425
|
-
this.table.setFocus(( focus.map(f => this.findMarkerIndex(f))));
|
|
420
|
+
this.table.setFocus(( (focus.map(f => this.findMarkerIndex(f)))));
|
|
426
421
|
}
|
|
427
422
|
else {
|
|
428
423
|
this.table.setFocus([this.findMarkerIndex(selection[0])]);
|
|
@@ -461,7 +456,7 @@ let MarkersTable = class MarkersTable extends Disposable {
|
|
|
461
456
|
const selectedElement = this.getSelection();
|
|
462
457
|
if (selectedElement && selectedElement.length > 0) {
|
|
463
458
|
if (selectedElement[0] instanceof Marker) {
|
|
464
|
-
if (( resource.has(selectedElement[0].marker.resource))) {
|
|
459
|
+
if (( (resource.has(selectedElement[0].marker.resource)))) {
|
|
465
460
|
return true;
|
|
466
461
|
}
|
|
467
462
|
}
|
|
@@ -469,9 +464,9 @@ let MarkersTable = class MarkersTable extends Disposable {
|
|
|
469
464
|
return false;
|
|
470
465
|
}
|
|
471
466
|
};
|
|
472
|
-
MarkersTable = ( __decorate([
|
|
473
|
-
( __param(5, IInstantiationService)),
|
|
474
|
-
( __param(6, ILabelService))
|
|
475
|
-
], MarkersTable));
|
|
467
|
+
MarkersTable = ( (__decorate([
|
|
468
|
+
( (__param(5, IInstantiationService))),
|
|
469
|
+
( (__param(6, ILabelService)))
|
|
470
|
+
], MarkersTable)));
|
|
476
471
|
|
|
477
472
|
export { MarkersTable };
|