@codingame/monaco-vscode-markers-service-override 7.1.0 → 8.0.0

package/package.json

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

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

@@ -5,7 +5,7 @@ import { Extensions } from 'vscode/vscode/vs/platform/configuration/common/confi
 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 { localizeWithPath, localize2WithPath } from 'vscode/vscode/vs/nls';
+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';
@@ -33,7 +33,6 @@ import { viewFilterSubmenu } from 'vscode/vscode/vs/workbench/browser/parts/view
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { problemsConfigurationNodeBase } from 'vscode/vscode/vs/workbench/common/configuration';
 
-const _moduleId = "vs/workbench/contrib/markers/browser/markers.contribution";
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: Markers.MARKER_OPEN_ACTION_ID,
     weight: KeybindingWeight.WorkbenchContrib,
@@ -114,7 +113,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
         },
     }
 });
-const markersViewIcon = registerIcon('markers-view-icon', Codicon.warning, ( localizeWithPath(_moduleId, 0, 'View icon of the markers view.')));
+const markersViewIcon = registerIcon('markers-view-icon', Codicon.warning, ( localize(1764, '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 +135,7 @@ const VIEW_CONTAINER = ( (Registry.as(Extensions$1.ViewContainersRegistry))).reg
         ctorDescriptor: ( (new SyncDescriptor(MarkersView))),
         openCommandActionDescriptor: {
             id: 'workbench.actions.view.problems',
-            mnemonicTitle: ( localizeWithPath(_moduleId, 1, "&&Problems")),
+            mnemonicTitle: ( localize(1765, "&&Problems")),
             keybindings: { primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KeyM },
             order: 0,
         }
@@ -146,7 +145,7 @@ registerAction2(class extends ViewAction {
     constructor() {
         super({
             id: `workbench.actions.table.${Markers.MARKERS_VIEW_ID}.viewAsTree`,
-            title: ( localizeWithPath(_moduleId, 2, "View as Tree")),
+            title: ( localize(1766, "View as Tree")),
             menu: {
                 id: MenuId.ViewTitle,
                 when: ( (ContextKeyExpr.and(
@@ -168,7 +167,7 @@ registerAction2(class extends ViewAction {
     constructor() {
         super({
             id: `workbench.actions.table.${Markers.MARKERS_VIEW_ID}.viewAsTable`,
-            title: ( localizeWithPath(_moduleId, 3, "View as Table")),
+            title: ( localize(1767, "View as Table")),
             menu: {
                 id: MenuId.ViewTitle,
                 when: ( (ContextKeyExpr.and(
@@ -190,8 +189,8 @@ registerAction2(class extends ViewAction {
     constructor() {
         super({
             id: `workbench.actions.${Markers.MARKERS_VIEW_ID}.toggleErrors`,
-            title: ( localizeWithPath(_moduleId, 4, "Show Errors")),
-            category: ( localizeWithPath(_moduleId, 5, "Problems")),
+            title: ( localize(1768, "Show Errors")),
+            category: ( localize(1769, "Problems")),
             toggled: MarkersContextKeys.ShowErrorsFilterContextKey,
             menu: {
                 id: viewFilterSubmenu,
@@ -210,8 +209,8 @@ registerAction2(class extends ViewAction {
     constructor() {
         super({
             id: `workbench.actions.${Markers.MARKERS_VIEW_ID}.toggleWarnings`,
-            title: ( localizeWithPath(_moduleId, 6, "Show Warnings")),
-            category: ( localizeWithPath(_moduleId, 5, "Problems")),
+            title: ( localize(1770, "Show Warnings")),
+            category: ( localize(1770, "Problems")),
             toggled: MarkersContextKeys.ShowWarningsFilterContextKey,
             menu: {
                 id: viewFilterSubmenu,
@@ -230,8 +229,8 @@ registerAction2(class extends ViewAction {
     constructor() {
         super({
             id: `workbench.actions.${Markers.MARKERS_VIEW_ID}.toggleInfos`,
-            title: ( localizeWithPath(_moduleId, 7, "Show Infos")),
-            category: ( localizeWithPath(_moduleId, 5, "Problems")),
+            title: ( localize(1771, "Show Infos")),
+            category: ( localize(1771, "Problems")),
             toggled: MarkersContextKeys.ShowInfoFilterContextKey,
             menu: {
                 id: viewFilterSubmenu,
@@ -250,8 +249,8 @@ registerAction2(class extends ViewAction {
     constructor() {
         super({
             id: `workbench.actions.${Markers.MARKERS_VIEW_ID}.toggleActiveFile`,
-            title: ( localizeWithPath(_moduleId, 8, "Show Active File Only")),
-            category: ( localizeWithPath(_moduleId, 5, "Problems")),
+            title: ( localize(1772, "Show Active File Only")),
+            category: ( localize(1772, "Problems")),
             toggled: MarkersContextKeys.ShowActiveFileFilterContextKey,
             menu: {
                 id: viewFilterSubmenu,
@@ -270,8 +269,8 @@ registerAction2(class extends ViewAction {
     constructor() {
         super({
             id: `workbench.actions.${Markers.MARKERS_VIEW_ID}.toggleExcludedFiles`,
-            title: ( localizeWithPath(_moduleId, 9, "Show Excluded Files")),
-            category: ( localizeWithPath(_moduleId, 5, "Problems")),
+            title: ( localize(1773, "Show Excluded Files")),
+            category: ( localize(1773, "Problems")),
             toggled: ( (MarkersContextKeys.ShowExcludedFilesFilterContextKey.negate())),
             menu: {
                 id: viewFilterSubmenu,
@@ -308,7 +307,7 @@ registerAction2(class extends ViewAction {
         )));
         super({
             id: Markers.MARKER_COPY_ACTION_ID,
-            title: ( localize2WithPath(_moduleId, 10, 'Copy')),
+            title: ( localize2(1774, 'Copy')),
             menu: {
                 id: MenuId.ProblemsPanelContext,
                 when,
@@ -348,7 +347,7 @@ registerAction2(class extends ViewAction {
     constructor() {
         super({
             id: Markers.MARKER_COPY_MESSAGE_ACTION_ID,
-            title: ( localize2WithPath(_moduleId, 11, 'Copy Message')),
+            title: ( localize2(1775, 'Copy Message')),
             menu: {
                 id: MenuId.ProblemsPanelContext,
                 when: MarkersContextKeys.MarkerFocusContextKey,
@@ -369,7 +368,7 @@ registerAction2(class extends ViewAction {
     constructor() {
         super({
             id: Markers.RELATED_INFORMATION_COPY_MESSAGE_ACTION_ID,
-            title: ( localize2WithPath(_moduleId, 11, 'Copy Message')),
+            title: ( localize2(1775, 'Copy Message')),
             menu: {
                 id: MenuId.ProblemsPanelContext,
                 when: MarkersContextKeys.RelatedInformationFocusContextKey,
@@ -390,7 +389,7 @@ registerAction2(class extends ViewAction {
     constructor() {
         super({
             id: Markers.FOCUS_PROBLEMS_FROM_FILTER,
-            title: ( localizeWithPath(_moduleId, 12, "Focus problems view")),
+            title: ( localize(1776, "Focus problems view")),
             keybinding: {
                 when: MarkersContextKeys.MarkerViewFilterFocusContextKey,
                 weight: KeybindingWeight.WorkbenchContrib,
@@ -407,7 +406,7 @@ registerAction2(class extends ViewAction {
     constructor() {
         super({
             id: Markers.MARKERS_VIEW_FOCUS_FILTER,
-            title: ( localizeWithPath(_moduleId, 13, "Focus problems filter")),
+            title: ( localize(1777, "Focus problems filter")),
             keybinding: {
                 when: ( (FocusedViewContext.isEqualTo(Markers.MARKERS_VIEW_ID))),
                 weight: KeybindingWeight.WorkbenchContrib,
@@ -424,8 +423,8 @@ registerAction2(class extends ViewAction {
     constructor() {
         super({
             id: Markers.MARKERS_VIEW_SHOW_MULTILINE_MESSAGE,
-            title: ( localize2WithPath(_moduleId, 14, "Show message in multiple lines")),
-            category: ( localizeWithPath(_moduleId, 5, "Problems")),
+            title: ( localize2(1778, "Show message in multiple lines")),
+            category: ( localize(1778, "Problems")),
             menu: {
                 id: MenuId.CommandPalette,
                 when: ( (ContextKeyExpr.has(getVisbileViewContextKey(Markers.MARKERS_VIEW_ID))))
@@ -441,8 +440,8 @@ registerAction2(class extends ViewAction {
     constructor() {
         super({
             id: Markers.MARKERS_VIEW_SHOW_SINGLELINE_MESSAGE,
-            title: ( localize2WithPath(_moduleId, 15, "Show message in single line")),
-            category: ( localizeWithPath(_moduleId, 5, "Problems")),
+            title: ( localize2(1779, "Show message in single line")),
+            category: ( localize(1779, "Problems")),
             menu: {
                 id: MenuId.CommandPalette,
                 when: ( (ContextKeyExpr.has(getVisbileViewContextKey(Markers.MARKERS_VIEW_ID))))
@@ -458,8 +457,8 @@ registerAction2(class extends ViewAction {
     constructor() {
         super({
             id: Markers.MARKERS_VIEW_CLEAR_FILTER_TEXT,
-            title: ( localizeWithPath(_moduleId, 16, "Clear filters text")),
-            category: ( localizeWithPath(_moduleId, 5, "Problems")),
+            title: ( localize(1780, "Clear filters text")),
+            category: ( localize(1780, "Problems")),
             keybinding: {
                 when: MarkersContextKeys.MarkerViewFilterFocusContextKey,
                 weight: KeybindingWeight.WorkbenchContrib,
@@ -476,7 +475,7 @@ registerAction2(class extends ViewAction {
     constructor() {
         super({
             id: `workbench.actions.treeView.${Markers.MARKERS_VIEW_ID}.collapseAll`,
-            title: ( localizeWithPath(_moduleId, 17, "Collapse All")),
+            title: ( localize(1781, "Collapse All")),
             menu: {
                 id: MenuId.ViewTitle,
                 when: ( (ContextKeyExpr.and(
@@ -546,7 +545,7 @@ let MarkersStatusBarContributions = class MarkersStatusBarContributions extends
         const markersStatistics = this.markerService.getStatistics();
         const tooltip = this.getMarkersTooltip(markersStatistics);
         return {
-            name: ( localizeWithPath(_moduleId, 18, "Problems")),
+            name: ( localize(1782, "Problems")),
             text: this.getMarkersText(markersStatistics),
             ariaLabel: tooltip,
             tooltip,
@@ -557,9 +556,9 @@ let MarkersStatusBarContributions = class MarkersStatusBarContributions extends
         this.statusbarService.updateEntryVisibility('status.problemsVisibility', true);
         const openSettingsCommand = 'workbench.action.openSettings';
         const configureSettingsLabel = '@id:problems.visibility';
-        const tooltip = ( localizeWithPath(_moduleId, 19, "Problems are turned off. Click to open settings."));
+        const tooltip = ( localize(1783, "Problems are turned off. Click to open settings."));
         return {
-            name: ( localizeWithPath(_moduleId, 20, "Problems Visibility")),
+            name: ( localize(1784, "Problems Visibility")),
             text: '$(whole-word)',
             ariaLabel: tooltip,
             tooltip,
@@ -568,9 +567,9 @@ let MarkersStatusBarContributions = class MarkersStatusBarContributions extends
         };
     }
     getMarkersTooltip(stats) {
-        const errorTitle = (n) => ( localizeWithPath(_moduleId, 21, "Errors: {0}", n));
-        const warningTitle = (n) => ( localizeWithPath(_moduleId, 22, "Warnings: {0}", n));
-        const infoTitle = (n) => ( localizeWithPath(_moduleId, 23, "Infos: {0}", n));
+        const errorTitle = (n) => ( localize(1785, "Errors: {0}", n));
+        const warningTitle = (n) => ( localize(1786, "Warnings: {0}", n));
+        const infoTitle = (n) => ( localize(1787, "Infos: {0}", n));
         const titles = [];
         if (stats.errors > 0) {
             titles.push(errorTitle(stats.errors));
@@ -582,7 +581,7 @@ let MarkersStatusBarContributions = class MarkersStatusBarContributions extends
             titles.push(infoTitle(stats.infos));
         }
         if (titles.length === 0) {
-            return ( localizeWithPath(_moduleId, 24, "No Problems"));
+            return ( localize(1788, "No Problems"));
         }
         return titles.join(', ');
     }
@@ -596,7 +595,7 @@ let MarkersStatusBarContributions = class MarkersStatusBarContributions extends
         return problemsText.join(' ');
     }
     packNumber(n) {
-        const manyProblems = ( localizeWithPath(_moduleId, 25, "10K+"));
+        const manyProblems = ( localize(1789, "10K+"));
         return n > 9999 ? manyProblems : n > 999 ? ( (n.toString())).charAt(0) + 'K' : ( (n.toString()));
     }
 };
@@ -619,7 +618,7 @@ let ActivityUpdater = class ActivityUpdater extends Disposable {
         const { errors, warnings, infos } = this.markerService.getStatistics();
         const total = errors + warnings + infos;
         if (total > 0) {
-            const message = ( localizeWithPath(_moduleId, 26, 'Total {0} Problems', total));
+            const message = ( localize(1790, '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/markersFileDecorations.js

@@ -4,7 +4,7 @@ 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 { localizeWithPath } from 'vscode/vscode/vs/nls';
+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';
@@ -21,11 +21,10 @@ import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/c
 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 {
     constructor(_markerService) {
         this._markerService = _markerService;
-        this.label = ( localizeWithPath(_moduleId, 0, "Problems"));
+        this.label = ( localize(5515, "Problems"));
         this.onDidChange = _markerService.onMarkerChanged;
     }
     provideDecorations(resource) {
@@ -45,7 +44,7 @@ class MarkersDecorationsProvider {
         return {
             weight: 100 * first.severity,
             bubble: true,
-            tooltip: markers.length === 1 ? ( localizeWithPath(_moduleId, 1, "1 problem in this file")) : ( localizeWithPath(_moduleId, 2, "{0} problems in this file", markers.length)),
+            tooltip: markers.length === 1 ? ( localize(5516, "1 problem in this file")) : ( localize(5517, "{0} problems in this file", markers.length)),
             letter: markers.length < 10 ? ( (markers.length.toString())) : '9+',
             color: first.severity === MarkerSeverity.Error ? listErrorForeground : listWarningForeground,
         };
@@ -104,9 +103,8 @@ MarkersFileDecorations = ( (__decorate([
     'type': 'object',
     'properties': {
         'problems.decorations.enabled': {
-            'markdownDescription': ( localizeWithPath(
-                _moduleId,
-                3,
+            'markdownDescription': ( localize(
+                5518,
                 "Show Errors & Warnings on files and folder. Overwritten by {0} when it is off.",
                 '`#problems.visibility#`'
             )),

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

@@ -1,5 +1,5 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize } from 'vscode/vscode/vs/nls';
 import { $ as $$1, append, findParentWithClass } from 'vscode/vscode/vs/base/browser/dom';
 import { Event } from 'vscode/vscode/vs/base/common/event';
 import { DisposableStore, Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
@@ -24,7 +24,6 @@ import Severity$1 from 'vscode/vscode/vs/base/common/severity';
 import { IHoverService } from 'vscode/vscode/vs/platform/hover/browser/hover.service';
 
 var MarkerSeverityColumnRenderer_1, MarkerCodeColumnRenderer_1, MarkerFileColumnRenderer_1;
-const _moduleId = "vs/workbench/contrib/markers/browser/markersTable";
 const $ = $$1;
 let MarkerSeverityColumnRenderer = class MarkerSeverityColumnRenderer {
     static { MarkerSeverityColumnRenderer_1 = this; }
@@ -228,7 +227,7 @@ let MarkersTable = class MarkersTable extends Disposable {
                 project(row) { return row; }
             },
             {
-                label: ( localizeWithPath(_moduleId, 0, "Code")),
+                label: ( localize(10087, "Code")),
                 tooltip: '',
                 weight: 1,
                 minimumWidth: 100,
@@ -237,21 +236,21 @@ let MarkersTable = class MarkersTable extends Disposable {
                 project(row) { return row; }
             },
             {
-                label: ( localizeWithPath(_moduleId, 1, "Message")),
+                label: ( localize(10088, "Message")),
                 tooltip: '',
                 weight: 4,
                 templateId: MarkerMessageColumnRenderer.TEMPLATE_ID,
                 project(row) { return row; }
             },
             {
-                label: ( localizeWithPath(_moduleId, 2, "File")),
+                label: ( localize(10089, "File")),
                 tooltip: '',
                 weight: 2,
                 templateId: MarkerFileColumnRenderer.TEMPLATE_ID,
                 project(row) { return row; }
             },
             {
-                label: ( localizeWithPath(_moduleId, 3, "Source")),
+                label: ( localize(10090, "Source")),
                 tooltip: '',
                 weight: 1,
                 minimumWidth: 100,

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

@@ -18,7 +18,7 @@ import { FilterOptions } from './markersFilterOptions.js';
 import { Emitter } from 'vscode/vscode/vs/base/common/event';
 import { isUndefinedOrNull } from 'vscode/vscode/vs/base/common/types';
 import { Action } from 'vscode/vscode/vs/base/common/actions';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize } from 'vscode/vscode/vs/nls';
 import { createCancelablePromise, Delayer } from 'vscode/vscode/vs/base/common/async';
 import { IModelService } from 'vscode/vscode/vs/editor/common/services/model';
 import { Range } from 'vscode/vscode/vs/editor/common/core/range';
@@ -43,13 +43,12 @@ import Severity$1 from 'vscode/vscode/vs/base/common/severity';
 import { getDefaultHoverDelegate } from 'vscode/vscode/vs/base/browser/ui/hover/hoverDelegateFactory';
 import { IHoverService } from 'vscode/vscode/vs/platform/hover/browser/hover.service';
 
-const _moduleId = "vs/workbench/contrib/markers/browser/markersTreeViewer";
 let MarkersWidgetAccessibilityProvider = class MarkersWidgetAccessibilityProvider {
     constructor(labelService) {
         this.labelService = labelService;
     }
     getWidgetAriaLabel() {
-        return ( localizeWithPath(_moduleId, 0, "Problems View"));
+        return ( localize(10082, "Problems View"));
     }
     getAriaLabel(element) {
         if (element instanceof ResourceMarkers) {
@@ -189,14 +188,12 @@ MarkerRenderer = ( (__decorate([
     ( (__param(2, IInstantiationService))),
     ( (__param(3, IOpenerService)))
 ], MarkerRenderer)));
-const expandedIcon = registerIcon('markers-view-multi-line-expanded', Codicon.chevronUp, ( localizeWithPath(
-    _moduleId,
-    1,
+const expandedIcon = registerIcon('markers-view-multi-line-expanded', Codicon.chevronUp, ( localize(
+    10083,
     'Icon indicating that multiple lines are shown in the markers view.'
 )));
-const collapsedIcon = registerIcon('markers-view-multi-line-collapsed', Codicon.chevronDown, ( localizeWithPath(
-    _moduleId,
-    2,
+const collapsedIcon = registerIcon('markers-view-multi-line-collapsed', Codicon.chevronDown, ( localize(
+    10084,
     'Icon indicating that multiple lines are collapsed in the markers view.'
 )));
 const toggleMultilineAction = 'problems.action.toggleMultiline';
@@ -275,7 +272,7 @@ class MarkerWidget extends Disposable {
         const multiline = viewModel && viewModel.multiline;
         const action = ( (new Action(toggleMultilineAction)));
         action.enabled = !!viewModel && marker.lines.length > 1;
-        action.tooltip = multiline ? ( localizeWithPath(_moduleId, 3, "Show message in single line")) : ( localizeWithPath(_moduleId, 4, "Show message in multiple lines"));
+        action.tooltip = multiline ? ( localize(10085, "Show message in single line")) : ( localize(10086, "Show message in multiple lines"));
         action.class = ThemeIcon.asClassName(multiline ? expandedIcon : collapsedIcon);
         action.run = () => { if (viewModel) {
             viewModel.multiline = !viewModel.multiline;

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

@@ -14,7 +14,7 @@ import { RangeHighlightDecorations } from 'vscode/vscode/vs/workbench/browser/co
 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 { localize } from 'vscode/vscode/vs/nls';
 import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
 import { Iterable } from 'vscode/vscode/vs/base/common/iterator';
 import { Event, Relay } from 'vscode/vscode/vs/base/common/event';
@@ -50,7 +50,6 @@ import { registerNavigableContainer } from 'vscode/vscode/vs/workbench/browser/a
 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) {
     return (
          (Iterable.map(resourceMarkers.markers, m => {
@@ -179,7 +178,7 @@ let MarkersView = class MarkersView extends FilterViewPane {
         this.filterWidget.focus();
     }
     updateBadge(total, filtered) {
-        this.filterWidget.updateBadge(total === filtered || total === 0 ? undefined : ( localizeWithPath(_moduleId, 0, "Showing {0} of {1}", filtered, total)));
+        this.filterWidget.updateBadge(total === filtered || total === 0 ? undefined : ( localize(5519, "Showing {0} of {1}", filtered, total)));
     }
     checkMoreFilters() {
         this.filterWidget.checkMoreFilters(!this.filters.showErrors || !this.filters.showWarnings || !this.filters.showInfos || this.filters.excludedFiles || this.filters.activeFile);
@@ -561,10 +560,10 @@ let MarkersView = class MarkersView extends FilterViewPane {
         else {
             this.messageBoxContainer.style.display = 'none';
             if (filtered === total) {
-                this.setAriaLabel(( localizeWithPath(_moduleId, 1, "Showing {0} problems", total)));
+                this.setAriaLabel(( localize(5520, "Showing {0} problems", total)));
             }
             else {
-                this.setAriaLabel(( localizeWithPath(_moduleId, 2, "Showing {0} of {1} problems", filtered, total)));
+                this.setAriaLabel(( localize(5521, "Showing {0} of {1} problems", filtered, total)));
             }
             this.messageBoxContainer.removeAttribute('tabIndex');
         }
@@ -581,7 +580,7 @@ let MarkersView = class MarkersView extends FilterViewPane {
         const span1 = append(container, $('span'));
         span1.textContent = Messages.MARKERS_PANEL_NO_PROBLEMS_FILTERS;
         const link = append(container, $('a.messageAction'));
-        link.textContent = ( localizeWithPath(_moduleId, 3, "Clear Filters"));
+        link.textContent = ( localize(5522, "Clear Filters"));
         link.setAttribute('tabIndex', '0');
         const span2 = append(container, $('span'));
         span2.textContent = '.';

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

@@ -1,68 +1,63 @@
-import { localizeWithPath, localize2WithPath } from 'vscode/vscode/vs/nls';
+import { localize, localize2 } from 'vscode/vscode/vs/nls';
 import { basename } from 'vscode/vscode/vs/base/common/resources';
 import { MarkerSeverity } from 'vscode/vscode/vs/platform/markers/common/markers';
 
-const _moduleId = "vs/workbench/contrib/markers/browser/messages";
 class Messages {
-    static { this.MARKERS_PANEL_TOGGLE_LABEL = ( localizeWithPath(_moduleId, 0, "Toggle Problems (Errors, Warnings, Infos)")); }
-    static { this.MARKERS_PANEL_SHOW_LABEL = ( localize2WithPath(_moduleId, 1, "Focus Problems (Errors, Warnings, Infos)")); }
-    static { this.PROBLEMS_PANEL_CONFIGURATION_TITLE = ( localizeWithPath(_moduleId, 2, "Problems View")); }
-    static { this.PROBLEMS_PANEL_CONFIGURATION_AUTO_REVEAL = ( localizeWithPath(
-        _moduleId,
-        3,
+    static { this.MARKERS_PANEL_TOGGLE_LABEL = ( localize(5523, "Toggle Problems (Errors, Warnings, Infos)")); }
+    static { this.MARKERS_PANEL_SHOW_LABEL = ( localize2(5524, "Focus Problems (Errors, Warnings, Infos)")); }
+    static { this.PROBLEMS_PANEL_CONFIGURATION_TITLE = ( localize(5525, "Problems View")); }
+    static { this.PROBLEMS_PANEL_CONFIGURATION_AUTO_REVEAL = ( localize(
+        5526,
         "Controls whether Problems view should automatically reveal files when opening them."
     )); }
-    static { this.PROBLEMS_PANEL_CONFIGURATION_VIEW_MODE = ( localizeWithPath(_moduleId, 4, "Controls the default view mode of the Problems view.")); }
-    static { this.PROBLEMS_PANEL_CONFIGURATION_SHOW_CURRENT_STATUS = ( localizeWithPath(_moduleId, 5, "When enabled shows the current problem in the status bar.")); }
-    static { this.PROBLEMS_PANEL_CONFIGURATION_COMPARE_ORDER = ( localizeWithPath(_moduleId, 6, "Controls the order in which problems are navigated.")); }
-    static { this.PROBLEMS_PANEL_CONFIGURATION_COMPARE_ORDER_SEVERITY = ( localizeWithPath(_moduleId, 7, "Navigate problems ordered by severity")); }
-    static { this.PROBLEMS_PANEL_CONFIGURATION_COMPARE_ORDER_POSITION = ( localizeWithPath(_moduleId, 8, "Navigate problems ordered by position")); }
-    static { this.MARKERS_PANEL_TITLE_PROBLEMS = ( localize2WithPath(_moduleId, 9, "Problems")); }
-    static { this.MARKERS_PANEL_NO_PROBLEMS_BUILT = ( localizeWithPath(_moduleId, 10, "No problems have been detected in the workspace.")); }
-    static { this.MARKERS_PANEL_NO_PROBLEMS_ACTIVE_FILE_BUILT = ( localizeWithPath(_moduleId, 11, "No problems have been detected in the current file.")); }
-    static { this.MARKERS_PANEL_NO_PROBLEMS_FILTERS = ( localizeWithPath(_moduleId, 12, "No results found with provided filter criteria.")); }
-    static { this.MARKERS_PANEL_ACTION_TOOLTIP_MORE_FILTERS = ( localizeWithPath(_moduleId, 13, "More Filters...")); }
-    static { this.MARKERS_PANEL_FILTER_LABEL_SHOW_ERRORS = ( localizeWithPath(_moduleId, 14, "Show Errors")); }
-    static { this.MARKERS_PANEL_FILTER_LABEL_SHOW_WARNINGS = ( localizeWithPath(_moduleId, 15, "Show Warnings")); }
-    static { this.MARKERS_PANEL_FILTER_LABEL_SHOW_INFOS = ( localizeWithPath(_moduleId, 16, "Show Infos")); }
-    static { this.MARKERS_PANEL_FILTER_LABEL_EXCLUDED_FILES = ( localizeWithPath(_moduleId, 17, "Hide Excluded Files")); }
-    static { this.MARKERS_PANEL_FILTER_LABEL_ACTIVE_FILE = ( localizeWithPath(_moduleId, 18, "Show Active File Only")); }
-    static { this.MARKERS_PANEL_ACTION_TOOLTIP_FILTER = ( localizeWithPath(_moduleId, 19, "Filter Problems")); }
-    static { this.MARKERS_PANEL_ACTION_TOOLTIP_QUICKFIX = ( localizeWithPath(_moduleId, 20, "Show fixes")); }
-    static { this.MARKERS_PANEL_FILTER_ARIA_LABEL = ( localizeWithPath(_moduleId, 21, "Filter Problems")); }
-    static { this.MARKERS_PANEL_FILTER_PLACEHOLDER = ( localizeWithPath(_moduleId, 22, "Filter (e.g. text, **/*.ts, !**/node_modules/**)")); }
-    static { this.MARKERS_PANEL_FILTER_ERRORS = ( localizeWithPath(_moduleId, 23, "errors")); }
-    static { this.MARKERS_PANEL_FILTER_WARNINGS = ( localizeWithPath(_moduleId, 24, "warnings")); }
-    static { this.MARKERS_PANEL_FILTER_INFOS = ( localizeWithPath(_moduleId, 25, "infos")); }
-    static { this.MARKERS_PANEL_SINGLE_ERROR_LABEL = ( localizeWithPath(_moduleId, 26, "1 Error")); }
-    static { this.MARKERS_PANEL_MULTIPLE_ERRORS_LABEL = (noOfErrors) => { return ( localizeWithPath(_moduleId, 27, "{0} Errors", '' + noOfErrors)); }; }
-    static { this.MARKERS_PANEL_SINGLE_WARNING_LABEL = ( localizeWithPath(_moduleId, 28, "1 Warning")); }
-    static { this.MARKERS_PANEL_MULTIPLE_WARNINGS_LABEL = (noOfWarnings) => { return ( localizeWithPath(_moduleId, 29, "{0} Warnings", '' + noOfWarnings)); }; }
-    static { this.MARKERS_PANEL_SINGLE_INFO_LABEL = ( localizeWithPath(_moduleId, 30, "1 Info")); }
-    static { this.MARKERS_PANEL_MULTIPLE_INFOS_LABEL = (noOfInfos) => { return ( localizeWithPath(_moduleId, 31, "{0} Infos", '' + noOfInfos)); }; }
-    static { this.MARKERS_PANEL_SINGLE_UNKNOWN_LABEL = ( localizeWithPath(_moduleId, 32, "1 Unknown")); }
-    static { this.MARKERS_PANEL_MULTIPLE_UNKNOWNS_LABEL = (noOfUnknowns) => { return ( localizeWithPath(_moduleId, 33, "{0} Unknowns", '' + noOfUnknowns)); }; }
-    static { this.MARKERS_PANEL_AT_LINE_COL_NUMBER = (ln, col) => { return ( localizeWithPath(_moduleId, 34, "[Ln {0}, Col {1}]", '' + ln, '' + col)); }; }
-    static { this.MARKERS_TREE_ARIA_LABEL_RESOURCE = (noOfProblems, fileName, folder) => { return ( localizeWithPath(
-        _moduleId,
-        35,
+    static { this.PROBLEMS_PANEL_CONFIGURATION_VIEW_MODE = ( localize(5527, "Controls the default view mode of the Problems view.")); }
+    static { this.PROBLEMS_PANEL_CONFIGURATION_SHOW_CURRENT_STATUS = ( localize(5528, "When enabled shows the current problem in the status bar.")); }
+    static { this.PROBLEMS_PANEL_CONFIGURATION_COMPARE_ORDER = ( localize(5529, "Controls the order in which problems are navigated.")); }
+    static { this.PROBLEMS_PANEL_CONFIGURATION_COMPARE_ORDER_SEVERITY = ( localize(5530, "Navigate problems ordered by severity")); }
+    static { this.PROBLEMS_PANEL_CONFIGURATION_COMPARE_ORDER_POSITION = ( localize(5531, "Navigate problems ordered by position")); }
+    static { this.MARKERS_PANEL_TITLE_PROBLEMS = ( localize2(5532, "Problems")); }
+    static { this.MARKERS_PANEL_NO_PROBLEMS_BUILT = ( localize(5533, "No problems have been detected in the workspace.")); }
+    static { this.MARKERS_PANEL_NO_PROBLEMS_ACTIVE_FILE_BUILT = ( localize(5534, "No problems have been detected in the current file.")); }
+    static { this.MARKERS_PANEL_NO_PROBLEMS_FILTERS = ( localize(5535, "No results found with provided filter criteria.")); }
+    static { this.MARKERS_PANEL_ACTION_TOOLTIP_MORE_FILTERS = ( localize(5536, "More Filters...")); }
+    static { this.MARKERS_PANEL_FILTER_LABEL_SHOW_ERRORS = ( localize(5537, "Show Errors")); }
+    static { this.MARKERS_PANEL_FILTER_LABEL_SHOW_WARNINGS = ( localize(5538, "Show Warnings")); }
+    static { this.MARKERS_PANEL_FILTER_LABEL_SHOW_INFOS = ( localize(5539, "Show Infos")); }
+    static { this.MARKERS_PANEL_FILTER_LABEL_EXCLUDED_FILES = ( localize(5540, "Hide Excluded Files")); }
+    static { this.MARKERS_PANEL_FILTER_LABEL_ACTIVE_FILE = ( localize(5541, "Show Active File Only")); }
+    static { this.MARKERS_PANEL_ACTION_TOOLTIP_FILTER = ( localize(5542, "Filter Problems")); }
+    static { this.MARKERS_PANEL_ACTION_TOOLTIP_QUICKFIX = ( localize(5543, "Show fixes")); }
+    static { this.MARKERS_PANEL_FILTER_ARIA_LABEL = ( localize(5544, "Filter Problems")); }
+    static { this.MARKERS_PANEL_FILTER_PLACEHOLDER = ( localize(5545, "Filter (e.g. text, **/*.ts, !**/node_modules/**)")); }
+    static { this.MARKERS_PANEL_FILTER_ERRORS = ( localize(5546, "errors")); }
+    static { this.MARKERS_PANEL_FILTER_WARNINGS = ( localize(5547, "warnings")); }
+    static { this.MARKERS_PANEL_FILTER_INFOS = ( localize(5548, "infos")); }
+    static { this.MARKERS_PANEL_SINGLE_ERROR_LABEL = ( localize(5549, "1 Error")); }
+    static { this.MARKERS_PANEL_MULTIPLE_ERRORS_LABEL = (noOfErrors) => { return ( localize(5550, "{0} Errors", '' + noOfErrors)); }; }
+    static { this.MARKERS_PANEL_SINGLE_WARNING_LABEL = ( localize(5551, "1 Warning")); }
+    static { this.MARKERS_PANEL_MULTIPLE_WARNINGS_LABEL = (noOfWarnings) => { return ( localize(5552, "{0} Warnings", '' + noOfWarnings)); }; }
+    static { this.MARKERS_PANEL_SINGLE_INFO_LABEL = ( localize(5553, "1 Info")); }
+    static { this.MARKERS_PANEL_MULTIPLE_INFOS_LABEL = (noOfInfos) => { return ( localize(5554, "{0} Infos", '' + noOfInfos)); }; }
+    static { this.MARKERS_PANEL_SINGLE_UNKNOWN_LABEL = ( localize(5555, "1 Unknown")); }
+    static { this.MARKERS_PANEL_MULTIPLE_UNKNOWNS_LABEL = (noOfUnknowns) => { return ( localize(5556, "{0} Unknowns", '' + noOfUnknowns)); }; }
+    static { this.MARKERS_PANEL_AT_LINE_COL_NUMBER = (ln, col) => { return ( localize(5557, "[Ln {0}, Col {1}]", '' + ln, '' + col)); }; }
+    static { this.MARKERS_TREE_ARIA_LABEL_RESOURCE = (noOfProblems, fileName, folder) => { return ( localize(
+        5558,
         "{0} problems in file {1} of folder {2}",
         noOfProblems,
         fileName,
         folder
     )); }; }
     static { this.MARKERS_TREE_ARIA_LABEL_MARKER = (marker) => {
-        const relatedInformationMessage = marker.relatedInformation.length ? ( localizeWithPath(
-            _moduleId,
-            36,
+        const relatedInformationMessage = marker.relatedInformation.length ? ( localize(
+            5559,
             " This problem has references to {0} locations.",
             marker.relatedInformation.length
         )) : '';
         switch (marker.marker.severity) {
             case MarkerSeverity.Error:
-                return marker.marker.source ? ( localizeWithPath(
-                    _moduleId,
-                    37,
+                return marker.marker.source ? ( localize(
+                    5560,
                     "Error: {0} at line {1} and character {2}.{3} generated by {4}",
                     marker.marker.message,
                     marker.marker.startLineNumber,
@@ -70,9 +65,8 @@ class Messages {
                     relatedInformationMessage,
                     marker.marker.source
                 ))
-                    : ( localizeWithPath(
-                    _moduleId,
-                    38,
+                    : ( localize(
+                    5561,
                     "Error: {0} at line {1} and character {2}.{3}",
                     marker.marker.message,
                     marker.marker.startLineNumber,
@@ -80,9 +74,8 @@ class Messages {
                     relatedInformationMessage
                 ));
             case MarkerSeverity.Warning:
-                return marker.marker.source ? ( localizeWithPath(
-                    _moduleId,
-                    39,
+                return marker.marker.source ? ( localize(
+                    5562,
                     "Warning: {0} at line {1} and character {2}.{3} generated by {4}",
                     marker.marker.message,
                     marker.marker.startLineNumber,
@@ -90,9 +83,8 @@ class Messages {
                     relatedInformationMessage,
                     marker.marker.source
                 ))
-                    : ( localizeWithPath(
-                    _moduleId,
-                    40,
+                    : ( localize(
+                    5563,
                     "Warning: {0} at line {1} and character {2}.{3}",
                     marker.marker.message,
                     marker.marker.startLineNumber,
@@ -101,9 +93,8 @@ class Messages {
                     relatedInformationMessage
                 ));
             case MarkerSeverity.Info:
-                return marker.marker.source ? ( localizeWithPath(
-                    _moduleId,
-                    41,
+                return marker.marker.source ? ( localize(
+                    5564,
                     "Info: {0} at line {1} and character {2}.{3} generated by {4}",
                     marker.marker.message,
                     marker.marker.startLineNumber,
@@ -111,9 +102,8 @@ class Messages {
                     relatedInformationMessage,
                     marker.marker.source
                 ))
-                    : ( localizeWithPath(
-                    _moduleId,
-                    42,
+                    : ( localize(
+                    5565,
                     "Info: {0} at line {1} and character {2}.{3}",
                     marker.marker.message,
                     marker.marker.startLineNumber,
@@ -121,9 +111,8 @@ class Messages {
                     relatedInformationMessage
                 ));
             default:
-                return marker.marker.source ? ( localizeWithPath(
-                    _moduleId,
-                    43,
+                return marker.marker.source ? ( localize(
+                    5566,
                     "Problem: {0} at line {1} and character {2}.{3} generated by {4}",
                     marker.marker.source,
                     marker.marker.message,
@@ -132,9 +121,8 @@ class Messages {
                     relatedInformationMessage,
                     marker.marker.source
                 ))
-                    : ( localizeWithPath(
-                    _moduleId,
-                    44,
+                    : ( localize(
+                    5567,
                     "Problem: {0} at line {1} and character {2}.{3}",
                     marker.marker.message,
                     marker.marker.startLineNumber,
@@ -143,16 +131,15 @@ class Messages {
                 ));
         }
     }; }
-    static { this.MARKERS_TREE_ARIA_LABEL_RELATED_INFORMATION = (relatedInformation) => ( localizeWithPath(
-        _moduleId,
-        45,
+    static { this.MARKERS_TREE_ARIA_LABEL_RELATED_INFORMATION = (relatedInformation) => ( localize(
+        5568,
         "{0} at line {1} and character {2} in {3}",
         relatedInformation.message,
         relatedInformation.startLineNumber,
         relatedInformation.startColumn,
         basename(relatedInformation.resource)
     )); }
-    static { this.SHOW_ERRORS_WARNINGS_ACTION_LABEL = ( localizeWithPath(_moduleId, 46, "Show Errors and Warnings")); }
+    static { this.SHOW_ERRORS_WARNINGS_ACTION_LABEL = ( localize(5569, "Show Errors and Warnings")); }
 }
 
 export { Messages as default };