@codingame/monaco-vscode-markers-service-override 2.0.3 → 2.1.0

package/package.json

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

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

@@ -3,7 +3,7 @@ import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/cont
 import { Extensions } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
 import { Categories } from 'vscode/vscode/vs/platform/action/common/actionCommonCategories';
 import { KeybindingsRegistry } from 'vscode/vscode/vs/platform/keybinding/common/keybindingsRegistry';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localizeWithPath, localize2WithPath } from 'vscode/vscode/vs/nls';
 import { Marker, ResourceMarkers, RelatedInformation } from './markersModel.js';
 import { MarkersView } from './markersView.js';
 import { registerAction2, MenuId, Action2 } from 'vscode/vscode/vs/platform/actions/common/actions';
@@ -15,7 +15,8 @@ import { IClipboardService } from 'vscode/vscode/vs/platform/clipboard/common/cl
 import { Disposable, MutableDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { IStatusbarService } from 'vscode/vscode/vs/workbench/services/statusbar/browser/statusbar';
 import { IMarkerService } from 'vscode/vscode/vs/platform/markers/common/markers';
-import { IViewsService, Extensions as Extensions$1 } from 'vscode/vscode/vs/workbench/common/views';
+import { Extensions as Extensions$1 } from 'vscode/vscode/vs/workbench/common/views';
+import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService';
 import { FocusedViewContext, getVisbileViewContextKey } from 'vscode/vscode/vs/workbench/common/contextkeys';
 import { ViewPaneContainer } from 'vscode/vscode/vs/workbench/browser/parts/views/viewPaneContainer';
 import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
@@ -25,6 +26,7 @@ import { ViewAction } from 'vscode/vscode/vs/workbench/browser/parts/views/viewP
 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 'vscode/vscode/vs/platform/configuration/common/configuration';
+import { problemsConfigurationNodeBase } from 'vscode/vscode/vs/workbench/common/configuration';
 
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: Markers.MARKER_OPEN_ACTION_ID,
@@ -76,10 +78,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
     }
 });
 ( Registry.as(Extensions.Configuration)).registerConfiguration({
-    'id': 'problems',
-    'order': 101,
-    'title': Messages.PROBLEMS_PANEL_CONFIGURATION_TITLE,
-    'type': 'object',
+    ...problemsConfigurationNodeBase,
     'properties': {
         'problems.autoReveal': {
             'description': Messages.PROBLEMS_PANEL_CONFIGURATION_AUTO_REVEAL,
@@ -107,16 +106,6 @@ 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(
@@ -207,22 +196,15 @@ registerAction2(class extends ViewAction {
             id: `workbench.actions.${Markers.MARKERS_VIEW_ID}.toggleErrors`,
             title: ( localizeWithPath(
                 'vs/workbench/contrib/markers/browser/markers.contribution',
-                'toggle errors',
-                "Toggle Errors"
+                'show errors',
+                "Show Errors"
             )),
             category: ( localizeWithPath(
                 'vs/workbench/contrib/markers/browser/markers.contribution',
                 'problems',
                 "Problems"
             )),
-            toggled: {
-                condition: MarkersContextKeys.ShowErrorsFilterContextKey,
-                title: ( localizeWithPath(
-                    'vs/workbench/contrib/markers/browser/markers.contribution',
-                    'errors',
-                    "Show Errors"
-                ))
-            },
+            toggled: MarkersContextKeys.ShowErrorsFilterContextKey,
             menu: {
                 id: viewFilterSubmenu,
                 group: '1_filter',
@@ -242,22 +224,15 @@ registerAction2(class extends ViewAction {
             id: `workbench.actions.${Markers.MARKERS_VIEW_ID}.toggleWarnings`,
             title: ( localizeWithPath(
                 'vs/workbench/contrib/markers/browser/markers.contribution',
-                'toggle warnings',
-                "Toggle Warnings"
+                'show warnings',
+                "Show Warnings"
             )),
             category: ( localizeWithPath(
                 'vs/workbench/contrib/markers/browser/markers.contribution',
                 'problems',
                 "Problems"
             )),
-            toggled: {
-                condition: MarkersContextKeys.ShowWarningsFilterContextKey,
-                title: ( localizeWithPath(
-                    'vs/workbench/contrib/markers/browser/markers.contribution',
-                    'warnings',
-                    "Show Warnings"
-                ))
-            },
+            toggled: MarkersContextKeys.ShowWarningsFilterContextKey,
             menu: {
                 id: viewFilterSubmenu,
                 group: '1_filter',
@@ -277,22 +252,15 @@ registerAction2(class extends ViewAction {
             id: `workbench.actions.${Markers.MARKERS_VIEW_ID}.toggleInfos`,
             title: ( localizeWithPath(
                 'vs/workbench/contrib/markers/browser/markers.contribution',
-                'toggle infos',
-                "Toggle Infos"
+                'show infos',
+                "Show Infos"
             )),
             category: ( localizeWithPath(
                 'vs/workbench/contrib/markers/browser/markers.contribution',
                 'problems',
                 "Problems"
             )),
-            toggled: {
-                condition: MarkersContextKeys.ShowInfoFilterContextKey,
-                title: ( localizeWithPath(
-                    'vs/workbench/contrib/markers/browser/markers.contribution',
-                    'Infos',
-                    "Show Infos"
-                ))
-            },
+            toggled: MarkersContextKeys.ShowInfoFilterContextKey,
             menu: {
                 id: viewFilterSubmenu,
                 group: '1_filter',
@@ -312,22 +280,15 @@ registerAction2(class extends ViewAction {
             id: `workbench.actions.${Markers.MARKERS_VIEW_ID}.toggleActiveFile`,
             title: ( localizeWithPath(
                 'vs/workbench/contrib/markers/browser/markers.contribution',
-                'toggle active file',
-                "Toggle Active File"
+                'show active file',
+                "Show Active File Only"
             )),
             category: ( localizeWithPath(
                 'vs/workbench/contrib/markers/browser/markers.contribution',
                 'problems',
                 "Problems"
             )),
-            toggled: {
-                condition: MarkersContextKeys.ShowActiveFileFilterContextKey,
-                title: ( localizeWithPath(
-                    'vs/workbench/contrib/markers/browser/markers.contribution',
-                    'Active File',
-                    "Show Active File Only"
-                ))
-            },
+            toggled: MarkersContextKeys.ShowActiveFileFilterContextKey,
             menu: {
                 id: viewFilterSubmenu,
                 group: '2_filter',
@@ -347,22 +308,15 @@ registerAction2(class extends ViewAction {
             id: `workbench.actions.${Markers.MARKERS_VIEW_ID}.toggleExcludedFiles`,
             title: ( localizeWithPath(
                 'vs/workbench/contrib/markers/browser/markers.contribution',
-                'toggle Excluded Files',
-                "Toggle Excluded Files"
+                'show excluded files',
+                "Show Excluded Files"
             )),
             category: ( localizeWithPath(
                 'vs/workbench/contrib/markers/browser/markers.contribution',
                 'problems',
                 "Problems"
             )),
-            toggled: {
-                condition: MarkersContextKeys.ShowExcludedFilesFilterContextKey,
-                title: ( localizeWithPath(
-                    'vs/workbench/contrib/markers/browser/markers.contribution',
-                    'Excluded Files',
-                    "Hide Excluded Files"
-                ))
-            },
+            toggled: ( MarkersContextKeys.ShowExcludedFilesFilterContextKey.negate()),
             menu: {
                 id: viewFilterSubmenu,
                 group: '2_filter',
@@ -394,11 +348,11 @@ registerAction2(class extends ViewAction {
         const when = ( ContextKeyExpr.and(( FocusedViewContext.isEqualTo(Markers.MARKERS_VIEW_ID)), MarkersContextKeys.MarkersTreeVisibilityContextKey, ( MarkersContextKeys.RelatedInformationFocusContextKey.toNegated())));
         super({
             id: Markers.MARKER_COPY_ACTION_ID,
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/workbench/contrib/markers/browser/markers.contribution',
                 'copyMarker',
-                "Copy"
-            )), original: 'Copy' },
+                'Copy'
+            )),
             menu: {
                 id: MenuId.ProblemsPanelContext,
                 when,
@@ -438,11 +392,11 @@ registerAction2(class extends ViewAction {
     constructor() {
         super({
             id: Markers.MARKER_COPY_MESSAGE_ACTION_ID,
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/workbench/contrib/markers/browser/markers.contribution',
                 'copyMessage',
-                "Copy Message"
-            )), original: 'Copy Message' },
+                'Copy Message'
+            )),
             menu: {
                 id: MenuId.ProblemsPanelContext,
                 when: MarkersContextKeys.MarkerFocusContextKey,
@@ -463,11 +417,11 @@ registerAction2(class extends ViewAction {
     constructor() {
         super({
             id: Markers.RELATED_INFORMATION_COPY_MESSAGE_ACTION_ID,
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/workbench/contrib/markers/browser/markers.contribution',
                 'copyMessage',
-                "Copy Message"
-            )), original: 'Copy Message' },
+                'Copy Message'
+            )),
             menu: {
                 id: MenuId.ProblemsPanelContext,
                 when: MarkersContextKeys.RelatedInformationFocusContextKey,

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

@@ -51,7 +51,8 @@ function createResourceMarkersIterator(resourceMarkers) {
 }
 let MarkersView = class MarkersView extends FilterViewPane {
     constructor(options, instantiationService, viewDescriptorService, editorService, configurationService, telemetryService, markerService, contextKeyService, workspaceContextService, contextMenuService, uriIdentityService, keybindingService, storageService, openerService, themeService) {
-        const panelState = ( new Memento(Markers.MARKERS_VIEW_STORAGE_ID, storageService)).getMemento(1 , 1 );
+        const memento = ( new Memento(Markers.MARKERS_VIEW_STORAGE_ID, storageService));
+        const panelState = memento.getMemento(1 , 1 );
         super({
             ...options,
             filterOptions: {
@@ -75,6 +76,7 @@ let MarkersView = class MarkersView extends FilterViewPane {
         this.cachedFilterStats = undefined;
         this.currentResourceGotAddedToMarkersData = false;
         this.onDidChangeVisibility = this.onDidChangeBodyVisibility;
+        this.memento = memento;
         this.panelState = panelState;
         this.markersModel = this._register(instantiationService.createInstance(MarkersModel));
         this.markersViewModel = this._register(instantiationService.createInstance(MarkersViewModel, this.panelState['multiline'], this.panelState['viewMode'] ?? this.getDefaultViewMode()));
@@ -732,6 +734,7 @@ let MarkersView = class MarkersView extends FilterViewPane {
         this.panelState['activeFile'] = this.filters.activeFile;
         this.panelState['multiline'] = this.markersViewModel.multiline;
         this.panelState['viewMode'] = this.markersViewModel.viewMode;
+        this.memento.saveMemento();
         super.saveState();
     }
     dispose() {
@@ -850,8 +853,10 @@ let MarkersTree = class MarkersTree extends WorkbenchObjectTree {
     }
     update(resourceMarkers) {
         for (const resourceMarker of resourceMarkers) {
-            this.setChildren(resourceMarker, createResourceMarkersIterator(resourceMarker));
-            this.rerender(resourceMarker);
+            if (this.hasElement(resourceMarker)) {
+                this.setChildren(resourceMarker, createResourceMarkersIterator(resourceMarker));
+                this.rerender(resourceMarker);
+            }
         }
     }
     updateMarker(marker) {