@codingame/monaco-vscode-markers-service-override 5.3.0 → 6.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-markers-service-override",
-  "version": "5.3.0",
+  "version": "6.0.0",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -26,6 +26,6 @@
     }
   },
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@5.3.0"
+    "vscode": "npm:@codingame/monaco-vscode-api@6.0.0"
   }
 }

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

@@ -3,20 +3,23 @@ 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 { 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';
 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 'vscode/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';
@@ -33,12 +36,12 @@ import { problemsConfigurationNodeBase } from 'vscode/vscode/vs/workbench/common
 const _moduleId = "vs/workbench/contrib/markers/browser/markers.contribution";
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: Markers.MARKER_OPEN_ACTION_ID,
-    weight: 200 ,
+    weight: KeybindingWeight.WorkbenchContrib,
     when: ( (ContextKeyExpr.and(MarkersContextKeys.MarkerFocusContextKey))),
-    primary: 3 ,
+    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);
@@ -47,11 +50,11 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: Markers.MARKER_OPEN_SIDE_ACTION_ID,
-    weight: 200 ,
+    weight: KeybindingWeight.WorkbenchContrib,
     when: ( (ContextKeyExpr.and(MarkersContextKeys.MarkerFocusContextKey))),
-    primary: 2048  | 3 ,
+    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);
@@ -60,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) => {
@@ -69,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();
@@ -123,7 +126,7 @@ const VIEW_CONTAINER = ( (Registry.as(Extensions$1.ViewContainersRegistry))).reg
         [Markers.MARKERS_CONTAINER_ID, { mergeViewWithContainerWhenSingleView: true }]
     ))),
     storageId: Markers.MARKERS_VIEW_STORAGE_ID,
-}, 1 , { doNotRegisterOpenCommand: true });
+}, ViewContainerLocation.Panel, { doNotRegisterOpenCommand: true });
 ( (Registry.as(Extensions$1.ViewsRegistry))).registerViews([{
         id: Markers.MARKERS_VIEW_ID,
         containerIcon: markersViewIcon,
@@ -134,7 +137,7 @@ const VIEW_CONTAINER = ( (Registry.as(Extensions$1.ViewContainersRegistry))).reg
         openCommandActionDescriptor: {
             id: 'workbench.actions.view.problems',
             mnemonicTitle: ( localizeWithPath(_moduleId, 1, "&&Problems")),
-            keybindings: { primary: 2048  | 1024  | 43  },
+            keybindings: { primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KeyM },
             order: 0,
         }
     }], VIEW_CONTAINER);
@@ -148,7 +151,7 @@ registerAction2(class extends ViewAction {
                 id: MenuId.ViewTitle,
                 when: ( (ContextKeyExpr.and(
                      (ContextKeyExpr.equals('view', Markers.MARKERS_VIEW_ID)),
-                     (MarkersContextKeys.MarkersViewModeContextKey.isEqualTo("table" ))
+                     (MarkersContextKeys.MarkersViewModeContextKey.isEqualTo(MarkersViewMode.Table))
                 ))),
                 group: 'navigation',
                 order: 3
@@ -158,7 +161,7 @@ registerAction2(class extends ViewAction {
         });
     }
     async runInView(serviceAccessor, view) {
-        view.setViewMode("tree" );
+        view.setViewMode(MarkersViewMode.Tree);
     }
 });
 registerAction2(class extends ViewAction {
@@ -170,7 +173,7 @@ registerAction2(class extends ViewAction {
                 id: MenuId.ViewTitle,
                 when: ( (ContextKeyExpr.and(
                      (ContextKeyExpr.equals('view', Markers.MARKERS_VIEW_ID)),
-                     (MarkersContextKeys.MarkersViewModeContextKey.isEqualTo("tree" ))
+                     (MarkersContextKeys.MarkersViewModeContextKey.isEqualTo(MarkersViewMode.Tree))
                 ))),
                 group: 'navigation',
                 order: 3
@@ -180,7 +183,7 @@ registerAction2(class extends ViewAction {
         });
     }
     async runInView(serviceAccessor, view) {
-        view.setViewMode("table" );
+        view.setViewMode(MarkersViewMode.Table);
     }
 });
 registerAction2(class extends ViewAction {
@@ -312,8 +315,8 @@ registerAction2(class extends ViewAction {
                 group: 'navigation'
             },
             keybinding: {
-                weight: 200 ,
-                primary: 2048  | 33 ,
+                weight: KeybindingWeight.WorkbenchContrib,
+                primary: KeyMod.CtrlCmd | KeyCode.KeyC,
                 when
             },
             viewId: Markers.MARKERS_VIEW_ID
@@ -390,8 +393,8 @@ registerAction2(class extends ViewAction {
             title: ( localizeWithPath(_moduleId, 12, "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
         });
@@ -407,8 +410,8 @@ registerAction2(class extends ViewAction {
             title: ( localizeWithPath(_moduleId, 13, "Focus problems filter")),
             keybinding: {
                 when: ( (FocusedViewContext.isEqualTo(Markers.MARKERS_VIEW_ID))),
-                weight: 200 ,
-                primary: 2048  | 36
+                weight: KeybindingWeight.WorkbenchContrib,
+                primary: KeyMod.CtrlCmd | KeyCode.KeyF
             },
             viewId: Markers.MARKERS_VIEW_ID
         });
@@ -459,8 +462,8 @@ registerAction2(class extends ViewAction {
             category: ( localizeWithPath(_moduleId, 5, "Problems")),
             keybinding: {
                 when: MarkersContextKeys.MarkerViewFilterFocusContextKey,
-                weight: 200 ,
-                primary: 9
+                weight: KeybindingWeight.WorkbenchContrib,
+                primary: KeyCode.Escape
             },
             viewId: Markers.MARKERS_VIEW_ID
         });
@@ -478,7 +481,7 @@ registerAction2(class extends ViewAction {
                 id: MenuId.ViewTitle,
                 when: ( (ContextKeyExpr.and(
                      (ContextKeyExpr.equals('view', Markers.MARKERS_VIEW_ID)),
-                     (MarkersContextKeys.MarkersViewModeContextKey.isEqualTo("tree" ))
+                     (MarkersContextKeys.MarkersViewModeContextKey.isEqualTo(MarkersViewMode.Tree))
                 ))),
                 group: 'navigation',
                 order: 2,
@@ -514,9 +517,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) {
@@ -602,7 +605,7 @@ MarkersStatusBarContributions = ( (__decorate([
     ( (__param(1, IStatusbarService))),
     ( (__param(2, IConfigurationService)))
 ], MarkersStatusBarContributions)));
-workbenchRegistry.registerWorkbenchContribution(MarkersStatusBarContributions, 3 );
+workbenchRegistry.registerWorkbenchContribution(MarkersStatusBarContributions, LifecyclePhase.Restored);
 let ActivityUpdater = class ActivityUpdater extends Disposable {
     constructor(activityService, markerService) {
         super();
@@ -628,4 +631,4 @@ ActivityUpdater = ( (__decorate([
     ( (__param(0, IActivityService))),
     ( (__param(1, IMarkerService)))
 ], ActivityUpdater)));
-workbenchRegistry.registerWorkbenchContribution(ActivityUpdater, 3 );
+workbenchRegistry.registerWorkbenchContribution(ActivityUpdater, LifecyclePhase.Restored);

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

@@ -19,6 +19,7 @@ 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.service';
 import { Extensions } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
+import { LifecyclePhase } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
 
 const _moduleId = "vs/workbench/contrib/markers/browser/markersFileDecorations";
 class MarkersDecorationsProvider {
@@ -114,4 +115,4 @@ MarkersFileDecorations = ( (__decorate([
     }
 });
 ( (Registry.as(Extensions$1.Workbench)))
-    .registerWorkbenchContribution(MarkersFileDecorations, 3 );
+    .registerWorkbenchContribution(MarkersFileDecorations, LifecyclePhase.Restored);

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

@@ -1,7 +1,7 @@
 import { extUri, basename } from 'vscode/vscode/vs/base/common/resources';
 import { Range } from 'vscode/vscode/vs/editor/common/core/range';
 import { MarkerSeverity, IMarkerData } from 'vscode/vscode/vs/platform/markers/common/markers';
-import { flatten, isNonEmptyArray } from 'vscode/vscode/vs/base/common/arrays';
+import { isNonEmptyArray } from 'vscode/vscode/vs/base/common/arrays';
 import { ResourceMap } from 'vscode/vscode/vs/base/common/map';
 import { Emitter } from 'vscode/vscode/vs/base/common/event';
 import { Hasher } from 'vscode/vscode/vs/base/common/hash';
@@ -34,7 +34,7 @@ class ResourceMarkers {
     }
     get markers() {
         if (!this._cachedMarkers) {
-            this._cachedMarkers = flatten([...( this._markersMap.values())]).sort(ResourceMarkers._compareMarkers);
+            this._cachedMarkers = [...( this._markersMap.values())].flat().sort(ResourceMarkers._compareMarkers);
         }
         return this._cachedMarkers;
     }

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

@@ -13,6 +13,7 @@ import { ActionBar } from 'vscode/vscode/vs/base/browser/ui/actionbar/actionbar'
 import { QuickFixAction, QuickFixActionViewItem } from './markersViewActions.js';
 import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label.service';
 import { basename, isEqual } from 'vscode/vscode/vs/base/common/resources';
+import { TreeVisibility } from 'vscode/vscode/vs/base/browser/ui/tree/tree';
 import { FilterOptions } from './markersFilterOptions.js';
 import { Emitter } from 'vscode/vscode/vs/base/common/event';
 import { isUndefinedOrNull } from 'vscode/vscode/vs/base/common/types';
@@ -26,6 +27,7 @@ import { CodeActionTriggerSource, CodeActionKind } from 'vscode/vscode/vs/editor
 import { ACTIVE_GROUP } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
 import { SeverityIcon } from 'vscode/vscode/vs/platform/severityIcon/browser/severityIcon';
+import { CodeActionTriggerType } from 'vscode/vscode/vs/editor/common/languages';
 import { IOpenerService } from 'vscode/vscode/vs/platform/opener/common/opener.service';
 import { Progress } from 'vscode/vscode/vs/platform/progress/common/progress';
 import { ActionViewItem } from 'vscode/vscode/vs/base/browser/ui/actionbar/actionViewItems';
@@ -34,7 +36,7 @@ import { registerIcon } from 'vscode/vscode/vs/platform/theme/common/iconRegistr
 import { Link } from 'vscode/vscode/vs/platform/opener/browser/link';
 import { ILanguageFeaturesService } from 'vscode/vscode/vs/editor/common/services/languageFeatures';
 import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
-import { MarkersContextKeys } from 'vscode/vscode/vs/workbench/contrib/markers/common/markers';
+import { MarkersViewMode, 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$1 from 'vscode/vscode/vs/base/common/severity';
@@ -66,6 +68,12 @@ let MarkersWidgetAccessibilityProvider = class MarkersWidgetAccessibilityProvide
 MarkersWidgetAccessibilityProvider = ( (__decorate([
     ( (__param(0, ILabelService)))
 ], MarkersWidgetAccessibilityProvider)));
+var TemplateId;
+( ((function(TemplateId) {
+    TemplateId["ResourceMarkers"] = "rm";
+    TemplateId["Marker"] = "m";
+    TemplateId["RelatedInformation"] = "ri";
+})(TemplateId || (TemplateId = {}))));
 class VirtualDelegate {
     static { this.LINE_HEIGHT = 22; }
     constructor(markersViewState) {
@@ -81,22 +89,28 @@ class VirtualDelegate {
     }
     getTemplateId(element) {
         if (element instanceof ResourceMarkers) {
-            return "rm" ;
+            return TemplateId.ResourceMarkers;
         }
         else if (element instanceof Marker) {
-            return "m" ;
+            return TemplateId.Marker;
         }
         else {
-            return "ri" ;
+            return TemplateId.RelatedInformation;
         }
     }
 }
+var FilterDataType;
+( ((function(FilterDataType) {
+    FilterDataType[FilterDataType["ResourceMarkers"] = 0] = "ResourceMarkers";
+    FilterDataType[FilterDataType["Marker"] = 1] = "Marker";
+    FilterDataType[FilterDataType["RelatedInformation"] = 2] = "RelatedInformation";
+})(FilterDataType || (FilterDataType = {}))));
 class ResourceMarkersRenderer {
     constructor(labels, onDidChangeRenderNodeCount) {
         this.labels = labels;
         this.renderedNodes = ( (new Map()));
         this.disposables = ( (new DisposableStore()));
-        this.templateId = "rm" ;
+        this.templateId = TemplateId.ResourceMarkers;
         onDidChangeRenderNodeCount(this.onDidChangeRenderNodeCount, this, this.disposables);
     }
     renderTemplate(container) {
@@ -150,7 +164,7 @@ let MarkerRenderer = class MarkerRenderer {
         this.hoverService = hoverService;
         this.instantiationService = instantiationService;
         this.openerService = openerService;
-        this.templateId = "m" ;
+        this.templateId = TemplateId.Marker;
     }
     renderTemplate(container) {
         const data = Object.create(null);
@@ -323,7 +337,7 @@ class MarkerWidget extends Disposable {
 let RelatedInformationRenderer = class RelatedInformationRenderer {
     constructor(labelService) {
         this.labelService = labelService;
-        this.templateId = "ri" ;
+        this.templateId = TemplateId.RelatedInformation;
     }
     renderTemplate(container) {
         const data = Object.create(null);
@@ -382,10 +396,10 @@ class Filter {
         if (this.options.textFilter.text && !this.options.textFilter.negate) {
             const uriMatches = FilterOptions._filter(this.options.textFilter.text, basename(resourceMarkers.resource));
             if (uriMatches) {
-                return { visibility: true, data: { type: 0 , uriMatches: uriMatches || [] } };
+                return { visibility: true, data: { type: FilterDataType.ResourceMarkers, uriMatches: uriMatches || [] } };
             }
         }
-        return 2 ;
+        return TreeVisibility.Recurse;
     }
     filterMarker(marker, parentVisibility) {
         const matchesSeverity = this.options.showErrors && MarkerSeverity.Error === marker.marker.severity ||
@@ -406,12 +420,12 @@ class Filter {
         const codeMatches = marker.marker.code ? FilterOptions._filter(this.options.textFilter.text, typeof marker.marker.code === 'string' ? marker.marker.code : marker.marker.code.value) : undefined;
         const matched = sourceMatches || codeMatches || ( (lineMatches.some(lineMatch => lineMatch.length > 0)));
         if (matched && !this.options.textFilter.negate) {
-            return { visibility: true, data: { type: 1 , lineMatches, sourceMatches: sourceMatches || [], codeMatches: codeMatches || [] } };
+            return { visibility: true, data: { type: FilterDataType.Marker, lineMatches, sourceMatches: sourceMatches || [], codeMatches: codeMatches || [] } };
         }
-        if (matched && this.options.textFilter.negate && parentVisibility === 2 ) {
+        if (matched && this.options.textFilter.negate && parentVisibility === TreeVisibility.Recurse) {
             return false;
         }
-        if (!matched && this.options.textFilter.negate && parentVisibility === 2 ) {
+        if (!matched && this.options.textFilter.negate && parentVisibility === TreeVisibility.Recurse) {
             return true;
         }
         return parentVisibility;
@@ -424,12 +438,12 @@ class Filter {
         const messageMatches = FilterOptions._messageFilter(this.options.textFilter.text, basename$1(relatedInformation.raw.message));
         const matched = uriMatches || messageMatches;
         if (matched && !this.options.textFilter.negate) {
-            return { visibility: true, data: { type: 2 , uriMatches: uriMatches || [], messageMatches: messageMatches || [] } };
+            return { visibility: true, data: { type: FilterDataType.RelatedInformation, uriMatches: uriMatches || [], messageMatches: messageMatches || [] } };
         }
-        if (matched && this.options.textFilter.negate && parentVisibility === 2 ) {
+        if (matched && this.options.textFilter.negate && parentVisibility === TreeVisibility.Recurse) {
             return false;
         }
-        if (!matched && this.options.textFilter.negate && parentVisibility === 2 ) {
+        if (!matched && this.options.textFilter.negate && parentVisibility === TreeVisibility.Recurse) {
             return true;
         }
         return parentVisibility;
@@ -496,7 +510,7 @@ let MarkerViewModel = class MarkerViewModel extends Disposable {
                             this.marker.range.endLineNumber,
                             this.marker.range.endColumn
                         ))), {
-                            type: 1 , triggerAction: CodeActionTriggerSource.ProblemsView, filter: { include: CodeActionKind.QuickFix }
+                            type: CodeActionTriggerType.Invoke, triggerAction: CodeActionTriggerSource.ProblemsView, filter: { include: CodeActionKind.QuickFix }
                         }, Progress.None, cancellationToken).then(actions => {
                             return this._register(actions);
                         });
@@ -564,7 +578,7 @@ MarkerViewModel = ( (__decorate([
     ( (__param(4, ILanguageFeaturesService)))
 ], MarkerViewModel)));
 let MarkersViewModel = class MarkersViewModel extends Disposable {
-    constructor(multiline = true, viewMode = "tree" , contextKeyService, instantiationService) {
+    constructor(multiline = true, viewMode = MarkersViewMode.Tree, contextKeyService, instantiationService) {
         super();
         this.contextKeyService = contextKeyService;
         this.instantiationService = instantiationService;
@@ -578,7 +592,7 @@ let MarkersViewModel = class MarkersViewModel extends Disposable {
         this.hoveredMarker = null;
         this.hoverDelayer = ( (new Delayer(300)));
         this._multiline = true;
-        this._viewMode = "tree" ;
+        this._viewMode = MarkersViewMode.Tree;
         this._multiline = multiline;
         this._viewMode = viewMode;
         this.viewModeContextKey = MarkersContextKeys.MarkersViewModeContextKey.bindTo(this.contextKeyService);

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

@@ -12,6 +12,7 @@ import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/c
 import Messages from './messages.js';
 import { RangeHighlightDecorations } from 'vscode/vscode/vs/workbench/browser/codeeditor';
 import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService.service';
+import { StorageScope, StorageTarget } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
@@ -31,6 +32,7 @@ import { ResourceLabels } from 'vscode/vscode/vs/workbench/browser/labels';
 import { MarkerSeverity } from 'vscode/vscode/vs/platform/markers/common/markers';
 import { IMarkerService } from 'vscode/vscode/vs/platform/markers/common/markers.service';
 import { Memento } from 'vscode/vscode/vs/workbench/common/memento';
+import { KeyCode } from 'vscode/vscode/vs/base/common/keyCodes';
 import { FilterViewPane } from 'vscode/vscode/vs/workbench/browser/parts/views/viewPane';
 import { IViewDescriptorService } from 'vscode/vscode/vs/workbench/common/views.service';
 import { withSelection } from 'vscode/vscode/vs/platform/opener/common/opener';
@@ -43,9 +45,10 @@ import { ResourceMap } from 'vscode/vscode/vs/base/common/map';
 import { EditorResourceAccessor, SideBySideEditor } from 'vscode/vscode/vs/workbench/common/editor';
 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 { Markers, MarkersContextKeys, MarkersViewMode } 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';
+import { ResultKind } from 'vscode/vscode/vs/platform/keybinding/common/keybindingResolver';
 
 const _moduleId = "vs/workbench/contrib/markers/browser/markersView";
 function createResourceMarkersIterator(resourceMarkers) {
@@ -60,7 +63,7 @@ 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, hoverService) {
         const memento = ( (new Memento(Markers.MARKERS_VIEW_STORAGE_ID, storageService)));
-        const panelState = memento.getMemento(1 , 1 );
+        const panelState = memento.getMemento(StorageScope.WORKSPACE, StorageTarget.MACHINE);
         super({
             ...options,
             filterOptions: {
@@ -135,7 +138,7 @@ let MarkersView = class MarkersView extends FilterViewPane {
                 return;
             }
             const result = this.keybindingService.softDispatch(event, event.target);
-            if (result.kind === 1  || result.kind === 2 ) {
+            if (result.kind === ResultKind.MoreChordsNeeded || result.kind === ResultKind.KbFound) {
                 return;
             }
             this.focusFilter();
@@ -275,11 +278,11 @@ let MarkersView = class MarkersView extends FilterViewPane {
     getDefaultViewMode() {
         switch (this.configurationService.getValue('problems.defaultViewMode')) {
             case 'table':
-                return "table" ;
+                return MarkersViewMode.Table;
             case 'tree':
-                return "tree" ;
+                return MarkersViewMode.Tree;
             default:
-                return "tree" ;
+                return MarkersViewMode.Tree;
         }
     }
     getFilesExcludeExpressions() {
@@ -318,7 +321,7 @@ let MarkersView = class MarkersView extends FilterViewPane {
         this.ariaLabelElement.setAttribute('id', 'markers-panel-arialabel');
     }
     createWidget(parent) {
-        this.widget = this.markersViewModel.viewMode === "table"  ? this.createTable(parent) : this.createTree(parent);
+        this.widget = this.markersViewModel.viewMode === MarkersViewMode.Table ? this.createTable(parent) : this.createTree(parent);
         this.widgetDisposables.add(this.widget);
         const markerFocusContextKey = MarkersContextKeys.MarkerFocusContextKey.bindTo(this.widget.contextKeyService);
         const relatedInformationFocusContextKey = MarkersContextKeys.RelatedInformationFocusContextKey.bindTo(this.widget.contextKeyService);
@@ -584,7 +587,7 @@ let MarkersView = class MarkersView extends FilterViewPane {
         span2.textContent = '.';
         addStandardDisposableListener(link, EventType.CLICK, () => this.clearFilters());
         addStandardDisposableListener(link, EventType.KEY_DOWN, (e) => {
-            if (e.equals(3 ) || e.equals(10 )) {
+            if (e.equals(KeyCode.Enter) || e.equals(KeyCode.Space)) {
                 this.clearFilters();
                 e.stopPropagation();
             }