@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
|
@@ -46,16 +46,19 @@ import { MarkersTable } from './markersTable.js';
|
|
|
46
46
|
import { Markers, MarkersContextKeys } from 'vscode/vscode/vs/workbench/contrib/markers/common/markers';
|
|
47
47
|
import { registerNavigableContainer } from 'vscode/vscode/vs/workbench/browser/actions/widgetNavigationCommands';
|
|
48
48
|
|
|
49
|
+
const _moduleId = "vs/workbench/contrib/markers/browser/markersView";
|
|
49
50
|
function createResourceMarkersIterator(resourceMarkers) {
|
|
50
|
-
return (
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
51
|
+
return (
|
|
52
|
+
(Iterable.map(resourceMarkers.markers, m => {
|
|
53
|
+
const relatedInformationIt = Iterable.from(m.relatedInformation);
|
|
54
|
+
const children = ( (Iterable.map(relatedInformationIt, r => ({ element: r }))));
|
|
55
|
+
return { element: m, children };
|
|
56
|
+
}))
|
|
57
|
+
);
|
|
55
58
|
}
|
|
56
59
|
let MarkersView = class MarkersView extends FilterViewPane {
|
|
57
60
|
constructor(options, instantiationService, viewDescriptorService, editorService, configurationService, telemetryService, markerService, contextKeyService, workspaceContextService, contextMenuService, uriIdentityService, keybindingService, storageService, openerService, themeService) {
|
|
58
|
-
const memento = ( new Memento(Markers.MARKERS_VIEW_STORAGE_ID, storageService));
|
|
61
|
+
const memento = ( (new Memento(Markers.MARKERS_VIEW_STORAGE_ID, storageService)));
|
|
59
62
|
const panelState = memento.getMemento(1 , 1 );
|
|
60
63
|
super({
|
|
61
64
|
...options,
|
|
@@ -73,8 +76,8 @@ let MarkersView = class MarkersView extends FilterViewPane {
|
|
|
73
76
|
this.uriIdentityService = uriIdentityService;
|
|
74
77
|
this.lastSelectedRelativeTop = 0;
|
|
75
78
|
this.currentActiveResource = null;
|
|
76
|
-
this.onVisibleDisposables = this._register(( new DisposableStore()));
|
|
77
|
-
this.widgetDisposables = this._register(( new DisposableStore()));
|
|
79
|
+
this.onVisibleDisposables = this._register(( (new DisposableStore())));
|
|
80
|
+
this.widgetDisposables = this._register(( (new DisposableStore())));
|
|
78
81
|
this.currentHeight = 0;
|
|
79
82
|
this.currentWidth = 0;
|
|
80
83
|
this.cachedFilterStats = undefined;
|
|
@@ -89,16 +92,16 @@ let MarkersView = class MarkersView extends FilterViewPane {
|
|
|
89
92
|
this.widgetAccessibilityProvider = instantiationService.createInstance(MarkersWidgetAccessibilityProvider);
|
|
90
93
|
this.widgetIdentityProvider = { getId(element) { return element.id; } };
|
|
91
94
|
this.setCurrentActiveEditor();
|
|
92
|
-
this.filter = ( new Filter(FilterOptions.EMPTY(uriIdentityService)));
|
|
95
|
+
this.filter = ( (new Filter(FilterOptions.EMPTY(uriIdentityService))));
|
|
93
96
|
this.rangeHighlightDecorations = this._register(this.instantiationService.createInstance(RangeHighlightDecorations));
|
|
94
|
-
this.filters = this._register(( new MarkersFilters({
|
|
97
|
+
this.filters = this._register(( (new MarkersFilters({
|
|
95
98
|
filterHistory: this.panelState['filterHistory'] || [],
|
|
96
99
|
showErrors: this.panelState['showErrors'] !== false,
|
|
97
100
|
showWarnings: this.panelState['showWarnings'] !== false,
|
|
98
101
|
showInfos: this.panelState['showInfos'] !== false,
|
|
99
102
|
excludedFiles: !!this.panelState['useFilesExclude'],
|
|
100
103
|
activeFile: !!this.panelState['activeFile'],
|
|
101
|
-
}, this.contextKeyService)));
|
|
104
|
+
}, this.contextKeyService))));
|
|
102
105
|
this._register(this.configurationService.onDidChangeConfiguration(e => {
|
|
103
106
|
if (this.filters.excludedFiles && e.affectsConfiguration('files.exclude')) {
|
|
104
107
|
this.updateFilter();
|
|
@@ -125,7 +128,7 @@ let MarkersView = class MarkersView extends FilterViewPane {
|
|
|
125
128
|
super.renderBody(parent);
|
|
126
129
|
parent.classList.add('markers-panel');
|
|
127
130
|
this._register(addDisposableListener(parent, 'keydown', e => {
|
|
128
|
-
if (this.keybindingService.mightProducePrintableCharacter(( new StandardKeyboardEvent(e)))) {
|
|
131
|
+
if (this.keybindingService.mightProducePrintableCharacter(( (new StandardKeyboardEvent(e))))) {
|
|
129
132
|
this.focusFilter();
|
|
130
133
|
}
|
|
131
134
|
}));
|
|
@@ -165,13 +168,7 @@ let MarkersView = class MarkersView extends FilterViewPane {
|
|
|
165
168
|
this.filterWidget.focus();
|
|
166
169
|
}
|
|
167
170
|
updateBadge(total, filtered) {
|
|
168
|
-
this.filterWidget.updateBadge(total === filtered || total === 0 ? undefined : ( localizeWithPath(
|
|
169
|
-
'vs/workbench/contrib/markers/browser/markersView',
|
|
170
|
-
'showing filtered problems',
|
|
171
|
-
"Showing {0} of {1}",
|
|
172
|
-
filtered,
|
|
173
|
-
total
|
|
174
|
-
)));
|
|
171
|
+
this.filterWidget.updateBadge(total === filtered || total === 0 ? undefined : ( localizeWithPath(_moduleId, 0, "Showing {0} of {1}", filtered, total)));
|
|
175
172
|
}
|
|
176
173
|
checkMoreFilters() {
|
|
177
174
|
this.filterWidget.checkMoreFilters(!this.filters.showErrors || !this.filters.showWarnings || !this.filters.showInfos || this.filters.excludedFiles || this.filters.activeFile);
|
|
@@ -251,14 +248,14 @@ let MarkersView = class MarkersView extends FilterViewPane {
|
|
|
251
248
|
this.widget.reset(this.getResourceMarkers());
|
|
252
249
|
}
|
|
253
250
|
updateFilter() {
|
|
254
|
-
this.filter.options = ( new FilterOptions(
|
|
251
|
+
this.filter.options = ( (new FilterOptions(
|
|
255
252
|
this.filterWidget.getFilterText(),
|
|
256
253
|
this.getFilesExcludeExpressions(),
|
|
257
254
|
this.filters.showWarnings,
|
|
258
255
|
this.filters.showErrors,
|
|
259
256
|
this.filters.showInfos,
|
|
260
257
|
this.uriIdentityService
|
|
261
|
-
));
|
|
258
|
+
)));
|
|
262
259
|
this.widget.filterMarkers(this.getResourceMarkers(), this.filter.options);
|
|
263
260
|
this.cachedFilterStats = undefined;
|
|
264
261
|
const { total, filtered } = this.getFilterStats();
|
|
@@ -283,9 +280,9 @@ let MarkersView = class MarkersView extends FilterViewPane {
|
|
|
283
280
|
}
|
|
284
281
|
const workspaceFolders = this.workspaceContextService.getWorkspace().folders;
|
|
285
282
|
return workspaceFolders.length
|
|
286
|
-
? ( workspaceFolders.map(
|
|
283
|
+
? ( (workspaceFolders.map(
|
|
287
284
|
workspaceFolder => ({ root: workspaceFolder.uri, expression: this.getFilesExclude(workspaceFolder.uri) })
|
|
288
|
-
))
|
|
285
|
+
)))
|
|
289
286
|
: this.getFilesExclude();
|
|
290
287
|
}
|
|
291
288
|
getFilesExclude(resource) {
|
|
@@ -318,8 +315,8 @@ let MarkersView = class MarkersView extends FilterViewPane {
|
|
|
318
315
|
const markerFocusContextKey = MarkersContextKeys.MarkerFocusContextKey.bindTo(this.widget.contextKeyService);
|
|
319
316
|
const relatedInformationFocusContextKey = MarkersContextKeys.RelatedInformationFocusContextKey.bindTo(this.widget.contextKeyService);
|
|
320
317
|
this.widgetDisposables.add(this.widget.onDidChangeFocus(focus => {
|
|
321
|
-
markerFocusContextKey.set(( focus.elements.some(e => e instanceof Marker)));
|
|
322
|
-
relatedInformationFocusContextKey.set(( focus.elements.some(e => e instanceof RelatedInformation)));
|
|
318
|
+
markerFocusContextKey.set(( (focus.elements.some(e => e instanceof Marker))));
|
|
319
|
+
relatedInformationFocusContextKey.set(( (focus.elements.some(e => e instanceof RelatedInformation))));
|
|
323
320
|
}));
|
|
324
321
|
this.widgetDisposables.add(Event.debounce(this.widget.onDidOpen, (last, event) => event, 75, true)(options => {
|
|
325
322
|
this.openFileAtElement(options.element, !!options.editorOptions.preserveFocus, options.sideBySide, !!options.editorOptions.pinned);
|
|
@@ -353,9 +350,9 @@ let MarkersView = class MarkersView extends FilterViewPane {
|
|
|
353
350
|
return table;
|
|
354
351
|
}
|
|
355
352
|
createTree(parent) {
|
|
356
|
-
const onDidChangeRenderNodeCount = ( new Relay());
|
|
353
|
+
const onDidChangeRenderNodeCount = ( (new Relay()));
|
|
357
354
|
const treeLabels = this.instantiationService.createInstance(ResourceLabels, this);
|
|
358
|
-
const virtualDelegate = ( new VirtualDelegate(this.markersViewModel));
|
|
355
|
+
const virtualDelegate = ( (new VirtualDelegate(this.markersViewModel)));
|
|
359
356
|
const renderers = [
|
|
360
357
|
this.instantiationService.createInstance(ResourceMarkersRenderer, treeLabels, onDidChangeRenderNodeCount.event),
|
|
361
358
|
this.instantiationService.createInstance(MarkerRenderer, this.markersViewModel),
|
|
@@ -408,13 +405,13 @@ let MarkersView = class MarkersView extends FilterViewPane {
|
|
|
408
405
|
reInitialize() {
|
|
409
406
|
const disposables = [];
|
|
410
407
|
const readMarkers = (resource) => this.markerService.read({ resource, severities: MarkerSeverity.Error | MarkerSeverity.Warning | MarkerSeverity.Info });
|
|
411
|
-
this.markersModel.setResourceMarkers(( groupBy(readMarkers(), compareMarkersByUri).map(group => [group[0].resource, group])));
|
|
408
|
+
this.markersModel.setResourceMarkers(( (groupBy(readMarkers(), compareMarkersByUri).map(group => [group[0].resource, group]))));
|
|
412
409
|
disposables.push(Event.debounce(this.markerService.onMarkerChanged, (resourcesMap, resources) => {
|
|
413
|
-
resourcesMap = resourcesMap || ( new ResourceMap());
|
|
410
|
+
resourcesMap = resourcesMap || ( (new ResourceMap()));
|
|
414
411
|
resources.forEach(resource => resourcesMap.set(resource, resource));
|
|
415
412
|
return resourcesMap;
|
|
416
413
|
}, 64)(resourcesMap => {
|
|
417
|
-
this.markersModel.setResourceMarkers(( [...( resourcesMap.values())].map(resource => [resource, readMarkers(resource)])));
|
|
414
|
+
this.markersModel.setResourceMarkers(( ([...( (resourcesMap.values()))].map(resource => [resource, readMarkers(resource)]))));
|
|
418
415
|
}));
|
|
419
416
|
disposables.push(Event.any(this.markersModel.onDidChange, this.editorService.onDidActiveEditorChange)(changes => {
|
|
420
417
|
if (changes) {
|
|
@@ -467,7 +464,7 @@ let MarkersView = class MarkersView extends FilterViewPane {
|
|
|
467
464
|
this.widgetContainer.textContent = '';
|
|
468
465
|
this.widgetDisposables.clear();
|
|
469
466
|
}
|
|
470
|
-
const selection = ( new Set());
|
|
467
|
+
const selection = ( (new Set()));
|
|
471
468
|
for (const marker of this.widget.getSelection()) {
|
|
472
469
|
if (marker instanceof ResourceMarkers) {
|
|
473
470
|
marker.markers.forEach(m => selection.add(m));
|
|
@@ -476,7 +473,7 @@ let MarkersView = class MarkersView extends FilterViewPane {
|
|
|
476
473
|
selection.add(marker);
|
|
477
474
|
}
|
|
478
475
|
}
|
|
479
|
-
const focus = ( new Set());
|
|
476
|
+
const focus = ( (new Set()));
|
|
480
477
|
for (const marker of this.widget.getFocus()) {
|
|
481
478
|
if (marker instanceof Marker || marker instanceof MarkerTableItem) {
|
|
482
479
|
focus.add(marker);
|
|
@@ -498,7 +495,11 @@ let MarkersView = class MarkersView extends FilterViewPane {
|
|
|
498
495
|
if (resourceForCurrentActiveResource) {
|
|
499
496
|
return false;
|
|
500
497
|
}
|
|
501
|
-
return (
|
|
498
|
+
return (
|
|
499
|
+
(changedResources.some(
|
|
500
|
+
r => ( (r.toString())) === ( (currentlyActiveResource.toString()))
|
|
501
|
+
))
|
|
502
|
+
);
|
|
502
503
|
}
|
|
503
504
|
onActiveEditorChanged() {
|
|
504
505
|
this.setCurrentActiveEditor();
|
|
@@ -551,21 +552,10 @@ let MarkersView = class MarkersView extends FilterViewPane {
|
|
|
551
552
|
else {
|
|
552
553
|
this.messageBoxContainer.style.display = 'none';
|
|
553
554
|
if (filtered === total) {
|
|
554
|
-
this.setAriaLabel(( localizeWithPath(
|
|
555
|
-
'vs/workbench/contrib/markers/browser/markersView',
|
|
556
|
-
'No problems filtered',
|
|
557
|
-
"Showing {0} problems",
|
|
558
|
-
total
|
|
559
|
-
)));
|
|
555
|
+
this.setAriaLabel(( localizeWithPath(_moduleId, 1, "Showing {0} problems", total)));
|
|
560
556
|
}
|
|
561
557
|
else {
|
|
562
|
-
this.setAriaLabel(( localizeWithPath(
|
|
563
|
-
'vs/workbench/contrib/markers/browser/markersView',
|
|
564
|
-
'problems filtered',
|
|
565
|
-
"Showing {0} of {1} problems",
|
|
566
|
-
filtered,
|
|
567
|
-
total
|
|
568
|
-
)));
|
|
558
|
+
this.setAriaLabel(( localizeWithPath(_moduleId, 2, "Showing {0} of {1} problems", filtered, total)));
|
|
569
559
|
}
|
|
570
560
|
this.messageBoxContainer.removeAttribute('tabIndex');
|
|
571
561
|
}
|
|
@@ -582,11 +572,7 @@ let MarkersView = class MarkersView extends FilterViewPane {
|
|
|
582
572
|
const span1 = append(container, $('span'));
|
|
583
573
|
span1.textContent = Messages.MARKERS_PANEL_NO_PROBLEMS_FILTERS;
|
|
584
574
|
const link = append(container, $('a.messageAction'));
|
|
585
|
-
link.textContent = ( localizeWithPath(
|
|
586
|
-
'vs/workbench/contrib/markers/browser/markersView',
|
|
587
|
-
'clearFilter',
|
|
588
|
-
"Clear Filters"
|
|
589
|
-
));
|
|
575
|
+
link.textContent = ( localizeWithPath(_moduleId, 3, "Clear Filters"));
|
|
590
576
|
link.setAttribute('tabIndex', '0');
|
|
591
577
|
const span2 = append(container, $('span'));
|
|
592
578
|
span2.textContent = '.';
|
|
@@ -665,7 +651,9 @@ let MarkersView = class MarkersView extends FilterViewPane {
|
|
|
665
651
|
getActionViewItem: (action) => {
|
|
666
652
|
const keybinding = this.keybindingService.lookupKeybinding(action.id);
|
|
667
653
|
if (keybinding) {
|
|
668
|
-
return (
|
|
654
|
+
return (
|
|
655
|
+
(new ActionViewItem(action, action, { label: true, keybinding: keybinding.getLabel() }))
|
|
656
|
+
);
|
|
669
657
|
}
|
|
670
658
|
return undefined;
|
|
671
659
|
},
|
|
@@ -684,7 +672,7 @@ let MarkersView = class MarkersView extends FilterViewPane {
|
|
|
684
672
|
const quickFixActions = viewModel.quickFixAction.quickFixes;
|
|
685
673
|
if (quickFixActions.length) {
|
|
686
674
|
result.push(...quickFixActions);
|
|
687
|
-
result.push(( new Separator()));
|
|
675
|
+
result.push(( (new Separator())));
|
|
688
676
|
}
|
|
689
677
|
}
|
|
690
678
|
}
|
|
@@ -745,22 +733,22 @@ let MarkersView = class MarkersView extends FilterViewPane {
|
|
|
745
733
|
super.dispose();
|
|
746
734
|
}
|
|
747
735
|
};
|
|
748
|
-
MarkersView = ( __decorate([
|
|
749
|
-
( __param(1, IInstantiationService)),
|
|
750
|
-
( __param(2, IViewDescriptorService)),
|
|
751
|
-
( __param(3, IEditorService)),
|
|
752
|
-
( __param(4, IConfigurationService)),
|
|
753
|
-
( __param(5, ITelemetryService)),
|
|
754
|
-
( __param(6, IMarkerService)),
|
|
755
|
-
( __param(7, IContextKeyService)),
|
|
756
|
-
( __param(8, IWorkspaceContextService)),
|
|
757
|
-
( __param(9, IContextMenuService)),
|
|
758
|
-
( __param(10, IUriIdentityService)),
|
|
759
|
-
( __param(11, IKeybindingService)),
|
|
760
|
-
( __param(12, IStorageService)),
|
|
761
|
-
( __param(13, IOpenerService)),
|
|
762
|
-
( __param(14, IThemeService))
|
|
763
|
-
], MarkersView));
|
|
736
|
+
MarkersView = ( (__decorate([
|
|
737
|
+
( (__param(1, IInstantiationService))),
|
|
738
|
+
( (__param(2, IViewDescriptorService))),
|
|
739
|
+
( (__param(3, IEditorService))),
|
|
740
|
+
( (__param(4, IConfigurationService))),
|
|
741
|
+
( (__param(5, ITelemetryService))),
|
|
742
|
+
( (__param(6, IMarkerService))),
|
|
743
|
+
( (__param(7, IContextKeyService))),
|
|
744
|
+
( (__param(8, IWorkspaceContextService))),
|
|
745
|
+
( (__param(9, IContextMenuService))),
|
|
746
|
+
( (__param(10, IUriIdentityService))),
|
|
747
|
+
( (__param(11, IKeybindingService))),
|
|
748
|
+
( (__param(12, IStorageService))),
|
|
749
|
+
( (__param(13, IOpenerService))),
|
|
750
|
+
( (__param(14, IThemeService)))
|
|
751
|
+
], MarkersView)));
|
|
764
752
|
let MarkersTree = class MarkersTree extends WorkbenchObjectTree {
|
|
765
753
|
constructor(user, container, delegate, renderers, options, instantiationService, contextKeyService, listService, themeService, configurationService) {
|
|
766
754
|
super(user, container, delegate, renderers, options, instantiationService, contextKeyService, listService, configurationService);
|
|
@@ -797,10 +785,10 @@ let MarkersTree = class MarkersTree extends WorkbenchObjectTree {
|
|
|
797
785
|
this.container.classList.toggle('hidden', hide);
|
|
798
786
|
}
|
|
799
787
|
reset(resourceMarkers) {
|
|
800
|
-
this.setChildren(null, ( Iterable.map(
|
|
788
|
+
this.setChildren(null, ( (Iterable.map(
|
|
801
789
|
resourceMarkers,
|
|
802
790
|
m => ({ element: m, children: createResourceMarkersIterator(m) })
|
|
803
|
-
)));
|
|
791
|
+
))));
|
|
804
792
|
}
|
|
805
793
|
revealMarkers(activeResource, focus, lastSelectedRelativeTop) {
|
|
806
794
|
if (activeResource) {
|
|
@@ -832,9 +820,9 @@ let MarkersTree = class MarkersTree extends WorkbenchObjectTree {
|
|
|
832
820
|
setMarkerSelection(selection, focus) {
|
|
833
821
|
if (this.isVisible()) {
|
|
834
822
|
if (selection && selection.length > 0) {
|
|
835
|
-
this.setSelection(( selection.map(m => this.findMarkerNode(m))));
|
|
823
|
+
this.setSelection(( (selection.map(m => this.findMarkerNode(m)))));
|
|
836
824
|
if (focus && focus.length > 0) {
|
|
837
|
-
this.setFocus(( focus.map(f => this.findMarkerNode(f))));
|
|
825
|
+
this.setFocus(( (focus.map(f => this.findMarkerNode(f)))));
|
|
838
826
|
}
|
|
839
827
|
else {
|
|
840
828
|
this.setFocus([this.findMarkerNode(selection[0])]);
|
|
@@ -880,7 +868,7 @@ let MarkersTree = class MarkersTree extends WorkbenchObjectTree {
|
|
|
880
868
|
const selectedElement = this.getSelection();
|
|
881
869
|
if (selectedElement && selectedElement.length > 0) {
|
|
882
870
|
if (selectedElement[0] instanceof Marker) {
|
|
883
|
-
if (( resource.has(selectedElement[0].marker.resource))) {
|
|
871
|
+
if (( (resource.has(selectedElement[0].marker.resource)))) {
|
|
884
872
|
return true;
|
|
885
873
|
}
|
|
886
874
|
}
|
|
@@ -895,12 +883,12 @@ let MarkersTree = class MarkersTree extends WorkbenchObjectTree {
|
|
|
895
883
|
super.layout(height, width);
|
|
896
884
|
}
|
|
897
885
|
};
|
|
898
|
-
MarkersTree = ( __decorate([
|
|
899
|
-
( __param(5, IInstantiationService)),
|
|
900
|
-
( __param(6, IContextKeyService)),
|
|
901
|
-
( __param(7, IListService)),
|
|
902
|
-
( __param(8, IThemeService)),
|
|
903
|
-
( __param(9, IConfigurationService))
|
|
904
|
-
], MarkersTree));
|
|
886
|
+
MarkersTree = ( (__decorate([
|
|
887
|
+
( (__param(5, IInstantiationService))),
|
|
888
|
+
( (__param(6, IContextKeyService))),
|
|
889
|
+
( (__param(7, IListService))),
|
|
890
|
+
( (__param(8, IThemeService))),
|
|
891
|
+
( (__param(9, IConfigurationService)))
|
|
892
|
+
], MarkersTree)));
|
|
905
893
|
|
|
906
894
|
export { MarkersView };
|