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