@codingame/monaco-vscode-markers-service-override 4.5.1 → 5.0.0

package/vscode/src/vs/workbench/contrib/markers/browser/markersView.js

@@ -45,17 +45,21 @@ import { ResourceListDnDHandler } from 'vscode/vscode/vs/workbench/browser/dnd';
 import { MarkersTable } from './markersTable.js';
 import { Markers, MarkersContextKeys } from 'vscode/vscode/vs/workbench/contrib/markers/common/markers';
 import { registerNavigableContainer } from 'vscode/vscode/vs/workbench/browser/actions/widgetNavigationCommands';
+import { IHoverService } from 'vscode/vscode/vs/platform/hover/browser/hover.service';
 
+const _moduleId = "vs/workbench/contrib/markers/browser/markersView";
 function createResourceMarkersIterator(resourceMarkers) {
-    return ( Iterable.map(resourceMarkers.markers, m => {
-        const relatedInformationIt = Iterable.from(m.relatedInformation);
-        const children = ( Iterable.map(relatedInformationIt, r => ({ element: r })));
-        return { element: m, children };
-    }));
+    return (
+         (Iterable.map(resourceMarkers.markers, m => {
+            const relatedInformationIt = Iterable.from(m.relatedInformation);
+            const children = ( (Iterable.map(relatedInformationIt, r => ({ element: r }))));
+            return { element: m, children };
+        }))
+    );
 }
 let MarkersView = class MarkersView extends FilterViewPane {
-    constructor(options, instantiationService, viewDescriptorService, editorService, configurationService, telemetryService, markerService, contextKeyService, workspaceContextService, contextMenuService, uriIdentityService, keybindingService, storageService, openerService, themeService) {
-        const memento = ( new Memento(Markers.MARKERS_VIEW_STORAGE_ID, storageService));
+    constructor(options, instantiationService, viewDescriptorService, editorService, configurationService, telemetryService, markerService, contextKeyService, workspaceContextService, contextMenuService, uriIdentityService, keybindingService, storageService, openerService, themeService, hoverService) {
+        const memento = ( (new Memento(Markers.MARKERS_VIEW_STORAGE_ID, storageService)));
         const panelState = memento.getMemento(1 , 1 );
         super({
             ...options,
@@ -66,15 +70,15 @@ let MarkersView = class MarkersView extends FilterViewPane {
                 text: panelState['filter'] || '',
                 history: panelState['filterHistory'] || []
             }
-        }, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService);
+        }, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService, hoverService);
         this.editorService = editorService;
         this.markerService = markerService;
         this.workspaceContextService = workspaceContextService;
         this.uriIdentityService = uriIdentityService;
         this.lastSelectedRelativeTop = 0;
         this.currentActiveResource = null;
-        this.onVisibleDisposables = this._register(( new DisposableStore()));
-        this.widgetDisposables = this._register(( new DisposableStore()));
+        this.onVisibleDisposables = this._register(( (new DisposableStore())));
+        this.widgetDisposables = this._register(( (new DisposableStore())));
         this.currentHeight = 0;
         this.currentWidth = 0;
         this.cachedFilterStats = undefined;
@@ -89,16 +93,16 @@ let MarkersView = class MarkersView extends FilterViewPane {
         this.widgetAccessibilityProvider = instantiationService.createInstance(MarkersWidgetAccessibilityProvider);
         this.widgetIdentityProvider = { getId(element) { return element.id; } };
         this.setCurrentActiveEditor();
-        this.filter = ( new Filter(FilterOptions.EMPTY(uriIdentityService)));
+        this.filter = ( (new Filter(FilterOptions.EMPTY(uriIdentityService))));
         this.rangeHighlightDecorations = this._register(this.instantiationService.createInstance(RangeHighlightDecorations));
-        this.filters = this._register(( new MarkersFilters({
+        this.filters = this._register(( (new MarkersFilters({
             filterHistory: this.panelState['filterHistory'] || [],
             showErrors: this.panelState['showErrors'] !== false,
             showWarnings: this.panelState['showWarnings'] !== false,
             showInfos: this.panelState['showInfos'] !== false,
             excludedFiles: !!this.panelState['useFilesExclude'],
             activeFile: !!this.panelState['activeFile'],
-        }, this.contextKeyService)));
+        }, this.contextKeyService))));
         this._register(this.configurationService.onDidChangeConfiguration(e => {
             if (this.filters.excludedFiles && e.affectsConfiguration('files.exclude')) {
                 this.updateFilter();
@@ -108,6 +112,7 @@ let MarkersView = class MarkersView extends FilterViewPane {
     render() {
         super.render();
         this._register(registerNavigableContainer({
+            name: 'markersView',
             focusNotifiers: [this, this.filterWidget],
             focusNextWidget: () => {
                 if (this.filterWidget.hasFocus()) {
@@ -125,9 +130,15 @@ let MarkersView = class MarkersView extends FilterViewPane {
         super.renderBody(parent);
         parent.classList.add('markers-panel');
         this._register(addDisposableListener(parent, 'keydown', e => {
-            if (this.keybindingService.mightProducePrintableCharacter(( new StandardKeyboardEvent(e)))) {
-                this.focusFilter();
+            const event = ( (new StandardKeyboardEvent(e)));
+            if (!this.keybindingService.mightProducePrintableCharacter(event)) {
+                return;
             }
+            const result = this.keybindingService.softDispatch(event, event.target);
+            if (result.kind === 1  || result.kind === 2 ) {
+                return;
+            }
+            this.focusFilter();
         }));
         const panelContainer = append(parent, $('.markers-panel-container'));
         this.createArialLabelElement(panelContainer);
@@ -165,13 +176,7 @@ let MarkersView = class MarkersView extends FilterViewPane {
         this.filterWidget.focus();
     }
     updateBadge(total, filtered) {
-        this.filterWidget.updateBadge(total === filtered || total === 0 ? undefined : ( localizeWithPath(
-            'vs/workbench/contrib/markers/browser/markersView',
-            'showing filtered problems',
-            "Showing {0} of {1}",
-            filtered,
-            total
-        )));
+        this.filterWidget.updateBadge(total === filtered || total === 0 ? undefined : ( localizeWithPath(_moduleId, 0, "Showing {0} of {1}", filtered, total)));
     }
     checkMoreFilters() {
         this.filterWidget.checkMoreFilters(!this.filters.showErrors || !this.filters.showWarnings || !this.filters.showInfos || this.filters.excludedFiles || this.filters.activeFile);
@@ -251,14 +256,14 @@ let MarkersView = class MarkersView extends FilterViewPane {
         this.widget.reset(this.getResourceMarkers());
     }
     updateFilter() {
-        this.filter.options = ( new FilterOptions(
+        this.filter.options = ( (new FilterOptions(
             this.filterWidget.getFilterText(),
             this.getFilesExcludeExpressions(),
             this.filters.showWarnings,
             this.filters.showErrors,
             this.filters.showInfos,
             this.uriIdentityService
-        ));
+        )));
         this.widget.filterMarkers(this.getResourceMarkers(), this.filter.options);
         this.cachedFilterStats = undefined;
         const { total, filtered } = this.getFilterStats();
@@ -283,9 +288,9 @@ let MarkersView = class MarkersView extends FilterViewPane {
         }
         const workspaceFolders = this.workspaceContextService.getWorkspace().folders;
         return workspaceFolders.length
-            ? ( workspaceFolders.map(
+            ? ( (workspaceFolders.map(
             workspaceFolder => ({ root: workspaceFolder.uri, expression: this.getFilesExclude(workspaceFolder.uri) })
-        ))
+        )))
             : this.getFilesExclude();
     }
     getFilesExclude(resource) {
@@ -318,8 +323,8 @@ let MarkersView = class MarkersView extends FilterViewPane {
         const markerFocusContextKey = MarkersContextKeys.MarkerFocusContextKey.bindTo(this.widget.contextKeyService);
         const relatedInformationFocusContextKey = MarkersContextKeys.RelatedInformationFocusContextKey.bindTo(this.widget.contextKeyService);
         this.widgetDisposables.add(this.widget.onDidChangeFocus(focus => {
-            markerFocusContextKey.set(( focus.elements.some(e => e instanceof Marker)));
-            relatedInformationFocusContextKey.set(( focus.elements.some(e => e instanceof RelatedInformation)));
+            markerFocusContextKey.set(( (focus.elements.some(e => e instanceof Marker))));
+            relatedInformationFocusContextKey.set(( (focus.elements.some(e => e instanceof RelatedInformation))));
         }));
         this.widgetDisposables.add(Event.debounce(this.widget.onDidOpen, (last, event) => event, 75, true)(options => {
             this.openFileAtElement(options.element, !!options.editorOptions.preserveFocus, options.sideBySide, !!options.editorOptions.pinned);
@@ -353,9 +358,9 @@ let MarkersView = class MarkersView extends FilterViewPane {
         return table;
     }
     createTree(parent) {
-        const onDidChangeRenderNodeCount = ( new Relay());
+        const onDidChangeRenderNodeCount = ( (new Relay()));
         const treeLabels = this.instantiationService.createInstance(ResourceLabels, this);
-        const virtualDelegate = ( new VirtualDelegate(this.markersViewModel));
+        const virtualDelegate = ( (new VirtualDelegate(this.markersViewModel)));
         const renderers = [
             this.instantiationService.createInstance(ResourceMarkersRenderer, treeLabels, onDidChangeRenderNodeCount.event),
             this.instantiationService.createInstance(MarkerRenderer, this.markersViewModel),
@@ -378,9 +383,7 @@ let MarkersView = class MarkersView extends FilterViewPane {
                 return null;
             }),
             expandOnlyOnTwistieClick: (e) => e instanceof Marker && e.relatedInformation.length > 0,
-            overrideStyles: {
-                listBackground: this.getBackgroundColor()
-            },
+            overrideStyles: this.getLocationBasedColors().listOverrideStyles,
             selectionNavigation: true,
             multipleSelectionSupport: true,
         });
@@ -408,13 +411,13 @@ let MarkersView = class MarkersView extends FilterViewPane {
     reInitialize() {
         const disposables = [];
         const readMarkers = (resource) => this.markerService.read({ resource, severities: MarkerSeverity.Error | MarkerSeverity.Warning | MarkerSeverity.Info });
-        this.markersModel.setResourceMarkers(( groupBy(readMarkers(), compareMarkersByUri).map(group => [group[0].resource, group])));
+        this.markersModel.setResourceMarkers(( (groupBy(readMarkers(), compareMarkersByUri).map(group => [group[0].resource, group]))));
         disposables.push(Event.debounce(this.markerService.onMarkerChanged, (resourcesMap, resources) => {
-            resourcesMap = resourcesMap || ( new ResourceMap());
+            resourcesMap = resourcesMap || ( (new ResourceMap()));
             resources.forEach(resource => resourcesMap.set(resource, resource));
             return resourcesMap;
         }, 64)(resourcesMap => {
-            this.markersModel.setResourceMarkers(( [...( resourcesMap.values())].map(resource => [resource, readMarkers(resource)])));
+            this.markersModel.setResourceMarkers(( ([...( (resourcesMap.values()))].map(resource => [resource, readMarkers(resource)]))));
         }));
         disposables.push(Event.any(this.markersModel.onDidChange, this.editorService.onDidActiveEditorChange)(changes => {
             if (changes) {
@@ -467,7 +470,7 @@ let MarkersView = class MarkersView extends FilterViewPane {
             this.widgetContainer.textContent = '';
             this.widgetDisposables.clear();
         }
-        const selection = ( new Set());
+        const selection = ( (new Set()));
         for (const marker of this.widget.getSelection()) {
             if (marker instanceof ResourceMarkers) {
                 marker.markers.forEach(m => selection.add(m));
@@ -476,7 +479,7 @@ let MarkersView = class MarkersView extends FilterViewPane {
                 selection.add(marker);
             }
         }
-        const focus = ( new Set());
+        const focus = ( (new Set()));
         for (const marker of this.widget.getFocus()) {
             if (marker instanceof Marker || marker instanceof MarkerTableItem) {
                 focus.add(marker);
@@ -498,7 +501,11 @@ let MarkersView = class MarkersView extends FilterViewPane {
         if (resourceForCurrentActiveResource) {
             return false;
         }
-        return ( changedResources.some(r => ( r.toString()) === ( currentlyActiveResource.toString())));
+        return (
+             (changedResources.some(
+                r => ( (r.toString())) === ( (currentlyActiveResource.toString()))
+            ))
+        );
     }
     onActiveEditorChanged() {
         this.setCurrentActiveEditor();
@@ -551,21 +558,10 @@ let MarkersView = class MarkersView extends FilterViewPane {
         else {
             this.messageBoxContainer.style.display = 'none';
             if (filtered === total) {
-                this.setAriaLabel(( localizeWithPath(
-                    'vs/workbench/contrib/markers/browser/markersView',
-                    'No problems filtered',
-                    "Showing {0} problems",
-                    total
-                )));
+                this.setAriaLabel(( localizeWithPath(_moduleId, 1, "Showing {0} problems", total)));
             }
             else {
-                this.setAriaLabel(( localizeWithPath(
-                    'vs/workbench/contrib/markers/browser/markersView',
-                    'problems filtered',
-                    "Showing {0} of {1} problems",
-                    filtered,
-                    total
-                )));
+                this.setAriaLabel(( localizeWithPath(_moduleId, 2, "Showing {0} of {1} problems", filtered, total)));
             }
             this.messageBoxContainer.removeAttribute('tabIndex');
         }
@@ -582,11 +578,7 @@ let MarkersView = class MarkersView extends FilterViewPane {
         const span1 = append(container, $('span'));
         span1.textContent = Messages.MARKERS_PANEL_NO_PROBLEMS_FILTERS;
         const link = append(container, $('a.messageAction'));
-        link.textContent = ( localizeWithPath(
-            'vs/workbench/contrib/markers/browser/markersView',
-            'clearFilter',
-            "Clear Filters"
-        ));
+        link.textContent = ( localizeWithPath(_moduleId, 3, "Clear Filters"));
         link.setAttribute('tabIndex', '0');
         const span2 = append(container, $('span'));
         span2.textContent = '.';
@@ -665,7 +657,9 @@ let MarkersView = class MarkersView extends FilterViewPane {
             getActionViewItem: (action) => {
                 const keybinding = this.keybindingService.lookupKeybinding(action.id);
                 if (keybinding) {
-                    return ( new ActionViewItem(action, action, { label: true, keybinding: keybinding.getLabel() }));
+                    return (
+                         (new ActionViewItem(action, action, { label: true, keybinding: keybinding.getLabel() }))
+                    );
                 }
                 return undefined;
             },
@@ -684,7 +678,7 @@ let MarkersView = class MarkersView extends FilterViewPane {
                 const quickFixActions = viewModel.quickFixAction.quickFixes;
                 if (quickFixActions.length) {
                     result.push(...quickFixActions);
-                    result.push(( new Separator()));
+                    result.push(( (new Separator())));
                 }
             }
         }
@@ -745,22 +739,23 @@ let MarkersView = class MarkersView extends FilterViewPane {
         super.dispose();
     }
 };
-MarkersView = ( __decorate([
-    ( __param(1, IInstantiationService)),
-    ( __param(2, IViewDescriptorService)),
-    ( __param(3, IEditorService)),
-    ( __param(4, IConfigurationService)),
-    ( __param(5, ITelemetryService)),
-    ( __param(6, IMarkerService)),
-    ( __param(7, IContextKeyService)),
-    ( __param(8, IWorkspaceContextService)),
-    ( __param(9, IContextMenuService)),
-    ( __param(10, IUriIdentityService)),
-    ( __param(11, IKeybindingService)),
-    ( __param(12, IStorageService)),
-    ( __param(13, IOpenerService)),
-    ( __param(14, IThemeService))
-], MarkersView));
+MarkersView = ( (__decorate([
+    ( (__param(1, IInstantiationService))),
+    ( (__param(2, IViewDescriptorService))),
+    ( (__param(3, IEditorService))),
+    ( (__param(4, IConfigurationService))),
+    ( (__param(5, ITelemetryService))),
+    ( (__param(6, IMarkerService))),
+    ( (__param(7, IContextKeyService))),
+    ( (__param(8, IWorkspaceContextService))),
+    ( (__param(9, IContextMenuService))),
+    ( (__param(10, IUriIdentityService))),
+    ( (__param(11, IKeybindingService))),
+    ( (__param(12, IStorageService))),
+    ( (__param(13, IOpenerService))),
+    ( (__param(14, IThemeService))),
+    ( (__param(15, IHoverService)))
+], MarkersView)));
 let MarkersTree = class MarkersTree extends WorkbenchObjectTree {
     constructor(user, container, delegate, renderers, options, instantiationService, contextKeyService, listService, themeService, configurationService) {
         super(user, container, delegate, renderers, options, instantiationService, contextKeyService, listService, configurationService);
@@ -797,10 +792,10 @@ let MarkersTree = class MarkersTree extends WorkbenchObjectTree {
         this.container.classList.toggle('hidden', hide);
     }
     reset(resourceMarkers) {
-        this.setChildren(null, ( Iterable.map(
+        this.setChildren(null, ( (Iterable.map(
             resourceMarkers,
             m => ({ element: m, children: createResourceMarkersIterator(m) })
-        )));
+        ))));
     }
     revealMarkers(activeResource, focus, lastSelectedRelativeTop) {
         if (activeResource) {
@@ -832,9 +827,9 @@ let MarkersTree = class MarkersTree extends WorkbenchObjectTree {
     setMarkerSelection(selection, focus) {
         if (this.isVisible()) {
             if (selection && selection.length > 0) {
-                this.setSelection(( selection.map(m => this.findMarkerNode(m))));
+                this.setSelection(( (selection.map(m => this.findMarkerNode(m)))));
                 if (focus && focus.length > 0) {
-                    this.setFocus(( focus.map(f => this.findMarkerNode(f))));
+                    this.setFocus(( (focus.map(f => this.findMarkerNode(f)))));
                 }
                 else {
                     this.setFocus([this.findMarkerNode(selection[0])]);
@@ -880,7 +875,7 @@ let MarkersTree = class MarkersTree extends WorkbenchObjectTree {
         const selectedElement = this.getSelection();
         if (selectedElement && selectedElement.length > 0) {
             if (selectedElement[0] instanceof Marker) {
-                if (( resource.has(selectedElement[0].marker.resource))) {
+                if (( (resource.has(selectedElement[0].marker.resource)))) {
                     return true;
                 }
             }
@@ -895,12 +890,12 @@ let MarkersTree = class MarkersTree extends WorkbenchObjectTree {
         super.layout(height, width);
     }
 };
-MarkersTree = ( __decorate([
-    ( __param(5, IInstantiationService)),
-    ( __param(6, IContextKeyService)),
-    ( __param(7, IListService)),
-    ( __param(8, IThemeService)),
-    ( __param(9, IConfigurationService))
-], MarkersTree));
+MarkersTree = ( (__decorate([
+    ( (__param(5, IInstantiationService))),
+    ( (__param(6, IContextKeyService))),
+    ( (__param(7, IListService))),
+    ( (__param(8, IThemeService))),
+    ( (__param(9, IConfigurationService)))
+], MarkersTree)));
 
 export { MarkersView };