@codingame/monaco-vscode-markers-service-override 3.2.2 → 4.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-markers-service-override",
-  "version": "3.2.2",
+  "version": "4.0.0",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -18,6 +18,6 @@
   "module": "index.js",
   "types": "index.d.ts",
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@3.2.2"
+    "vscode": "npm:@codingame/monaco-vscode-api@4.0.0"
   }
 }

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

@@ -1,4 +1,5 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
+import './markersFileDecorations.js';
 import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { Extensions } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
 import { Categories } from 'vscode/vscode/vs/platform/action/common/actionCommonCategories';

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

@@ -0,0 +1,128 @@
+import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
+import { Extensions as Extensions$1 } from 'vscode/vscode/vs/workbench/common/contributions';
+import { MarkerSeverity, IMarkerService } from 'vscode/vscode/vs/platform/markers/common/markers';
+import { IDecorationsService } from 'vscode/vscode/vs/workbench/services/decorations/common/decorations';
+import { dispose } from 'vscode/vscode/vs/base/common/lifecycle';
+import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
+import 'vscode/vscode/vs/platform/theme/common/colorUtils';
+import 'vscode/vscode/vs/platform/theme/common/colors/baseColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/chartsColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/editorColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/inputColors';
+import { listErrorForeground, listWarningForeground } from 'vscode/vscode/vs/platform/theme/common/colors/listColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/menuColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/minimapColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/miscColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/quickpickColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/searchColors';
+import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
+import { Extensions } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
+
+class MarkersDecorationsProvider {
+    constructor(_markerService) {
+        this._markerService = _markerService;
+        this.label = ( localizeWithPath(
+            'vs/workbench/contrib/markers/browser/markersFileDecorations',
+            'label',
+            "Problems"
+        ));
+        this.onDidChange = _markerService.onMarkerChanged;
+    }
+    provideDecorations(resource) {
+        const markers = this._markerService.read({
+            resource,
+            severities: MarkerSeverity.Error | MarkerSeverity.Warning
+        });
+        let first;
+        for (const marker of markers) {
+            if (!first || marker.severity > first.severity) {
+                first = marker;
+            }
+        }
+        if (!first) {
+            return undefined;
+        }
+        return {
+            weight: 100 * first.severity,
+            bubble: true,
+            tooltip: markers.length === 1 ? ( localizeWithPath(
+                'vs/workbench/contrib/markers/browser/markersFileDecorations',
+                'tooltip.1',
+                "1 problem in this file"
+            )) : ( localizeWithPath(
+                'vs/workbench/contrib/markers/browser/markersFileDecorations',
+                'tooltip.N',
+                "{0} problems in this file",
+                markers.length
+            )),
+            letter: markers.length < 10 ? ( markers.length.toString()) : '9+',
+            color: first.severity === MarkerSeverity.Error ? listErrorForeground : listWarningForeground,
+        };
+    }
+}
+let MarkersFileDecorations = class MarkersFileDecorations {
+    constructor(_markerService, _decorationsService, _configurationService) {
+        this._markerService = _markerService;
+        this._decorationsService = _decorationsService;
+        this._configurationService = _configurationService;
+        this._disposables = [
+            this._configurationService.onDidChangeConfiguration(e => {
+                if (e.affectsConfiguration('problems.visibility')) {
+                    this._updateEnablement();
+                }
+            }),
+        ];
+        this._updateEnablement();
+    }
+    dispose() {
+        dispose(this._provider);
+        dispose(this._disposables);
+    }
+    _updateEnablement() {
+        const problem = this._configurationService.getValue('problems.visibility');
+        if (problem === undefined) {
+            return;
+        }
+        const value = this._configurationService.getValue('problems');
+        const shouldEnable = (problem && value.decorations.enabled);
+        if (shouldEnable === this._enabled) {
+            if (!problem || !value.decorations.enabled) {
+                this._provider?.dispose();
+                this._provider = undefined;
+            }
+            return;
+        }
+        this._enabled = shouldEnable;
+        if (this._enabled) {
+            const provider = ( new MarkersDecorationsProvider(this._markerService));
+            this._provider = this._decorationsService.registerDecorationsProvider(provider);
+        }
+        else if (this._provider) {
+            this._provider.dispose();
+        }
+    }
+};
+MarkersFileDecorations = ( __decorate([
+    ( __param(0, IMarkerService)),
+    ( __param(1, IDecorationsService)),
+    ( __param(2, IConfigurationService))
+], MarkersFileDecorations));
+( Registry.as(Extensions.Configuration)).registerConfiguration({
+    'id': 'problems',
+    'order': 101,
+    'type': 'object',
+    'properties': {
+        'problems.decorations.enabled': {
+            'markdownDescription': ( localizeWithPath(
+                'vs/workbench/contrib/markers/browser/markersFileDecorations',
+                'markers.showOnFile',
+                "Show Errors & Warnings on files and folder. Overwritten by `#problems.visibility#` when it is off."
+            )),
+            'type': 'boolean',
+            'default': true
+        }
+    }
+});
+( Registry.as(Extensions$1.Workbench))
+    .registerWorkbenchContribution(MarkersFileDecorations, 3 );

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

@@ -2,7 +2,7 @@ import { __decorate, __param } from '../../../../../../../external/tslib/tslib.e
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { append, $ as $$1, findParentWithClass } from 'vscode/vscode/vs/base/browser/dom';
 import { Event } from 'vscode/vscode/vs/base/common/event';
-import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
+import { DisposableStore, Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { WorkbenchTable } from 'vscode/vscode/vs/platform/list/browser/listService';
 import { HighlightedLabel } from 'vscode/vscode/vs/base/browser/ui/highlightedlabel/highlightedLabel';
@@ -20,7 +20,7 @@ import Messages from './messages.js';
 import { isUndefinedOrNull } from 'vscode/vscode/vs/base/common/types';
 import { Range } from 'vscode/vscode/vs/editor/common/core/range';
 import { unsupportedSchemas } from 'vscode/vscode/vs/platform/markers/common/markerService';
-import Severity from 'vscode/vscode/vs/base/common/severity';
+import Severity$1 from 'vscode/vscode/vs/base/common/severity';
 
 var MarkerSeverityColumnRenderer_1, MarkerCodeColumnRenderer_1, MarkerFileColumnRenderer_1;
 const $ = $$1;
@@ -37,7 +37,7 @@ let MarkerSeverityColumnRenderer = class MarkerSeverityColumnRenderer {
         const icon = append(severityColumn, $(''));
         const actionBarColumn = append(container, $('.actions'));
         const actionBar = ( new ActionBar(actionBarColumn, {
-            actionViewItemProvider: (action) => action.id === QuickFixAction.ID ? this.instantiationService.createInstance(QuickFixActionViewItem, action) : undefined
+            actionViewItemProvider: (action, options) => action.id === QuickFixAction.ID ? this.instantiationService.createInstance(QuickFixActionViewItem, action, options) : undefined
         }));
         return { actionBar, icon };
     }
@@ -49,7 +49,7 @@ let MarkerSeverityColumnRenderer = class MarkerSeverityColumnRenderer {
             }
         };
         templateData.icon.title = ( MarkerSeverity.toString(element.marker.severity));
-        templateData.icon.className = `marker-icon ${( Severity.toString(MarkerSeverity.toSeverity(element.marker.severity)))} codicon ${SeverityIcon.className(MarkerSeverity.toSeverity(element.marker.severity))}`;
+        templateData.icon.className = `marker-icon ${( Severity$1.toString(MarkerSeverity.toSeverity(element.marker.severity)))} codicon ${SeverityIcon.className(MarkerSeverity.toSeverity(element.marker.severity))}`;
         templateData.actionBar.clear();
         const viewModel = this.markersViewModel.getViewModel(element);
         if (viewModel) {
@@ -78,13 +78,14 @@ let MarkerCodeColumnRenderer = class MarkerCodeColumnRenderer {
         this.templateId = MarkerCodeColumnRenderer_1.TEMPLATE_ID;
     }
     renderTemplate(container) {
+        const templateDisposable = ( new DisposableStore());
         const codeColumn = append(container, $('.code'));
-        const sourceLabel = ( new HighlightedLabel(codeColumn));
+        const sourceLabel = templateDisposable.add(( new HighlightedLabel(codeColumn)));
         sourceLabel.element.classList.add('source-label');
-        const codeLabel = ( new HighlightedLabel(codeColumn));
+        const codeLabel = templateDisposable.add(( new HighlightedLabel(codeColumn)));
         codeLabel.element.classList.add('code-label');
-        const codeLink = ( new Link(codeColumn, { href: '', label: '' }, {}, this.openerService));
-        return { codeColumn, sourceLabel, codeLabel, codeLink };
+        const codeLink = templateDisposable.add(( new Link(codeColumn, { href: '', label: '' }, {}, this.openerService)));
+        return { codeColumn, sourceLabel, codeLabel, codeLink, templateDisposable };
     }
     renderElement(element, index, templateData, height) {
         templateData.codeColumn.classList.remove('code-label');
@@ -100,7 +101,7 @@ let MarkerCodeColumnRenderer = class MarkerCodeColumnRenderer {
                 templateData.codeColumn.classList.add('code-link');
                 templateData.codeColumn.title = `${element.marker.source} (${element.marker.code.value})`;
                 templateData.sourceLabel.set(element.marker.source, element.sourceMatches);
-                const codeLinkLabel = ( new HighlightedLabel($('.code-link-label')));
+                const codeLinkLabel = templateData.templateDisposable.add(( new HighlightedLabel($('.code-link-label'))));
                 codeLinkLabel.set(element.marker.code.value, element.codeMatches);
                 templateData.codeLink.link = {
                     href: ( element.marker.code.target.toString()),
@@ -114,7 +115,9 @@ let MarkerCodeColumnRenderer = class MarkerCodeColumnRenderer {
             templateData.sourceLabel.set('-');
         }
     }
-    disposeTemplate(templateData) { }
+    disposeTemplate(templateData) {
+        templateData.templateDisposable.dispose();
+    }
 };
 MarkerCodeColumnRenderer = MarkerCodeColumnRenderer_1 = ( __decorate([
     ( __param(0, IOpenerService))
@@ -133,7 +136,9 @@ class MarkerMessageColumnRenderer {
         templateData.columnElement.title = element.marker.message;
         templateData.highlightedLabel.set(element.marker.message, element.messageMatches);
     }
-    disposeTemplate(templateData) { }
+    disposeTemplate(templateData) {
+        templateData.highlightedLabel.dispose();
+    }
 }
 let MarkerFileColumnRenderer = class MarkerFileColumnRenderer {
     static { MarkerFileColumnRenderer_1 = this; }
@@ -156,7 +161,10 @@ let MarkerFileColumnRenderer = class MarkerFileColumnRenderer {
         templateData.fileLabel.set(this.labelService.getUriLabel(element.marker.resource, { relative: true }), element.fileMatches);
         templateData.positionLabel.set(positionLabel, undefined);
     }
-    disposeTemplate(templateData) { }
+    disposeTemplate(templateData) {
+        templateData.fileLabel.dispose();
+        templateData.positionLabel.dispose();
+    }
 };
 MarkerFileColumnRenderer = MarkerFileColumnRenderer_1 = ( __decorate([
     ( __param(0, ILabelService))
@@ -175,7 +183,9 @@ class MarkerOwnerColumnRenderer {
         templateData.columnElement.title = element.marker.owner;
         templateData.highlightedLabel.set(element.marker.owner, element.ownerMatches);
     }
-    disposeTemplate(templateData) { }
+    disposeTemplate(templateData) {
+        templateData.highlightedLabel.dispose();
+    }
 }
 class MarkersTableVirtualDelegate {
     constructor() {

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

@@ -5,7 +5,7 @@ import { dirname, basename as basename$1 } from 'vscode/vscode/vs/base/common/pa
 import { CountBadge } from 'vscode/vscode/vs/base/browser/ui/countBadge/countBadge';
 import { HighlightedLabel } from 'vscode/vscode/vs/base/browser/ui/highlightedlabel/highlightedLabel';
 import { MarkerSeverity } from 'vscode/vscode/vs/platform/markers/common/markers';
-import { ResourceMarkers, Marker, MarkerTableItem, RelatedInformation } from './markersModel.js';
+import { Marker, ResourceMarkers, MarkerTableItem, RelatedInformation } from './markersModel.js';
 import Messages from './messages.js';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
@@ -38,7 +38,9 @@ import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/
 import { MarkersContextKeys } from 'vscode/vscode/vs/workbench/contrib/markers/common/markers';
 import { unsupportedSchemas } from 'vscode/vscode/vs/platform/markers/common/markerService';
 import { defaultCountBadgeStyles } from 'vscode/vscode/vs/platform/theme/browser/defaultStyles';
-import Severity from 'vscode/vscode/vs/base/common/severity';
+import Severity$1 from 'vscode/vscode/vs/base/common/severity';
+import { setupCustomHover } from 'vscode/vscode/vs/base/browser/ui/hover/updatableHoverWidget';
+import { getDefaultHoverDelegate } from 'vscode/vscode/vs/base/browser/ui/hover/hoverDelegateFactory';
 
 let MarkersWidgetAccessibilityProvider = class MarkersWidgetAccessibilityProvider {
     constructor(labelService) {
@@ -217,17 +219,18 @@ class MarkerWidget extends Disposable {
         this._openerService = _openerService;
         this.disposables = this._register(( new DisposableStore()));
         this.actionBar = this._register(( new ActionBar(append(parent, $('.actions')), {
-            actionViewItemProvider: (action) => action.id === QuickFixAction.ID ? _instantiationService.createInstance(QuickFixActionViewItem, action) : undefined
+            actionViewItemProvider: (action, options) => action.id === QuickFixAction.ID ? _instantiationService.createInstance(QuickFixActionViewItem, action, options) : undefined
         })));
         this.iconContainer = append(parent, $(''));
         this.icon = append(this.iconContainer, $(''));
         this.messageAndDetailsContainer = append(parent, $('.marker-message-details-container'));
+        this.messageAndDetailsContainerHover = this._register(setupCustomHover(getDefaultHoverDelegate('mouse'), this.messageAndDetailsContainer, ''));
     }
     render(element, filterData) {
         this.actionBar.clear();
         this.disposables.clear();
         clearNode(this.messageAndDetailsContainer);
-        this.iconContainer.className = `marker-icon ${( Severity.toString(MarkerSeverity.toSeverity(element.marker.severity)))}`;
+        this.iconContainer.className = `marker-icon ${( Severity$1.toString(MarkerSeverity.toSeverity(element.marker.severity)))}`;
         this.icon.className = `codicon ${SeverityIcon.className(MarkerSeverity.toSeverity(element.marker.severity))}`;
         this.renderQuickfixActionbar(element);
         this.renderMessageAndDetails(element, filterData);
@@ -255,9 +258,9 @@ class MarkerWidget extends Disposable {
     }
     renderMultilineActionbar(marker, parent) {
         const multilineActionbar = this.disposables.add(( new ActionBar(append(parent, $('.multiline-actions')), {
-            actionViewItemProvider: (action) => {
+            actionViewItemProvider: (action, options) => {
                 if (action.id === toggleMultilineAction) {
-                    return ( new ToggleMultilineActionViewItem(undefined, action, { icon: true }));
+                    return ( new ToggleMultilineActionViewItem(undefined, action, { ...options, icon: true }));
                 }
                 return undefined;
             }
@@ -287,12 +290,12 @@ class MarkerWidget extends Disposable {
         const viewState = this.markersViewModel.getViewModel(element);
         const multiline = !viewState || viewState.multiline;
         const lineMatches = filterData && filterData.lineMatches || [];
-        this.messageAndDetailsContainer.title = element.marker.message;
+        this.messageAndDetailsContainerHover.update(element.marker.message);
         const lineElements = [];
         for (let index = 0; index < (multiline ? lines.length : 1); index++) {
             const lineElement = append(this.messageAndDetailsContainer, $('.marker-message-line'));
             const messageElement = append(lineElement, $('.marker-message'));
-            const highlightedLabel = ( new HighlightedLabel(messageElement));
+            const highlightedLabel = this.disposables.add(( new HighlightedLabel(messageElement)));
             highlightedLabel.set(lines[index].length > 1000 ? `${lines[index].substring(0, 1000)}...` : lines[index], lineMatches[index]);
             if (lines[index] === '') {
                 lineElement.style.height = `${VirtualDelegate.LINE_HEIGHT}px`;
@@ -305,18 +308,18 @@ class MarkerWidget extends Disposable {
     renderDetails(marker, filterData, parent) {
         parent.classList.add('details-container');
         if (marker.source || marker.code) {
-            const source = ( new HighlightedLabel(append(parent, $('.marker-source'))));
+            const source = this.disposables.add(( new HighlightedLabel(append(parent, $('.marker-source')))));
             const sourceMatches = filterData && filterData.sourceMatches || [];
             source.set(marker.source, sourceMatches);
             if (marker.code) {
                 if (typeof marker.code === 'string') {
-                    const code = ( new HighlightedLabel(append(parent, $('.marker-code'))));
+                    const code = this.disposables.add(( new HighlightedLabel(append(parent, $('.marker-code')))));
                     const codeMatches = filterData && filterData.codeMatches || [];
                     code.set(marker.code, codeMatches);
                 }
                 else {
                     const container = $('.marker-code');
-                    const code = ( new HighlightedLabel(container));
+                    const code = this.disposables.add(( new HighlightedLabel(container)));
                     const link = ( marker.code.target.toString(true));
                     this.disposables.add(( new Link(
                         parent,
@@ -354,13 +357,14 @@ let RelatedInformationRenderer = class RelatedInformationRenderer {
         const relatedInformation = node.element.raw;
         const uriMatches = node.filterData && node.filterData.uriMatches || [];
         const messageMatches = node.filterData && node.filterData.messageMatches || [];
-        templateData.resourceLabel.set(basename(relatedInformation.resource), uriMatches);
-        templateData.resourceLabel.element.title = this.labelService.getUriLabel(relatedInformation.resource, { relative: true });
+        const resourceLabelTitle = this.labelService.getUriLabel(relatedInformation.resource, { relative: true });
+        templateData.resourceLabel.set(basename(relatedInformation.resource), uriMatches, resourceLabelTitle);
         templateData.lnCol.textContent = Messages.MARKERS_PANEL_AT_LINE_COL_NUMBER(relatedInformation.startLineNumber, relatedInformation.startColumn);
-        templateData.description.set(relatedInformation.message, messageMatches);
-        templateData.description.element.title = relatedInformation.message;
+        templateData.description.set(relatedInformation.message, messageMatches, relatedInformation.message);
     }
     disposeTemplate(templateData) {
+        templateData.resourceLabel.dispose();
+        templateData.description.dispose();
     }
 };
 RelatedInformationRenderer = ( __decorate([

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

@@ -102,8 +102,8 @@ class QuickFixAction extends Action {
     }
 }
 let QuickFixActionViewItem = class QuickFixActionViewItem extends ActionViewItem {
-    constructor(action, contextMenuService) {
-        super(null, action, { icon: true, label: false });
+    constructor(action, options, contextMenuService) {
+        super(null, action, { ...options, icon: true, label: false });
         this.contextMenuService = contextMenuService;
     }
     onClick(event) {
@@ -128,7 +128,7 @@ let QuickFixActionViewItem = class QuickFixActionViewItem extends ActionViewItem
     }
 };
 QuickFixActionViewItem = ( __decorate([
-    ( __param(1, IContextMenuService))
+    ( __param(2, IContextMenuService))
 ], QuickFixActionViewItem));
 
 export { MarkersFilters, QuickFixAction, QuickFixActionViewItem };