@codingame/monaco-vscode-markers-service-override 1.83.16 → 1.85.0-next.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-markers-service-override",
-  "version": "1.83.16",
+  "version": "1.85.0-next.1",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -18,7 +18,7 @@
   "module": "index.js",
   "types": "index.d.ts",
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@1.83.16",
-    "monaco-editor": "0.44.0"
+    "vscode": "npm:@codingame/monaco-vscode-api@1.85.0-next.1",
+    "monaco-editor": "0.45.0"
   }
 }

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

@@ -24,6 +24,7 @@ import { registerIcon } from 'monaco-editor/esm/vs/platform/theme/common/iconReg
 import { ViewAction } from 'vscode/vscode/vs/workbench/browser/parts/views/viewPane';
 import { NumberBadge, IActivityService } from 'vscode/vscode/vs/workbench/services/activity/common/activity';
 import { viewFilterSubmenu } from 'vscode/vscode/vs/workbench/browser/parts/views/viewFilter';
+import { IConfigurationService } from 'monaco-editor/esm/vs/platform/configuration/common/configuration.js';
 
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: Markers.MARKER_OPEN_ACTION_ID,
@@ -106,6 +107,16 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
                 Messages.PROBLEMS_PANEL_CONFIGURATION_COMPARE_ORDER_POSITION,
             ],
         },
+        'problems.visibility': {
+            type: 'boolean',
+            default: true,
+            tags: ['experimental'],
+            description: ( localizeWithPath(
+                'vs/workbench/contrib/markers/browser/markers.contribution',
+                'problems.visibility',
+                "Controls whether the problems are visible throughout the editor and workbench."
+            )),
+        }
     }
 });
 const markersViewIcon = registerIcon('markers-view-icon', Codicon.warning, ( localizeWithPath(
@@ -115,7 +126,7 @@ const markersViewIcon = registerIcon('markers-view-icon', Codicon.warning, ( loc
 )));
 const VIEW_CONTAINER = ( Registry.as(Extensions$1.ViewContainersRegistry)).registerViewContainer({
     id: Markers.MARKERS_CONTAINER_ID,
-    title: { value: Messages.MARKERS_PANEL_TITLE_PROBLEMS, original: Messages.MARKERS_PANEL_ORIGINAL_TITLE_PROBLEMS },
+    title: Messages.MARKERS_PANEL_TITLE_PROBLEMS,
     icon: markersViewIcon,
     hideIfEmpty: true,
     order: 0,
@@ -632,12 +643,35 @@ registerAction2(class extends Action2 {
     }
 });
 let MarkersStatusBarContributions = class MarkersStatusBarContributions extends Disposable {
-    constructor(markerService, statusbarService) {
+    constructor(markerService, statusbarService, configurationService) {
         super();
         this.markerService = markerService;
         this.statusbarService = statusbarService;
+        this.configurationService = configurationService;
         this.markersStatusItem = this._register(this.statusbarService.addEntry(this.getMarkersItem(), 'status.problems', 0 , 50 ));
-        this.markerService.onMarkerChanged(() => this.markersStatusItem.update(this.getMarkersItem()));
+        const addStatusBarEntry = () => {
+            this.markersStatusItemOff = this.statusbarService.addEntry(this.getMarkersItemTurnedOff(), 'status.problemsVisibility', 0 , 49);
+        };
+        let config = this.configurationService.getValue('problems.visibility');
+        if (!config) {
+            addStatusBarEntry();
+        }
+        this._register(this.markerService.onMarkerChanged(() => {
+            this.markersStatusItem.update(this.getMarkersItem());
+        }));
+        this._register(this.configurationService.onDidChangeConfiguration(e => {
+            if (e.affectsConfiguration('problems.visibility')) {
+                this.markersStatusItem.update(this.getMarkersItem());
+                config = this.configurationService.getValue('problems.visibility');
+                if (!config && !this.markersStatusItemOff) {
+                    addStatusBarEntry();
+                }
+                else if (config && this.markersStatusItemOff) {
+                    this.markersStatusItemOff.dispose();
+                    this.markersStatusItemOff = undefined;
+                }
+            }
+        }));
     }
     getMarkersItem() {
         const markersStatistics = this.markerService.getStatistics();
@@ -654,6 +688,28 @@ let MarkersStatusBarContributions = class MarkersStatusBarContributions extends
             command: 'workbench.actions.view.toggleProblems'
         };
     }
+    getMarkersItemTurnedOff() {
+        this.statusbarService.updateEntryVisibility('status.problemsVisibility', true);
+        const openSettingsCommand = 'workbench.action.openSettings';
+        const configureSettingsLabel = '@id:problems.visibility';
+        const tooltip = ( localizeWithPath(
+            'vs/workbench/contrib/markers/browser/markers.contribution',
+            'status.problemsVisibilityOff',
+            "Problems are turned off. Click to open settings."
+        ));
+        return {
+            name: ( localizeWithPath(
+                'vs/workbench/contrib/markers/browser/markers.contribution',
+                'status.problemsVisibility',
+                "Problems Visibility"
+            )),
+            text: '$(whole-word)',
+            ariaLabel: tooltip,
+            tooltip,
+            kind: 'warning',
+            command: { title: openSettingsCommand, arguments: [configureSettingsLabel], id: openSettingsCommand }
+        };
+    }
     getMarkersTooltip(stats) {
         const errorTitle = (n) => ( localizeWithPath(
             'vs/workbench/contrib/markers/browser/markers.contribution',
@@ -712,7 +768,8 @@ let MarkersStatusBarContributions = class MarkersStatusBarContributions extends
 };
 MarkersStatusBarContributions = ( __decorate([
     ( __param(0, IMarkerService)),
-    ( __param(1, IStatusbarService))
+    ( __param(1, IStatusbarService)),
+    ( __param(2, IConfigurationService))
 ], MarkersStatusBarContributions));
 workbenchRegistry.registerWorkbenchContribution(MarkersStatusBarContributions, 3 );
 let ActivityUpdater = class ActivityUpdater extends Disposable {
@@ -727,13 +784,18 @@ let ActivityUpdater = class ActivityUpdater extends Disposable {
     updateBadge() {
         const { errors, warnings, infos } = this.markerService.getStatistics();
         const total = errors + warnings + infos;
-        const message = ( localizeWithPath(
-            'vs/workbench/contrib/markers/browser/markers.contribution',
-            'totalProblems',
-            'Total {0} Problems',
-            total
-        ));
-        this.activity.value = this.activityService.showViewActivity(Markers.MARKERS_VIEW_ID, { badge: ( new NumberBadge(total, () => message)) });
+        if (total > 0) {
+            const message = ( localizeWithPath(
+                'vs/workbench/contrib/markers/browser/markers.contribution',
+                'totalProblems',
+                'Total {0} Problems',
+                total
+            ));
+            this.activity.value = this.activityService.showViewActivity(Markers.MARKERS_VIEW_ID, { badge: ( new NumberBadge(total, () => message)) });
+        }
+        else {
+            this.activity.value = undefined;
+        }
     }
 };
 ActivityUpdater = ( __decorate([

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

@@ -120,20 +120,31 @@ let ResourceMarkersRenderer = class ResourceMarkersRenderer {
             templateData.resourceLabel.setResource({ name: resourceMarkers.name, description: this.labelService.getUriLabel(dirname(resourceMarkers.resource), { relative: true }), resource: resourceMarkers.resource }, { matches: uriMatches });
         }
         this.updateCount(node, templateData);
-        this.renderedNodes.set(node, templateData);
+        const nodeRenders = this.renderedNodes.get(resourceMarkers) ?? [];
+        this.renderedNodes.set(resourceMarkers, [...nodeRenders, templateData]);
     }
-    disposeElement(node) {
-        this.renderedNodes.delete(node);
+    disposeElement(node, index, templateData) {
+        const nodeRenders = this.renderedNodes.get(node.element) ?? [];
+        const nodeRenderIndex = nodeRenders.findIndex(nodeRender => templateData === nodeRender);
+        if (nodeRenderIndex < 0) {
+            throw new Error('Disposing unknown resource marker');
+        }
+        if (nodeRenders.length === 1) {
+            this.renderedNodes.delete(node.element);
+        }
+        else {
+            nodeRenders.splice(nodeRenderIndex, 1);
+        }
     }
     disposeTemplate(templateData) {
         templateData.resourceLabel.dispose();
     }
     onDidChangeRenderNodeCount(node) {
-        const templateData = this.renderedNodes.get(node);
-        if (!templateData) {
+        const nodeRenders = this.renderedNodes.get(node.element);
+        if (!nodeRenders) {
             return;
         }
-        this.updateCount(node, templateData);
+        nodeRenders.forEach(nodeRender => this.updateCount(node, nodeRender));
     }
     updateCount(node, templateData) {
         templateData.count.setCount(node.children.reduce((r, n) => r + (n.visible ? 1 : 0), 0));

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

@@ -132,7 +132,7 @@ let MarkersView = class MarkersView extends FilterViewPane {
         this.renderContent();
     }
     getTitle() {
-        return Messages.MARKERS_PANEL_TITLE_PROBLEMS;
+        return Messages.MARKERS_PANEL_TITLE_PROBLEMS.value;
     }
     layoutBodyContent(height = this.currentHeight, width = this.currentWidth) {
         if (this.messageBoxContainer) {
@@ -143,7 +143,8 @@ let MarkersView = class MarkersView extends FilterViewPane {
         this.currentWidth = width;
     }
     focus() {
-        if (this.widget.getHTMLElement() === document.activeElement) {
+        super.focus();
+        if (dom.isActiveElement(this.widget.getHTMLElement())) {
             return;
         }
         if (this.hasNoProblems()) {
@@ -628,7 +629,7 @@ let MarkersView = class MarkersView extends FilterViewPane {
     }
     updateRangeHighlights() {
         this.rangeHighlightDecorations.removeHighlightRange();
-        if (this.widget.getHTMLElement() === document.activeElement) {
+        if (dom.isActiveElement(this.widget.getHTMLElement())) {
             this.highlightCurrentSelectedMarkerRange();
         }
     }

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

@@ -48,8 +48,7 @@ class Messages {
         'problems.panel.configuration.compareOrder.position',
         "Navigate problems ordered by position"
     )); }
-    static { this.MARKERS_PANEL_ORIGINAL_TITLE_PROBLEMS = 'Problems'; }
-    static { this.MARKERS_PANEL_TITLE_PROBLEMS = ( nls.localizeWithPath(
+    static { this.MARKERS_PANEL_TITLE_PROBLEMS = ( nls.localize2WithPath(
         'vs/workbench/contrib/markers/browser/messages',
         'markers.panel.title.problems',
         "Problems"