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

package/index.d.ts

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

package/index.js

@@ -1,5 +1,5 @@
 
-import 'vscode/vscode/vs/editor/standalone/browser/standaloneServices';
+import '@codingame/monaco-vscode-api/vscode/vs/editor/standalone/browser/standaloneServices';
 import './vscode/src/vs/workbench/contrib/markers/browser/markers.contribution.js';
 
 function getServiceOverride() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-markers-service-override",
-  "version": "12.0.1",
+  "version": "13.1.0",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - markers service-override",
   "keywords": [],
@@ -15,16 +15,14 @@
   },
   "type": "module",
   "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"
+    "@codingame/monaco-vscode-2448342b-297f-5823-9f41-f18eef0f6ee8-common": "13.1.0",
+    "@codingame/monaco-vscode-65619f8f-0eab-5d8b-855a-43b6353fe527-common": "13.1.0",
+    "@codingame/monaco-vscode-9e888134-1a6f-58d9-b0e6-0fc047448366-common": "13.1.0",
+    "@codingame/monaco-vscode-a7c9ae3c-16d2-5d17-86b2-981be7094566-common": "13.1.0",
+    "@codingame/monaco-vscode-api": "13.1.0",
+    "@codingame/monaco-vscode-b4efa70b-52b9-5670-ab5c-f10b10b6834e-common": "13.1.0",
+    "@codingame/monaco-vscode-e7080bda-ce3e-5243-9a35-98cd9634dbda-common": "13.1.0"
   },
-  "peerDependencies": {},
-  "peerDependenciesMeta": {},
   "main": "index.js",
   "module": "index.js",
   "types": "index.d.ts",

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

@@ -1,38 +1,38 @@
 
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
+import { __decorate, __param } from '@codingame/monaco-vscode-api/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, 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 { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
+import { Extensions } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configurationRegistry';
+import { Categories } from '@codingame/monaco-vscode-api/vscode/vs/platform/action/common/actionCommonCategories';
+import { KeybindingsRegistry, KeybindingWeight } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybindingsRegistry';
+import { KeyCode, KeyMod } from '@codingame/monaco-vscode-api/vscode/vs/base/common/keyCodes';
+import { localize, localize2 } from '@codingame/monaco-vscode-api/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 { registerAction2, MenuId, Action2 } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
+import { Registry } from '@codingame/monaco-vscode-api/vscode/vs/platform/registry/common/platform';
 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, 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 { Extensions as Extensions$2 } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions';
+import { LifecyclePhase } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/lifecycle/common/lifecycle';
+import { IClipboardService } from '@codingame/monaco-vscode-api/vscode/vs/platform/clipboard/common/clipboardService.service';
+import { Disposable, MutableDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { StatusbarAlignment } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/statusbar/browser/statusbar';
+import { IStatusbarService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/statusbar/browser/statusbar.service';
+import { IMarkerService } from '@codingame/monaco-vscode-api/vscode/vs/platform/markers/common/markers.service';
+import { Extensions as Extensions$1, ViewContainerLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/views';
+import { IViewsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/views/common/viewsService.service';
+import { FocusedViewContext, getVisbileViewContextKey } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contextkeys';
 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 { SyncDescriptor } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/descriptors';
+import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
+import { registerIcon } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/iconRegistry';
 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 { IActivityService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/activity/common/activity.service';
 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';
+import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
+import { problemsConfigurationNodeBase } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/configuration';
 
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: Markers.MARKER_OPEN_ACTION_ID,
@@ -114,7 +114,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
         },
     }
 });
-const markersViewIcon = registerIcon('markers-view-icon', Codicon.warning, ( localize(7044, 'View icon of the markers view.')));
+const markersViewIcon = registerIcon('markers-view-icon', Codicon.warning, ( localize(7062, '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,
@@ -136,7 +136,7 @@ const VIEW_CONTAINER = ( Registry.as(Extensions$1.ViewContainersRegistry)).regis
         ctorDescriptor: ( new SyncDescriptor(MarkersView)),
         openCommandActionDescriptor: {
             id: 'workbench.actions.view.problems',
-            mnemonicTitle: ( localize(7045, "&&Problems")),
+            mnemonicTitle: ( localize(7063, "&&Problems")),
             keybindings: { primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KeyM },
             order: 0,
         }
@@ -146,9 +146,9 @@ registerAction2(class extends ViewAction {
     constructor() {
         super({
             id: `workbench.actions.table.${Markers.MARKERS_VIEW_ID}.viewAsTree`,
-            title: ( localize(7046, "View as Tree")),
+            title: ( localize(7064, "View as Tree")),
             metadata: {
-                description: ( localize2(7047, "Show the problems view as a tree."))
+                description: ( localize2(7065, "Show the problems view as a tree."))
             },
             menu: {
                 id: MenuId.ViewTitle,
@@ -168,9 +168,9 @@ registerAction2(class extends ViewAction {
     constructor() {
         super({
             id: `workbench.actions.table.${Markers.MARKERS_VIEW_ID}.viewAsTable`,
-            title: ( localize(7048, "View as Table")),
+            title: ( localize(7066, "View as Table")),
             metadata: {
-                description: ( localize2(7049, "Show the problems view as a table."))
+                description: ( localize2(7067, "Show the problems view as a table."))
             },
             menu: {
                 id: MenuId.ViewTitle,
@@ -190,11 +190,11 @@ registerAction2(class extends ViewAction {
     constructor() {
         super({
             id: `workbench.actions.${Markers.MARKERS_VIEW_ID}.toggleErrors`,
-            title: ( localize(7050, "Show Errors")),
+            title: ( localize(7068, "Show Errors")),
             metadata: {
-                description: ( localize2(7051, "Show or hide errors in the problems view."))
+                description: ( localize2(7069, "Show or hide errors in the problems view."))
             },
-            category: ( localize(7052, "Problems")),
+            category: ( localize(7070, "Problems")),
             toggled: MarkersContextKeys.ShowErrorsFilterContextKey,
             menu: {
                 id: viewFilterSubmenu,
@@ -213,11 +213,11 @@ registerAction2(class extends ViewAction {
     constructor() {
         super({
             id: `workbench.actions.${Markers.MARKERS_VIEW_ID}.toggleWarnings`,
-            title: ( localize(7053, "Show Warnings")),
+            title: ( localize(7071, "Show Warnings")),
             metadata: {
-                description: ( localize2(7054, "Show or hide warnings in the problems view."))
+                description: ( localize2(7072, "Show or hide warnings in the problems view."))
             },
-            category: ( localize(7052, "Problems")),
+            category: ( localize(7070, "Problems")),
             toggled: MarkersContextKeys.ShowWarningsFilterContextKey,
             menu: {
                 id: viewFilterSubmenu,
@@ -236,11 +236,11 @@ registerAction2(class extends ViewAction {
     constructor() {
         super({
             id: `workbench.actions.${Markers.MARKERS_VIEW_ID}.toggleInfos`,
-            title: ( localize(7055, "Show Infos")),
-            category: ( localize(7052, "Problems")),
+            title: ( localize(7073, "Show Infos")),
+            category: ( localize(7070, "Problems")),
             toggled: MarkersContextKeys.ShowInfoFilterContextKey,
             metadata: {
-                description: ( localize2(7056, "Show or hide infos in the problems view."))
+                description: ( localize2(7074, "Show or hide infos in the problems view."))
             },
             menu: {
                 id: viewFilterSubmenu,
@@ -259,14 +259,14 @@ registerAction2(class extends ViewAction {
     constructor() {
         super({
             id: `workbench.actions.${Markers.MARKERS_VIEW_ID}.toggleActiveFile`,
-            title: ( localize(7057, "Show Active File Only")),
+            title: ( localize(7075, "Show Active File Only")),
             metadata: {
                 description: ( localize2(
-                    7058,
+                    7076,
                     "Show or hide problems (errors, warnings, info) only from the active file in the problems view."
                 ))
             },
-            category: ( localize(7052, "Problems")),
+            category: ( localize(7070, "Problems")),
             toggled: MarkersContextKeys.ShowActiveFileFilterContextKey,
             menu: {
                 id: viewFilterSubmenu,
@@ -285,11 +285,11 @@ registerAction2(class extends ViewAction {
     constructor() {
         super({
             id: `workbench.actions.${Markers.MARKERS_VIEW_ID}.toggleExcludedFiles`,
-            title: ( localize(7059, "Show Excluded Files")),
+            title: ( localize(7077, "Show Excluded Files")),
             metadata: {
-                description: ( localize2(7060, "Show or hide excluded files in the problems view."))
+                description: ( localize2(7078, "Show or hide excluded files in the problems view."))
             },
-            category: ( localize(7052, "Problems")),
+            category: ( localize(7070, "Problems")),
             toggled: ( MarkersContextKeys.ShowExcludedFilesFilterContextKey.negate()),
             menu: {
                 id: viewFilterSubmenu,
@@ -322,7 +322,7 @@ 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: ( localize2(7061, 'Copy')),
+            title: ( localize2(7079, 'Copy')),
             menu: {
                 id: MenuId.ProblemsPanelContext,
                 when,
@@ -362,7 +362,7 @@ registerAction2(class extends ViewAction {
     constructor() {
         super({
             id: Markers.MARKER_COPY_MESSAGE_ACTION_ID,
-            title: ( localize2(7062, 'Copy Message')),
+            title: ( localize2(7080, 'Copy Message')),
             menu: {
                 id: MenuId.ProblemsPanelContext,
                 when: MarkersContextKeys.MarkerFocusContextKey,
@@ -383,7 +383,7 @@ registerAction2(class extends ViewAction {
     constructor() {
         super({
             id: Markers.RELATED_INFORMATION_COPY_MESSAGE_ACTION_ID,
-            title: ( localize2(7062, 'Copy Message')),
+            title: ( localize2(7080, 'Copy Message')),
             menu: {
                 id: MenuId.ProblemsPanelContext,
                 when: MarkersContextKeys.RelatedInformationFocusContextKey,
@@ -404,7 +404,7 @@ registerAction2(class extends ViewAction {
     constructor() {
         super({
             id: Markers.FOCUS_PROBLEMS_FROM_FILTER,
-            title: ( localize(7063, "Focus problems view")),
+            title: ( localize(7081, "Focus problems view")),
             keybinding: {
                 when: MarkersContextKeys.MarkerViewFilterFocusContextKey,
                 weight: KeybindingWeight.WorkbenchContrib,
@@ -421,7 +421,7 @@ registerAction2(class extends ViewAction {
     constructor() {
         super({
             id: Markers.MARKERS_VIEW_FOCUS_FILTER,
-            title: ( localize(7064, "Focus problems filter")),
+            title: ( localize(7082, "Focus problems filter")),
             keybinding: {
                 when: ( FocusedViewContext.isEqualTo(Markers.MARKERS_VIEW_ID)),
                 weight: KeybindingWeight.WorkbenchContrib,
@@ -438,8 +438,8 @@ registerAction2(class extends ViewAction {
     constructor() {
         super({
             id: Markers.MARKERS_VIEW_SHOW_MULTILINE_MESSAGE,
-            title: ( localize2(7065, "Show message in multiple lines")),
-            category: ( localize(7052, "Problems")),
+            title: ( localize2(7083, "Show message in multiple lines")),
+            category: ( localize(7070, "Problems")),
             menu: {
                 id: MenuId.CommandPalette,
                 when: ( ContextKeyExpr.has(getVisbileViewContextKey(Markers.MARKERS_VIEW_ID)))
@@ -455,8 +455,8 @@ registerAction2(class extends ViewAction {
     constructor() {
         super({
             id: Markers.MARKERS_VIEW_SHOW_SINGLELINE_MESSAGE,
-            title: ( localize2(7066, "Show message in single line")),
-            category: ( localize(7052, "Problems")),
+            title: ( localize2(7084, "Show message in single line")),
+            category: ( localize(7070, "Problems")),
             menu: {
                 id: MenuId.CommandPalette,
                 when: ( ContextKeyExpr.has(getVisbileViewContextKey(Markers.MARKERS_VIEW_ID)))
@@ -472,8 +472,8 @@ registerAction2(class extends ViewAction {
     constructor() {
         super({
             id: Markers.MARKERS_VIEW_CLEAR_FILTER_TEXT,
-            title: ( localize(7067, "Clear filters text")),
-            category: ( localize(7052, "Problems")),
+            title: ( localize(7085, "Clear filters text")),
+            category: ( localize(7070, "Problems")),
             keybinding: {
                 when: MarkersContextKeys.MarkerViewFilterFocusContextKey,
                 weight: KeybindingWeight.WorkbenchContrib,
@@ -490,7 +490,7 @@ registerAction2(class extends ViewAction {
     constructor() {
         super({
             id: `workbench.actions.treeView.${Markers.MARKERS_VIEW_ID}.collapseAll`,
-            title: ( localize(7068, "Collapse All")),
+            title: ( localize(7086, "Collapse All")),
             menu: {
                 id: MenuId.ViewTitle,
                 when: ( ContextKeyExpr.and(( ContextKeyExpr.equals('view', Markers.MARKERS_VIEW_ID)), ( MarkersContextKeys.MarkersViewModeContextKey.isEqualTo(MarkersViewMode.Tree)))),
@@ -557,7 +557,7 @@ let MarkersStatusBarContributions = class MarkersStatusBarContributions extends
         const markersStatistics = this.markerService.getStatistics();
         const tooltip = this.getMarkersTooltip(markersStatistics);
         return {
-            name: ( localize(7069, "Problems")),
+            name: ( localize(7087, "Problems")),
             text: this.getMarkersText(markersStatistics),
             ariaLabel: tooltip,
             tooltip,
@@ -568,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(7070, "Problems are turned off. Click to open settings."));
+        const tooltip = ( localize(7088, "Problems are turned off. Click to open settings."));
         return {
-            name: ( localize(7071, "Problems Visibility")),
+            name: ( localize(7089, "Problems Visibility")),
             text: '$(whole-word)',
             ariaLabel: tooltip,
             tooltip,
@@ -579,9 +579,9 @@ let MarkersStatusBarContributions = class MarkersStatusBarContributions extends
         };
     }
     getMarkersTooltip(stats) {
-        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 errorTitle = (n) => ( localize(7090, "Errors: {0}", n));
+        const warningTitle = (n) => ( localize(7091, "Warnings: {0}", n));
+        const infoTitle = (n) => ( localize(7092, "Infos: {0}", n));
         const titles = [];
         if (stats.errors > 0) {
             titles.push(errorTitle(stats.errors));
@@ -593,7 +593,7 @@ let MarkersStatusBarContributions = class MarkersStatusBarContributions extends
             titles.push(infoTitle(stats.infos));
         }
         if (titles.length === 0) {
-            return localize(7075, "No Problems");
+            return localize(7093, "No Problems");
         }
         return titles.join(', ');
     }
@@ -607,7 +607,7 @@ let MarkersStatusBarContributions = class MarkersStatusBarContributions extends
         return problemsText.join(' ');
     }
     packNumber(n) {
-        const manyProblems = ( localize(7076, "10K+"));
+        const manyProblems = ( localize(7094, "10K+"));
         return n > 9999 ? manyProblems : n > 999 ? ( n.toString()).charAt(0) + 'K' : ( n.toString());
     }
 };
@@ -630,7 +630,7 @@ let ActivityUpdater = class ActivityUpdater extends Disposable {
         const { errors, warnings, infos } = this.markerService.getStatistics();
         const total = errors + warnings + infos;
         if (total > 0) {
-            const message = ( localize(7077, 'Total {0} Problems', total));
+            const message = ( localize(7095, 'Total {0} Problems', total));
             this.activity.value = this.activityService.showViewActivity(Markers.MARKERS_VIEW_ID, { badge: ( new NumberBadge(total, () => message)) });
         }
         else {

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

@@ -1,5 +1,5 @@
 import { MarkersFilters } from "./markersViewActions.js";
-import { IView } from "vscode/vscode/vs/workbench/common/views";
+import { IView } from "@codingame/monaco-vscode-api/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 {

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

@@ -1,31 +1,31 @@
 
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
-import { Extensions as Extensions$1 } from 'vscode/vscode/vs/workbench/common/contributions';
-import { MarkerSeverity } from 'vscode/vscode/vs/platform/markers/common/markers';
-import { IMarkerService } from 'vscode/vscode/vs/platform/markers/common/markers.service';
-import { IDecorationsService } from 'vscode/vscode/vs/workbench/services/decorations/common/decorations.service';
-import { dispose } from 'vscode/vscode/vs/base/common/lifecycle';
-import { localize } 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.service';
-import { Extensions } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
-import { LifecyclePhase } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
+import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import { Extensions as Extensions$1 } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions';
+import { MarkerSeverity } from '@codingame/monaco-vscode-api/vscode/vs/platform/markers/common/markers';
+import { IMarkerService } from '@codingame/monaco-vscode-api/vscode/vs/platform/markers/common/markers.service';
+import { IDecorationsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/decorations/common/decorations.service';
+import { dispose } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
+import { Registry } from '@codingame/monaco-vscode-api/vscode/vs/platform/registry/common/platform';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colorUtils';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/baseColors';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/chartsColors';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/editorColors';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/inputColors';
+import { listErrorForeground, listWarningForeground } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/listColors';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/menuColors';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/minimapColors';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/miscColors';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/quickpickColors';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/searchColors';
+import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
+import { Extensions } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configurationRegistry';
+import { LifecyclePhase } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/lifecycle/common/lifecycle';
 
 class MarkersDecorationsProvider {
     constructor(_markerService) {
         this._markerService = _markerService;
-        this.label = ( localize(7078, "Problems"));
+        this.label = ( localize(7096, "Problems"));
         this.onDidChange = _markerService.onMarkerChanged;
     }
     provideDecorations(resource) {
@@ -45,7 +45,7 @@ class MarkersDecorationsProvider {
         return {
             weight: 100 * first.severity,
             bubble: true,
-            tooltip: markers.length === 1 ? ( localize(7079, "1 problem in this file")) : ( localize(7080, "{0} problems in this file", markers.length)),
+            tooltip: markers.length === 1 ? ( localize(7097, "1 problem in this file")) : ( localize(7098, "{0} problems in this file", markers.length)),
             letter: markers.length < 10 ? ( markers.length.toString()) : '9+',
             color: first.severity === MarkerSeverity.Error ? listErrorForeground : listWarningForeground,
         };
@@ -105,7 +105,7 @@ MarkersFileDecorations = ( __decorate([
     'properties': {
         'problems.decorations.enabled': {
             'markdownDescription': ( localize(
-                7081,
+                7099,
                 "Show Errors & Warnings on files and folder. Overwritten by {0} when it is off.",
                 '`#problems.visibility#`'
             )),

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

@@ -1,7 +1,7 @@
-import { IFilter } from "vscode/vscode/vs/base/common/filters";
-import { IExpression } from "vscode/vscode/vs/base/common/glob";
-import { URI } from "vscode/vscode/vs/base/common/uri";
-import { IUriIdentityService } from "vscode/vscode/vs/platform/uriIdentity/common/uriIdentity.service";
+import { IFilter } from "@codingame/monaco-vscode-api/vscode/vs/base/common/filters";
+import { IExpression } from "@codingame/monaco-vscode-api/vscode/vs/base/common/glob";
+import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
+import { IUriIdentityService } from "@codingame/monaco-vscode-api/vscode/vs/platform/uriIdentity/common/uriIdentity.service";
 export declare class ResourceGlobMatcher {
     private readonly globalExpression;
     private readonly expressionsByRoot;

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

@@ -1,9 +1,9 @@
 
-import { matchesFuzzy2, matchesFuzzy } from 'vscode/vscode/vs/base/common/filters';
-import { parse, getEmptyExpression, splitGlobAware } from 'vscode/vscode/vs/base/common/glob';
-import { rtrim, ltrim } from 'vscode/vscode/vs/base/common/strings';
-import { relativePath } from 'vscode/vscode/vs/base/common/resources';
-import { TernarySearchTree } from 'vscode/vscode/vs/base/common/ternarySearchTree';
+import { matchesFuzzy2, matchesFuzzy } from '@codingame/monaco-vscode-api/vscode/vs/base/common/filters';
+import { parse, getEmptyExpression, splitGlobAware } from '@codingame/monaco-vscode-api/vscode/vs/base/common/glob';
+import { rtrim, ltrim } from '@codingame/monaco-vscode-api/vscode/vs/base/common/strings';
+import { relativePath } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
+import { TernarySearchTree } from '@codingame/monaco-vscode-api/vscode/vs/base/common/ternarySearchTree';
 
 class ResourceGlobMatcher {
     constructor(globalExpression, rootExpressions, uriIdentityService) {

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

@@ -1,8 +1,8 @@
-import { Event } from "vscode/vscode/vs/base/common/event";
-import { IMatch } from "vscode/vscode/vs/base/common/filters";
-import { URI } from "vscode/vscode/vs/base/common/uri";
-import { IRange } from "vscode/vscode/vs/editor/common/core/range";
-import { IMarker, IRelatedInformation } from "vscode/vscode/vs/platform/markers/common/markers";
+import { Event } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event";
+import { IMatch } from "@codingame/monaco-vscode-api/vscode/vs/base/common/filters";
+import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
+import { IRange } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/core/range";
+import { IMarker, IRelatedInformation } from "@codingame/monaco-vscode-api/vscode/vs/platform/markers/common/markers";
 export type MarkerElement = ResourceMarkers | Marker | RelatedInformation;
 export declare function compareMarkersByUri(a: IMarker, b: IMarker): number;
 export declare class ResourceMarkers {

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

@@ -1,13 +1,13 @@
 
-import { isNonEmptyArray } from 'vscode/vscode/vs/base/common/arrays';
-import { Emitter } from 'vscode/vscode/vs/base/common/event';
-import { hash } from 'vscode/vscode/vs/base/common/hash';
-import { ResourceMap } from 'vscode/vscode/vs/base/common/map';
-import { extUri, basename } from 'vscode/vscode/vs/base/common/resources';
-import { splitLines } from 'vscode/vscode/vs/base/common/strings';
-import { Range } from 'vscode/vscode/vs/editor/common/core/range';
-import { MarkerSeverity, IMarkerData } from 'vscode/vscode/vs/platform/markers/common/markers';
-import { unsupportedSchemas } from 'vscode/vscode/vs/platform/markers/common/markerService';
+import { isNonEmptyArray } from '@codingame/monaco-vscode-api/vscode/vs/base/common/arrays';
+import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
+import { hash } from '@codingame/monaco-vscode-api/vscode/vs/base/common/hash';
+import { ResourceMap } from '@codingame/monaco-vscode-api/vscode/vs/base/common/map';
+import { extUri, basename } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
+import { splitLines } from '@codingame/monaco-vscode-api/vscode/vs/base/common/strings';
+import { Range } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/range';
+import { MarkerSeverity, IMarkerData } from '@codingame/monaco-vscode-api/vscode/vs/platform/markers/common/markers';
+import { unsupportedSchemas } from '@codingame/monaco-vscode-api/vscode/vs/platform/markers/common/markerService';
 
 function compareMarkersByUri(a, b) {
     return extUri.compare(a.resource, b.resource);

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

@@ -1,14 +1,14 @@
-import { Event } from "vscode/vscode/vs/base/common/event";
-import { ITableContextMenuEvent, ITableEvent } from "vscode/vscode/vs/base/browser/ui/table/table";
-import { Disposable } from "vscode/vscode/vs/base/common/lifecycle";
-import { IInstantiationService } from "vscode/vscode/vs/platform/instantiation/common/instantiation";
-import { IOpenEvent, IWorkbenchTableOptions } from "vscode/vscode/vs/platform/list/browser/listService";
+import { Event } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event";
+import { ITableContextMenuEvent, ITableEvent } from "@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/table/table";
+import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
+import { IOpenEvent, IWorkbenchTableOptions } from "@codingame/monaco-vscode-api/vscode/vs/platform/list/browser/listService";
 import { Marker, MarkerTableItem, ResourceMarkers } from "./markersModel.js";
-import { ILabelService } from "vscode/vscode/vs/platform/label/common/label.service";
+import { ILabelService } from "@codingame/monaco-vscode-api/vscode/vs/platform/label/common/label.service";
 import { FilterOptions } from "./markersFilterOptions.js";
 import { MarkersViewModel } from "./markersTreeViewer.js";
 import { IProblemsWidget } from "./markersView.js";
-import { IContextKeyService } from "vscode/vscode/vs/platform/contextkey/common/contextkey.service";
+import { IContextKeyService } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service";
 export declare class MarkersTable extends Disposable implements IProblemsWidget {
     private readonly container;
     private readonly markersViewModel;