@codingame/monaco-vscode-markers-service-override 11.1.2 → 12.0.1

package/index.d.ts

@@ -1 +1,2 @@
-export { default } from 'vscode/service-override/markers';
+import { type IEditorOverrideServices } from "vscode/vscode/vs/editor/standalone/browser/standaloneServices";
+export default function getServiceOverride(): IEditorOverrideServices;

package/index.js

@@ -1 +1,9 @@
-export { default } from './markers.js';
+
+import 'vscode/vscode/vs/editor/standalone/browser/standaloneServices';
+import './vscode/src/vs/workbench/contrib/markers/browser/markers.contribution.js';
+
+function getServiceOverride() {
+    return {};
+}
+
+export { getServiceOverride as default };

package/package.json

@@ -1,6 +1,8 @@
 {
   "name": "@codingame/monaco-vscode-markers-service-override",
-  "version": "11.1.2",
+  "version": "12.0.1",
+  "private": false,
+  "description": "VSCode public API plugged on the monaco editor - markers service-override",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -12,8 +14,17 @@
     "url": "git+ssh://git@github.com/CodinGame/monaco-vscode-api.git"
   },
   "type": "module",
-  "private": false,
-  "description": "VSCode public API plugged on the monaco editor - markers service-override",
+  "dependencies": {
+    "@codingame/monaco-vscode-2448342b-297f-5823-9f41-f18eef0f6ee8-common": "12.0.1",
+    "@codingame/monaco-vscode-65619f8f-0eab-5d8b-855a-43b6353fe527-common": "12.0.1",
+    "@codingame/monaco-vscode-9e888134-1a6f-58d9-b0e6-0fc047448366-common": "12.0.1",
+    "@codingame/monaco-vscode-a7c9ae3c-16d2-5d17-86b2-981be7094566-common": "12.0.1",
+    "@codingame/monaco-vscode-b4efa70b-52b9-5670-ab5c-f10b10b6834e-common": "12.0.1",
+    "@codingame/monaco-vscode-e571cbbb-526b-5d8b-92c5-a0437d2dabb3-common": "12.0.1",
+    "vscode": "npm:@codingame/monaco-vscode-api@12.0.1"
+  },
+  "peerDependencies": {},
+  "peerDependenciesMeta": {},
   "main": "index.js",
   "module": "index.js",
   "types": "index.d.ts",
@@ -22,10 +33,12 @@
       "default": "./index.js"
     },
     "./vscode/*": {
-      "default": "./vscode/src/*.js"
+      "default": "./vscode/src/*.js",
+      "types": "./vscode/src/*.d.ts"
+    },
+    "./*": {
+      "default": "./*.js",
+      "types": "./*.d.ts"
     }
-  },
-  "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@11.1.2"
   }
 }

package/vscode/src/vs/workbench/contrib/markers/browser/markers.contribution.d.ts

@@ -0,0 +1 @@
+

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

@@ -1,43 +1,47 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 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';
-import { KeybindingsRegistry } from 'vscode/vscode/vs/platform/keybinding/common/keybindingsRegistry';
+import { KeybindingsRegistry, KeybindingWeight } from 'vscode/vscode/vs/platform/keybinding/common/keybindingsRegistry';
+import { KeyCode, KeyMod } from 'vscode/vscode/vs/base/common/keyCodes';
 import { localize, localize2 } 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';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
-import { Markers, MarkersContextKeys } from 'vscode/vscode/vs/workbench/contrib/markers/common/markers';
+import { Markers, MarkersContextKeys, MarkersViewMode } from '@codingame/monaco-vscode-2448342b-297f-5823-9f41-f18eef0f6ee8-common/vscode/vs/workbench/contrib/markers/common/markers';
 import Messages from './messages.js';
 import { Extensions as Extensions$2 } from 'vscode/vscode/vs/workbench/common/contributions';
+import { LifecyclePhase } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
 import { IClipboardService } from 'vscode/vscode/vs/platform/clipboard/common/clipboardService.service';
 import { Disposable, MutableDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
+import { StatusbarAlignment } from 'vscode/vscode/vs/workbench/services/statusbar/browser/statusbar';
 import { IStatusbarService } from 'vscode/vscode/vs/workbench/services/statusbar/browser/statusbar.service';
 import { IMarkerService } from 'vscode/vscode/vs/platform/markers/common/markers.service';
-import { Extensions as Extensions$1 } from 'vscode/vscode/vs/workbench/common/views';
+import { Extensions as Extensions$1, ViewContainerLocation } from 'vscode/vscode/vs/workbench/common/views';
 import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService.service';
 import { FocusedViewContext, getVisbileViewContextKey } from 'vscode/vscode/vs/workbench/common/contextkeys';
-import { ViewPaneContainer } from 'vscode/vscode/vs/workbench/browser/parts/views/viewPaneContainer';
+import { ViewPaneContainer } from '@codingame/monaco-vscode-9e888134-1a6f-58d9-b0e6-0fc047448366-common/vscode/vs/workbench/browser/parts/views/viewPaneContainer';
 import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
 import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
 import { registerIcon } from 'vscode/vscode/vs/platform/theme/common/iconRegistry';
-import { ViewAction } from 'vscode/vscode/vs/workbench/browser/parts/views/viewPane';
-import { NumberBadge } from 'vscode/vscode/vs/workbench/services/activity/common/activity';
+import { ViewAction } from '@codingame/monaco-vscode-65619f8f-0eab-5d8b-855a-43b6353fe527-common/vscode/vs/workbench/browser/parts/views/viewPane';
+import { NumberBadge } from '@codingame/monaco-vscode-a7c9ae3c-16d2-5d17-86b2-981be7094566-common/vscode/vs/workbench/services/activity/common/activity';
 import { IActivityService } from 'vscode/vscode/vs/workbench/services/activity/common/activity.service';
-import { viewFilterSubmenu } from 'vscode/vscode/vs/workbench/browser/parts/views/viewFilter';
+import { viewFilterSubmenu } from '@codingame/monaco-vscode-65619f8f-0eab-5d8b-855a-43b6353fe527-common/vscode/vs/workbench/browser/parts/views/viewFilter';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { problemsConfigurationNodeBase } from 'vscode/vscode/vs/workbench/common/configuration';
 
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: Markers.MARKER_OPEN_ACTION_ID,
-    weight: 200 ,
-    when: ( (ContextKeyExpr.and(MarkersContextKeys.MarkerFocusContextKey))),
-    primary: 3 ,
+    weight: KeybindingWeight.WorkbenchContrib,
+    when: ( ContextKeyExpr.and(MarkersContextKeys.MarkerFocusContextKey)),
+    primary: KeyCode.Enter,
     mac: {
-        primary: 3 ,
-        secondary: [2048  | 18 ]
+        primary: KeyCode.Enter,
+        secondary: [KeyMod.CtrlCmd | KeyCode.DownArrow]
     },
     handler: (accessor, args) => {
         const markersView = accessor.get(IViewsService).getActiveViewWithId(Markers.MARKERS_VIEW_ID);
@@ -46,11 +50,11 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: Markers.MARKER_OPEN_SIDE_ACTION_ID,
-    weight: 200 ,
-    when: ( (ContextKeyExpr.and(MarkersContextKeys.MarkerFocusContextKey))),
-    primary: 2048  | 3 ,
+    weight: KeybindingWeight.WorkbenchContrib,
+    when: ( ContextKeyExpr.and(MarkersContextKeys.MarkerFocusContextKey)),
+    primary: KeyMod.CtrlCmd | KeyCode.Enter,
     mac: {
-        primary: 256  | 3
+        primary: KeyMod.WinCtrl | KeyCode.Enter
     },
     handler: (accessor, args) => {
         const markersView = accessor.get(IViewsService).getActiveViewWithId(Markers.MARKERS_VIEW_ID);
@@ -59,7 +63,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: Markers.MARKER_SHOW_PANEL_ID,
-    weight: 200 ,
+    weight: KeybindingWeight.WorkbenchContrib,
     when: undefined,
     primary: undefined,
     handler: async (accessor, args) => {
@@ -68,9 +72,9 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: Markers.MARKER_SHOW_QUICK_FIX,
-    weight: 200 ,
+    weight: KeybindingWeight.WorkbenchContrib,
     when: MarkersContextKeys.MarkerFocusContextKey,
-    primary: 2048  | 89 ,
+    primary: KeyMod.CtrlCmd | KeyCode.Period,
     handler: (accessor, args) => {
         const markersView = accessor.get(IViewsService).getActiveViewWithId(Markers.MARKERS_VIEW_ID);
         const focusedElement = markersView.getFocusElement();
@@ -79,7 +83,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
         }
     }
 });
-( (Registry.as(Extensions.Configuration))).registerConfiguration({
+( Registry.as(Extensions.Configuration)).registerConfiguration({
     ...problemsConfigurationNodeBase,
     'properties': {
         'problems.autoReveal': {
@@ -110,48 +114,45 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
         },
     }
 });
-const markersViewIcon = registerIcon('markers-view-icon', Codicon.warning, ( localize(2339, 'View icon of the markers view.')));
-const VIEW_CONTAINER = ( (Registry.as(Extensions$1.ViewContainersRegistry))).registerViewContainer({
+const markersViewIcon = registerIcon('markers-view-icon', Codicon.warning, ( localize(7044, 'View icon of the markers view.')));
+const VIEW_CONTAINER = ( Registry.as(Extensions$1.ViewContainersRegistry)).registerViewContainer({
     id: Markers.MARKERS_CONTAINER_ID,
     title: Messages.MARKERS_PANEL_TITLE_PROBLEMS,
     icon: markersViewIcon,
     hideIfEmpty: true,
     order: 0,
-    ctorDescriptor: ( (new SyncDescriptor(
+    ctorDescriptor: ( new SyncDescriptor(
         ViewPaneContainer,
         [Markers.MARKERS_CONTAINER_ID, { mergeViewWithContainerWhenSingleView: true }]
-    ))),
+    )),
     storageId: Markers.MARKERS_VIEW_STORAGE_ID,
-}, 1 , { doNotRegisterOpenCommand: true });
-( (Registry.as(Extensions$1.ViewsRegistry))).registerViews([{
+}, ViewContainerLocation.Panel, { doNotRegisterOpenCommand: true });
+( Registry.as(Extensions$1.ViewsRegistry)).registerViews([{
         id: Markers.MARKERS_VIEW_ID,
         containerIcon: markersViewIcon,
         name: Messages.MARKERS_PANEL_TITLE_PROBLEMS,
         canToggleVisibility: false,
         canMoveView: true,
-        ctorDescriptor: ( (new SyncDescriptor(MarkersView))),
+        ctorDescriptor: ( new SyncDescriptor(MarkersView)),
         openCommandActionDescriptor: {
             id: 'workbench.actions.view.problems',
-            mnemonicTitle: ( localize(2340, "&&Problems")),
-            keybindings: { primary: 2048  | 1024  | 43  },
+            mnemonicTitle: ( localize(7045, "&&Problems")),
+            keybindings: { primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KeyM },
             order: 0,
         }
     }], VIEW_CONTAINER);
-const workbenchRegistry = ( (Registry.as(Extensions$2.Workbench)));
+const workbenchRegistry = ( Registry.as(Extensions$2.Workbench));
 registerAction2(class extends ViewAction {
     constructor() {
         super({
             id: `workbench.actions.table.${Markers.MARKERS_VIEW_ID}.viewAsTree`,
-            title: ( localize(2341, "View as Tree")),
+            title: ( localize(7046, "View as Tree")),
             metadata: {
-                description: ( localize2(2342, "Show the problems view as a tree."))
+                description: ( localize2(7047, "Show the problems view as a tree."))
             },
             menu: {
                 id: MenuId.ViewTitle,
-                when: ( (ContextKeyExpr.and(
-                     (ContextKeyExpr.equals('view', Markers.MARKERS_VIEW_ID)),
-                     (MarkersContextKeys.MarkersViewModeContextKey.isEqualTo("table" ))
-                ))),
+                when: ( ContextKeyExpr.and(( ContextKeyExpr.equals('view', Markers.MARKERS_VIEW_ID)), ( MarkersContextKeys.MarkersViewModeContextKey.isEqualTo(MarkersViewMode.Table)))),
                 group: 'navigation',
                 order: 3
             },
@@ -160,23 +161,20 @@ registerAction2(class extends ViewAction {
         });
     }
     async runInView(serviceAccessor, view) {
-        view.setViewMode("tree" );
+        view.setViewMode(MarkersViewMode.Tree);
     }
 });
 registerAction2(class extends ViewAction {
     constructor() {
         super({
             id: `workbench.actions.table.${Markers.MARKERS_VIEW_ID}.viewAsTable`,
-            title: ( localize(2343, "View as Table")),
+            title: ( localize(7048, "View as Table")),
             metadata: {
-                description: ( localize2(2344, "Show the problems view as a table."))
+                description: ( localize2(7049, "Show the problems view as a table."))
             },
             menu: {
                 id: MenuId.ViewTitle,
-                when: ( (ContextKeyExpr.and(
-                     (ContextKeyExpr.equals('view', Markers.MARKERS_VIEW_ID)),
-                     (MarkersContextKeys.MarkersViewModeContextKey.isEqualTo("tree" ))
-                ))),
+                when: ( ContextKeyExpr.and(( ContextKeyExpr.equals('view', Markers.MARKERS_VIEW_ID)), ( MarkersContextKeys.MarkersViewModeContextKey.isEqualTo(MarkersViewMode.Tree)))),
                 group: 'navigation',
                 order: 3
             },
@@ -185,23 +183,23 @@ registerAction2(class extends ViewAction {
         });
     }
     async runInView(serviceAccessor, view) {
-        view.setViewMode("table" );
+        view.setViewMode(MarkersViewMode.Table);
     }
 });
 registerAction2(class extends ViewAction {
     constructor() {
         super({
             id: `workbench.actions.${Markers.MARKERS_VIEW_ID}.toggleErrors`,
-            title: ( localize(2345, "Show Errors")),
+            title: ( localize(7050, "Show Errors")),
             metadata: {
-                description: ( localize2(2346, "Show or hide errors in the problems view."))
+                description: ( localize2(7051, "Show or hide errors in the problems view."))
             },
-            category: ( localize(2347, "Problems")),
+            category: ( localize(7052, "Problems")),
             toggled: MarkersContextKeys.ShowErrorsFilterContextKey,
             menu: {
                 id: viewFilterSubmenu,
                 group: '1_filter',
-                when: ( (ContextKeyExpr.equals('view', Markers.MARKERS_VIEW_ID))),
+                when: ( ContextKeyExpr.equals('view', Markers.MARKERS_VIEW_ID)),
                 order: 1
             },
             viewId: Markers.MARKERS_VIEW_ID
@@ -215,16 +213,16 @@ registerAction2(class extends ViewAction {
     constructor() {
         super({
             id: `workbench.actions.${Markers.MARKERS_VIEW_ID}.toggleWarnings`,
-            title: ( localize(2348, "Show Warnings")),
+            title: ( localize(7053, "Show Warnings")),
             metadata: {
-                description: ( localize2(2349, "Show or hide warnings in the problems view."))
+                description: ( localize2(7054, "Show or hide warnings in the problems view."))
             },
-            category: ( localize(2347, "Problems")),
+            category: ( localize(7052, "Problems")),
             toggled: MarkersContextKeys.ShowWarningsFilterContextKey,
             menu: {
                 id: viewFilterSubmenu,
                 group: '1_filter',
-                when: ( (ContextKeyExpr.equals('view', Markers.MARKERS_VIEW_ID))),
+                when: ( ContextKeyExpr.equals('view', Markers.MARKERS_VIEW_ID)),
                 order: 2
             },
             viewId: Markers.MARKERS_VIEW_ID
@@ -238,16 +236,16 @@ registerAction2(class extends ViewAction {
     constructor() {
         super({
             id: `workbench.actions.${Markers.MARKERS_VIEW_ID}.toggleInfos`,
-            title: ( localize(2350, "Show Infos")),
-            category: ( localize(2347, "Problems")),
+            title: ( localize(7055, "Show Infos")),
+            category: ( localize(7052, "Problems")),
             toggled: MarkersContextKeys.ShowInfoFilterContextKey,
             metadata: {
-                description: ( localize2(2351, "Show or hide infos in the problems view."))
+                description: ( localize2(7056, "Show or hide infos in the problems view."))
             },
             menu: {
                 id: viewFilterSubmenu,
                 group: '1_filter',
-                when: ( (ContextKeyExpr.equals('view', Markers.MARKERS_VIEW_ID))),
+                when: ( ContextKeyExpr.equals('view', Markers.MARKERS_VIEW_ID)),
                 order: 3
             },
             viewId: Markers.MARKERS_VIEW_ID
@@ -261,19 +259,19 @@ registerAction2(class extends ViewAction {
     constructor() {
         super({
             id: `workbench.actions.${Markers.MARKERS_VIEW_ID}.toggleActiveFile`,
-            title: ( localize(2352, "Show Active File Only")),
+            title: ( localize(7057, "Show Active File Only")),
             metadata: {
                 description: ( localize2(
-                    2353,
+                    7058,
                     "Show or hide problems (errors, warnings, info) only from the active file in the problems view."
                 ))
             },
-            category: ( localize(2347, "Problems")),
+            category: ( localize(7052, "Problems")),
             toggled: MarkersContextKeys.ShowActiveFileFilterContextKey,
             menu: {
                 id: viewFilterSubmenu,
                 group: '2_filter',
-                when: ( (ContextKeyExpr.equals('view', Markers.MARKERS_VIEW_ID))),
+                when: ( ContextKeyExpr.equals('view', Markers.MARKERS_VIEW_ID)),
                 order: 1
             },
             viewId: Markers.MARKERS_VIEW_ID
@@ -287,16 +285,16 @@ registerAction2(class extends ViewAction {
     constructor() {
         super({
             id: `workbench.actions.${Markers.MARKERS_VIEW_ID}.toggleExcludedFiles`,
-            title: ( localize(2354, "Show Excluded Files")),
+            title: ( localize(7059, "Show Excluded Files")),
             metadata: {
-                description: ( localize2(2355, "Show or hide excluded files in the problems view."))
+                description: ( localize2(7060, "Show or hide excluded files in the problems view."))
             },
-            category: ( localize(2347, "Problems")),
-            toggled: ( (MarkersContextKeys.ShowExcludedFilesFilterContextKey.negate())),
+            category: ( localize(7052, "Problems")),
+            toggled: ( MarkersContextKeys.ShowExcludedFilesFilterContextKey.negate()),
             menu: {
                 id: viewFilterSubmenu,
                 group: '2_filter',
-                when: ( (ContextKeyExpr.equals('view', Markers.MARKERS_VIEW_ID))),
+                when: ( ContextKeyExpr.equals('view', Markers.MARKERS_VIEW_ID)),
                 order: 2
             },
             viewId: Markers.MARKERS_VIEW_ID
@@ -321,22 +319,18 @@ registerAction2(class extends Action2 {
 });
 registerAction2(class extends ViewAction {
     constructor() {
-        const when = ( (ContextKeyExpr.and(
-             (FocusedViewContext.isEqualTo(Markers.MARKERS_VIEW_ID)),
-            MarkersContextKeys.MarkersTreeVisibilityContextKey,
-             (MarkersContextKeys.RelatedInformationFocusContextKey.toNegated())
-        )));
+        const when = ( ContextKeyExpr.and(( FocusedViewContext.isEqualTo(Markers.MARKERS_VIEW_ID)), MarkersContextKeys.MarkersTreeVisibilityContextKey, ( MarkersContextKeys.RelatedInformationFocusContextKey.toNegated())));
         super({
             id: Markers.MARKER_COPY_ACTION_ID,
-            title: ( localize2(2356, 'Copy')),
+            title: ( localize2(7061, 'Copy')),
             menu: {
                 id: MenuId.ProblemsPanelContext,
                 when,
                 group: 'navigation'
             },
             keybinding: {
-                weight: 200 ,
-                primary: 2048  | 33 ,
+                weight: KeybindingWeight.WorkbenchContrib,
+                primary: KeyMod.CtrlCmd | KeyCode.KeyC,
                 when
             },
             viewId: Markers.MARKERS_VIEW_ID
@@ -368,7 +362,7 @@ registerAction2(class extends ViewAction {
     constructor() {
         super({
             id: Markers.MARKER_COPY_MESSAGE_ACTION_ID,
-            title: ( localize2(2357, 'Copy Message')),
+            title: ( localize2(7062, 'Copy Message')),
             menu: {
                 id: MenuId.ProblemsPanelContext,
                 when: MarkersContextKeys.MarkerFocusContextKey,
@@ -389,7 +383,7 @@ registerAction2(class extends ViewAction {
     constructor() {
         super({
             id: Markers.RELATED_INFORMATION_COPY_MESSAGE_ACTION_ID,
-            title: ( localize2(2357, 'Copy Message')),
+            title: ( localize2(7062, 'Copy Message')),
             menu: {
                 id: MenuId.ProblemsPanelContext,
                 when: MarkersContextKeys.RelatedInformationFocusContextKey,
@@ -410,11 +404,11 @@ registerAction2(class extends ViewAction {
     constructor() {
         super({
             id: Markers.FOCUS_PROBLEMS_FROM_FILTER,
-            title: ( localize(2358, "Focus problems view")),
+            title: ( localize(7063, "Focus problems view")),
             keybinding: {
                 when: MarkersContextKeys.MarkerViewFilterFocusContextKey,
-                weight: 200 ,
-                primary: 2048  | 18
+                weight: KeybindingWeight.WorkbenchContrib,
+                primary: KeyMod.CtrlCmd | KeyCode.DownArrow
             },
             viewId: Markers.MARKERS_VIEW_ID
         });
@@ -427,11 +421,11 @@ registerAction2(class extends ViewAction {
     constructor() {
         super({
             id: Markers.MARKERS_VIEW_FOCUS_FILTER,
-            title: ( localize(2359, "Focus problems filter")),
+            title: ( localize(7064, "Focus problems filter")),
             keybinding: {
-                when: ( (FocusedViewContext.isEqualTo(Markers.MARKERS_VIEW_ID))),
-                weight: 200 ,
-                primary: 2048  | 36
+                when: ( FocusedViewContext.isEqualTo(Markers.MARKERS_VIEW_ID)),
+                weight: KeybindingWeight.WorkbenchContrib,
+                primary: KeyMod.CtrlCmd | KeyCode.KeyF
             },
             viewId: Markers.MARKERS_VIEW_ID
         });
@@ -444,11 +438,11 @@ registerAction2(class extends ViewAction {
     constructor() {
         super({
             id: Markers.MARKERS_VIEW_SHOW_MULTILINE_MESSAGE,
-            title: ( localize2(2360, "Show message in multiple lines")),
-            category: ( localize(2347, "Problems")),
+            title: ( localize2(7065, "Show message in multiple lines")),
+            category: ( localize(7052, "Problems")),
             menu: {
                 id: MenuId.CommandPalette,
-                when: ( (ContextKeyExpr.has(getVisbileViewContextKey(Markers.MARKERS_VIEW_ID))))
+                when: ( ContextKeyExpr.has(getVisbileViewContextKey(Markers.MARKERS_VIEW_ID)))
             },
             viewId: Markers.MARKERS_VIEW_ID
         });
@@ -461,11 +455,11 @@ registerAction2(class extends ViewAction {
     constructor() {
         super({
             id: Markers.MARKERS_VIEW_SHOW_SINGLELINE_MESSAGE,
-            title: ( localize2(2361, "Show message in single line")),
-            category: ( localize(2347, "Problems")),
+            title: ( localize2(7066, "Show message in single line")),
+            category: ( localize(7052, "Problems")),
             menu: {
                 id: MenuId.CommandPalette,
-                when: ( (ContextKeyExpr.has(getVisbileViewContextKey(Markers.MARKERS_VIEW_ID))))
+                when: ( ContextKeyExpr.has(getVisbileViewContextKey(Markers.MARKERS_VIEW_ID)))
             },
             viewId: Markers.MARKERS_VIEW_ID
         });
@@ -478,12 +472,12 @@ registerAction2(class extends ViewAction {
     constructor() {
         super({
             id: Markers.MARKERS_VIEW_CLEAR_FILTER_TEXT,
-            title: ( localize(2362, "Clear filters text")),
-            category: ( localize(2347, "Problems")),
+            title: ( localize(7067, "Clear filters text")),
+            category: ( localize(7052, "Problems")),
             keybinding: {
                 when: MarkersContextKeys.MarkerViewFilterFocusContextKey,
-                weight: 200 ,
-                primary: 9
+                weight: KeybindingWeight.WorkbenchContrib,
+                primary: KeyCode.Escape
             },
             viewId: Markers.MARKERS_VIEW_ID
         });
@@ -496,13 +490,10 @@ registerAction2(class extends ViewAction {
     constructor() {
         super({
             id: `workbench.actions.treeView.${Markers.MARKERS_VIEW_ID}.collapseAll`,
-            title: ( localize(2363, "Collapse All")),
+            title: ( localize(7068, "Collapse All")),
             menu: {
                 id: MenuId.ViewTitle,
-                when: ( (ContextKeyExpr.and(
-                     (ContextKeyExpr.equals('view', Markers.MARKERS_VIEW_ID)),
-                     (MarkersContextKeys.MarkersViewModeContextKey.isEqualTo("tree" ))
-                ))),
+                when: ( ContextKeyExpr.and(( ContextKeyExpr.equals('view', Markers.MARKERS_VIEW_ID)), ( MarkersContextKeys.MarkersViewModeContextKey.isEqualTo(MarkersViewMode.Tree)))),
                 group: 'navigation',
                 order: 2,
             },
@@ -537,9 +528,9 @@ let MarkersStatusBarContributions = class MarkersStatusBarContributions extends
         this.markerService = markerService;
         this.statusbarService = statusbarService;
         this.configurationService = configurationService;
-        this.markersStatusItem = this._register(this.statusbarService.addEntry(this.getMarkersItem(), 'status.problems', 0 , 50 ));
+        this.markersStatusItem = this._register(this.statusbarService.addEntry(this.getMarkersItem(), 'status.problems', StatusbarAlignment.LEFT, 50 ));
         const addStatusBarEntry = () => {
-            this.markersStatusItemOff = this.statusbarService.addEntry(this.getMarkersItemTurnedOff(), 'status.problemsVisibility', 0 , 49);
+            this.markersStatusItemOff = this.statusbarService.addEntry(this.getMarkersItemTurnedOff(), 'status.problemsVisibility', StatusbarAlignment.LEFT, 49);
         };
         let config = this.configurationService.getValue('problems.visibility');
         if (!config) {
@@ -566,7 +557,7 @@ let MarkersStatusBarContributions = class MarkersStatusBarContributions extends
         const markersStatistics = this.markerService.getStatistics();
         const tooltip = this.getMarkersTooltip(markersStatistics);
         return {
-            name: ( localize(2364, "Problems")),
+            name: ( localize(7069, "Problems")),
             text: this.getMarkersText(markersStatistics),
             ariaLabel: tooltip,
             tooltip,
@@ -577,9 +568,9 @@ let MarkersStatusBarContributions = class MarkersStatusBarContributions extends
         this.statusbarService.updateEntryVisibility('status.problemsVisibility', true);
         const openSettingsCommand = 'workbench.action.openSettings';
         const configureSettingsLabel = '@id:problems.visibility';
-        const tooltip = ( localize(2365, "Problems are turned off. Click to open settings."));
+        const tooltip = ( localize(7070, "Problems are turned off. Click to open settings."));
         return {
-            name: ( localize(2366, "Problems Visibility")),
+            name: ( localize(7071, "Problems Visibility")),
             text: '$(whole-word)',
             ariaLabel: tooltip,
             tooltip,
@@ -588,9 +579,9 @@ let MarkersStatusBarContributions = class MarkersStatusBarContributions extends
         };
     }
     getMarkersTooltip(stats) {
-        const errorTitle = (n) => ( localize(2367, "Errors: {0}", n));
-        const warningTitle = (n) => ( localize(2368, "Warnings: {0}", n));
-        const infoTitle = (n) => ( localize(2369, "Infos: {0}", n));
+        const errorTitle = (n) => ( localize(7072, "Errors: {0}", n));
+        const warningTitle = (n) => ( localize(7073, "Warnings: {0}", n));
+        const infoTitle = (n) => ( localize(7074, "Infos: {0}", n));
         const titles = [];
         if (stats.errors > 0) {
             titles.push(errorTitle(stats.errors));
@@ -602,7 +593,7 @@ let MarkersStatusBarContributions = class MarkersStatusBarContributions extends
             titles.push(infoTitle(stats.infos));
         }
         if (titles.length === 0) {
-            return ( localize(2370, "No Problems"));
+            return localize(7075, "No Problems");
         }
         return titles.join(', ');
     }
@@ -616,22 +607,22 @@ let MarkersStatusBarContributions = class MarkersStatusBarContributions extends
         return problemsText.join(' ');
     }
     packNumber(n) {
-        const manyProblems = ( localize(2371, "10K+"));
-        return n > 9999 ? manyProblems : n > 999 ? ( (n.toString())).charAt(0) + 'K' : ( (n.toString()));
+        const manyProblems = ( localize(7076, "10K+"));
+        return n > 9999 ? manyProblems : n > 999 ? ( n.toString()).charAt(0) + 'K' : ( n.toString());
     }
 };
-MarkersStatusBarContributions = ( (__decorate([
-    ( (__param(0, IMarkerService))),
-    ( (__param(1, IStatusbarService))),
-    ( (__param(2, IConfigurationService)))
-], MarkersStatusBarContributions)));
-workbenchRegistry.registerWorkbenchContribution(MarkersStatusBarContributions, 3 );
+MarkersStatusBarContributions = ( __decorate([
+    ( __param(0, IMarkerService)),
+    ( __param(1, IStatusbarService)),
+    ( __param(2, IConfigurationService))
+], MarkersStatusBarContributions));
+workbenchRegistry.registerWorkbenchContribution(MarkersStatusBarContributions, LifecyclePhase.Restored);
 let ActivityUpdater = class ActivityUpdater extends Disposable {
     constructor(activityService, markerService) {
         super();
         this.activityService = activityService;
         this.markerService = markerService;
-        this.activity = this._register(( (new MutableDisposable())));
+        this.activity = this._register(( new MutableDisposable()));
         this._register(this.markerService.onMarkerChanged(() => this.updateBadge()));
         this.updateBadge();
     }
@@ -639,16 +630,16 @@ let ActivityUpdater = class ActivityUpdater extends Disposable {
         const { errors, warnings, infos } = this.markerService.getStatistics();
         const total = errors + warnings + infos;
         if (total > 0) {
-            const message = ( localize(2372, 'Total {0} Problems', total));
-            this.activity.value = this.activityService.showViewActivity(Markers.MARKERS_VIEW_ID, { badge: ( (new NumberBadge(total, () => message))) });
+            const message = ( localize(7077, '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([
-    ( (__param(0, IActivityService))),
-    ( (__param(1, IMarkerService)))
-], ActivityUpdater)));
-workbenchRegistry.registerWorkbenchContribution(ActivityUpdater, 3 );
+ActivityUpdater = ( __decorate([
+    ( __param(0, IActivityService)),
+    ( __param(1, IMarkerService))
+], ActivityUpdater));
+workbenchRegistry.registerWorkbenchContribution(ActivityUpdater, LifecyclePhase.Restored);

package/vscode/src/vs/workbench/contrib/markers/browser/markers.d.ts

@@ -0,0 +1,19 @@
+import { MarkersFilters } from "./markersViewActions.js";
+import { IView } from "vscode/vscode/vs/workbench/common/views";
+import { MarkerElement, ResourceMarkers } from "./markersModel.js";
+import { MarkersViewMode } from "@codingame/monaco-vscode-2448342b-297f-5823-9f41-f18eef0f6ee8-common/vscode/vs/workbench/contrib/markers/common/markers";
+export interface IMarkersView extends IView {
+    readonly filters: MarkersFilters;
+    focusFilter(): void;
+    clearFilterText(): void;
+    getFilterStats(): {
+        total: number;
+        filtered: number;
+    };
+    getFocusElement(): MarkerElement | undefined;
+    getFocusedSelectedElements(): MarkerElement[] | null;
+    getAllResourceMarkers(): ResourceMarkers[];
+    collapseAll(): void;
+    setMultiline(multiline: boolean): void;
+    setViewMode(viewMode: MarkersViewMode): void;
+}

package/vscode/src/vs/workbench/contrib/markers/browser/markersFileDecorations.d.ts

@@ -0,0 +1 @@
+export {};