@codingame/monaco-vscode-timeline-service-override 7.0.11 → 7.1.1

package/package.json

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

package/vscode/src/vs/workbench/contrib/localHistory/browser/localHistory.js

@@ -1,10 +1,9 @@
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize } from 'vscode/vscode/vs/nls';
 import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
 import { language } from 'vscode/vscode/vs/base/common/platform';
 import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { registerIcon } from 'vscode/vscode/vs/platform/theme/common/iconRegistry';
 
-const _moduleId = "vs/workbench/contrib/localHistory/browser/localHistory";
 let localHistoryDateFormatter = undefined;
 function getLocalHistoryDateFormatter() {
     if (!localHistoryDateFormatter) {
@@ -24,7 +23,7 @@ function getLocalHistoryDateFormatter() {
 }
 const LOCAL_HISTORY_MENU_CONTEXT_VALUE = 'localHistory:item';
 const LOCAL_HISTORY_MENU_CONTEXT_KEY = ( (ContextKeyExpr.equals('timelineItem', LOCAL_HISTORY_MENU_CONTEXT_VALUE)));
-const LOCAL_HISTORY_ICON_ENTRY = registerIcon('localHistory-icon', Codicon.circleOutline, ( localizeWithPath(_moduleId, 0, "Icon for a local history entry in the timeline view.")));
-const LOCAL_HISTORY_ICON_RESTORE = registerIcon('localHistory-restore', Codicon.check, ( localizeWithPath(_moduleId, 1, "Icon for restoring contents of a local history entry.")));
+const LOCAL_HISTORY_ICON_ENTRY = registerIcon('localHistory-icon', Codicon.circleOutline, ( localize(10540, "Icon for a local history entry in the timeline view.")));
+const LOCAL_HISTORY_ICON_RESTORE = registerIcon('localHistory-restore', Codicon.check, ( localize(10541, "Icon for restoring contents of a local history entry.")));
 
 export { LOCAL_HISTORY_ICON_ENTRY, LOCAL_HISTORY_ICON_RESTORE, LOCAL_HISTORY_MENU_CONTEXT_KEY, LOCAL_HISTORY_MENU_CONTEXT_VALUE, getLocalHistoryDateFormatter };

package/vscode/src/vs/workbench/contrib/localHistory/browser/localHistoryCommands.js

@@ -1,4 +1,4 @@
-import { localize2WithPath, localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize2, localize } from 'vscode/vscode/vs/nls';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
 import { Event } from 'vscode/vscode/vs/base/common/event';
 import { Schemas } from 'vscode/vscode/vs/base/common/network';
@@ -7,7 +7,7 @@ import { CancellationToken, CancellationTokenSource } from 'vscode/vscode/vs/bas
 import { IWorkingCopyHistoryService } from 'vscode/vscode/vs/workbench/services/workingCopy/common/workingCopyHistory.service';
 import { API_OPEN_DIFF_EDITOR_COMMAND_ID } from 'vscode/vscode/vs/workbench/browser/parts/editor/editorCommands';
 import { LocalHistoryFileSystemProvider } from './localHistoryFileSystemProvider.js';
-import { RawContextKey, ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
+import { ContextKeyExpr, RawContextKey } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
 import { registerAction2, Action2, MenuId, MenuRegistry } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { basenameOrAuthority, basename, dirname } from 'vscode/vscode/vs/base/common/resources';
@@ -27,9 +27,9 @@ import { firstOrDefault } from 'vscode/vscode/vs/base/common/arrays';
 import { LOCAL_HISTORY_MENU_CONTEXT_KEY, LOCAL_HISTORY_ICON_RESTORE, getLocalHistoryDateFormatter } from './localHistory.js';
 import { IPathService } from 'vscode/vscode/vs/workbench/services/path/common/pathService.service';
 
-const _moduleId = "vs/workbench/contrib/localHistory/browser/localHistoryCommands";
-const LOCAL_HISTORY_CATEGORY = ( localize2WithPath(_moduleId, 0, 'Local History'));
-const COMPARE_WITH_FILE_LABEL = ( localize2WithPath(_moduleId, 1, 'Compare with File'));
+const LOCAL_HISTORY_CATEGORY = ( localize2(6786, 'Local History'));
+const CTX_LOCAL_HISTORY_ENABLED = ( (ContextKeyExpr.has('config.workbench.localHistory.enabled')));
+const COMPARE_WITH_FILE_LABEL = ( localize2(6787, 'Compare with File'));
 registerAction2(class extends Action2 {
     constructor() {
         super({
@@ -56,7 +56,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.localHistory.compareWithPrevious',
-            title: ( localize2WithPath(_moduleId, 2, 'Compare with Previous')),
+            title: ( localize2(6788, 'Compare with Previous')),
             menu: {
                 id: MenuId.TimelineItemContext,
                 group: '1_compare',
@@ -84,7 +84,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.localHistory.selectForCompare',
-            title: ( localize2WithPath(_moduleId, 3, 'Select for Compare')),
+            title: ( localize2(6789, 'Select for Compare')),
             menu: {
                 id: MenuId.TimelineItemContext,
                 group: '2_compare_with',
@@ -107,7 +107,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.localHistory.compareWithSelected',
-            title: ( localize2WithPath(_moduleId, 4, 'Compare with Selected')),
+            title: ( localize2(6790, 'Compare with Selected')),
             menu: {
                 id: MenuId.TimelineItemContext,
                 group: '2_compare_with',
@@ -136,7 +136,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.localHistory.open',
-            title: ( localize2WithPath(_moduleId, 5, 'Show Contents')),
+            title: ( localize2(6791, 'Show Contents')),
             menu: {
                 id: MenuId.TimelineItemContext,
                 group: '3_contents',
@@ -154,7 +154,7 @@ registerAction2(class extends Action2 {
         }
     }
 });
-const RESTORE_CONTENTS_LABEL = ( localize2WithPath(_moduleId, 6, 'Restore Contents'));
+const RESTORE_CONTENTS_LABEL = ( localize2(6792, 'Restore Contents'));
 registerAction2(class extends Action2 {
     constructor() {
         super({
@@ -191,7 +191,7 @@ registerAction2(class extends Action2 {
         return restore(accessor, item);
     }
 });
-const restoreSaveSource = SaveSourceRegistry.registerSource('localHistoryRestore.source', ( localizeWithPath(_moduleId, 7, "File Restored")));
+const restoreSaveSource = SaveSourceRegistry.registerSource('localHistoryRestore.source', ( localize(6793, "File Restored")));
 async function restore(accessor, item) {
     const fileService = accessor.get(IFileService);
     const dialogService = accessor.get(IDialogService);
@@ -202,14 +202,13 @@ async function restore(accessor, item) {
     if (entry) {
         const { confirmed } = await dialogService.confirm({
             type: 'warning',
-            message: ( localizeWithPath(
-                _moduleId,
-                8,
+            message: ( localize(
+                6794,
                 "Do you want to restore the contents of '{0}'?",
                 basename(entry.workingCopy.resource)
             )),
-            detail: ( localizeWithPath(_moduleId, 9, "Restoring will discard any unsaved changes.")),
-            primaryButton: ( localizeWithPath(_moduleId, 10, "&&Restore"))
+            detail: ( localize(6795, "Restoring will discard any unsaved changes.")),
+            primaryButton: ( localize(6796, "&&Restore"))
         });
         if (!confirmed) {
             return;
@@ -226,12 +225,7 @@ async function restore(accessor, item) {
             await fileService.cloneFile(entry.location, entry.workingCopy.resource);
         }
         catch (error) {
-            await dialogService.error(( localizeWithPath(
-                _moduleId,
-                11,
-                "Unable to restore '{0}'.",
-                basename(entry.workingCopy.resource)
-            )), toErrorMessage(error));
+            await dialogService.error(( localize(6797, "Unable to restore '{0}'.", basename(entry.workingCopy.resource))), toErrorMessage(error));
             return;
         }
         if (workingCopies) {
@@ -251,9 +245,10 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.localHistory.restoreViaPicker',
-            title: ( localize2WithPath(_moduleId, 12, 'Find Entry to Restore')),
+            title: ( localize2(6798, 'Find Entry to Restore')),
             f1: true,
-            category: LOCAL_HISTORY_CATEGORY
+            category: LOCAL_HISTORY_CATEGORY,
+            precondition: CTX_LOCAL_HISTORY_ENABLED
         });
     }
     async run(accessor) {
@@ -272,7 +267,7 @@ registerAction2(class extends Action2 {
         resourcePicker.show();
         const resources = await workingCopyHistoryService.getAll(cts.token);
         resourcePicker.busy = false;
-        resourcePicker.placeholder = ( localizeWithPath(_moduleId, 13, "Select the file to show local history for"));
+        resourcePicker.placeholder = ( localize(6799, "Select the file to show local history for"));
         resourcePicker.matchOnLabel = true;
         resourcePicker.matchOnDescription = true;
         resourcePicker.items = ( (resources.map(resource => ({
@@ -294,7 +289,7 @@ registerAction2(class extends Action2 {
         entryPicker.show();
         const entries = await workingCopyHistoryService.getEntries(resource, cts.token);
         entryPicker.busy = false;
-        entryPicker.placeholder = ( localizeWithPath(_moduleId, 14, "Select the local history entry to open"));
+        entryPicker.placeholder = ( localize(6800, "Select the local history entry to open"));
         entryPicker.matchOnLabel = true;
         entryPicker.matchOnDescription = true;
         entryPicker.items = ( (Array.from(entries).reverse().map(entry => ({
@@ -315,12 +310,12 @@ registerAction2(class extends Action2 {
         return openEntry(selectedItem.entry, editorService);
     }
 });
-MenuRegistry.appendMenuItem(MenuId.TimelineTitle, { command: { id: 'workbench.action.localHistory.restoreViaPicker', title: ( localize2WithPath(_moduleId, 15, 'Local History: Find Entry to Restore...')) }, group: 'submenu', order: 1 });
+MenuRegistry.appendMenuItem(MenuId.TimelineTitle, { command: { id: 'workbench.action.localHistory.restoreViaPicker', title: ( localize2(6801, 'Local History: Find Entry to Restore...')) }, group: 'submenu', order: 1, when: CTX_LOCAL_HISTORY_ENABLED });
 registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.localHistory.rename',
-            title: ( localize2WithPath(_moduleId, 16, 'Rename')),
+            title: ( localize2(6802, 'Rename')),
             menu: {
                 id: MenuId.TimelineItemContext,
                 group: '5_edit',
@@ -335,9 +330,9 @@ registerAction2(class extends Action2 {
         const { entry } = await findLocalHistoryEntry(workingCopyHistoryService, item);
         if (entry) {
             const inputBox = quickInputService.createInputBox();
-            inputBox.title = ( localizeWithPath(_moduleId, 17, "Rename Local History Entry"));
+            inputBox.title = ( localize(6803, "Rename Local History Entry"));
             inputBox.ignoreFocusOut = true;
-            inputBox.placeholder = ( localizeWithPath(_moduleId, 18, "Enter the new name of the local history entry"));
+            inputBox.placeholder = ( localize(6804, "Enter the new name of the local history entry"));
             inputBox.value = SaveSourceRegistry.getSourceLabel(entry.source);
             inputBox.show();
             inputBox.onDidAccept(() => {
@@ -353,7 +348,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.localHistory.delete',
-            title: ( localize2WithPath(_moduleId, 19, 'Delete')),
+            title: ( localize2(6805, 'Delete')),
             menu: {
                 id: MenuId.TimelineItemContext,
                 group: '5_edit',
@@ -370,15 +365,14 @@ registerAction2(class extends Action2 {
         if (entry) {
             const { confirmed } = await dialogService.confirm({
                 type: 'warning',
-                message: ( localizeWithPath(
-                    _moduleId,
-                    20,
+                message: ( localize(
+                    6806,
                     "Do you want to delete the local history entry of '{0}' from {1}?",
                     entry.workingCopy.name,
                     toLocalHistoryEntryDateLabel(entry.timestamp)
                 )),
-                detail: ( localizeWithPath(_moduleId, 21, "This action is irreversible!")),
-                primaryButton: ( localizeWithPath(_moduleId, 22, "&&Delete")),
+                detail: ( localize(6807, "This action is irreversible!")),
+                primaryButton: ( localize(6808, "&&Delete")),
             });
             if (!confirmed) {
                 return;
@@ -392,9 +386,10 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.localHistory.deleteAll',
-            title: ( localize2WithPath(_moduleId, 23, 'Delete All')),
+            title: ( localize2(6809, 'Delete All')),
             f1: true,
-            category: LOCAL_HISTORY_CATEGORY
+            category: LOCAL_HISTORY_CATEGORY,
+            precondition: CTX_LOCAL_HISTORY_ENABLED
         });
     }
     async run(accessor) {
@@ -402,13 +397,9 @@ registerAction2(class extends Action2 {
         const workingCopyHistoryService = accessor.get(IWorkingCopyHistoryService);
         const { confirmed } = await dialogService.confirm({
             type: 'warning',
-            message: ( localizeWithPath(
-                _moduleId,
-                24,
-                "Do you want to delete all entries of all files in local history?"
-            )),
-            detail: ( localizeWithPath(_moduleId, 25, "This action is irreversible!")),
-            primaryButton: ( localizeWithPath(_moduleId, 26, "&&Delete All")),
+            message: ( localize(6810, "Do you want to delete all entries of all files in local history?")),
+            detail: ( localize(6811, "This action is irreversible!")),
+            primaryButton: ( localize(6812, "&&Delete All")),
         });
         if (!confirmed) {
             return;
@@ -420,10 +411,10 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.localHistory.create',
-            title: ( localize2WithPath(_moduleId, 27, 'Create Entry')),
+            title: ( localize2(6813, 'Create Entry')),
             f1: true,
             category: LOCAL_HISTORY_CATEGORY,
-            precondition: ActiveEditorContext
+            precondition: ( (ContextKeyExpr.and(CTX_LOCAL_HISTORY_ENABLED, ActiveEditorContext)))
         });
     }
     async run(accessor) {
@@ -437,11 +428,10 @@ registerAction2(class extends Action2 {
             return;
         }
         const inputBox = quickInputService.createInputBox();
-        inputBox.title = ( localizeWithPath(_moduleId, 28, "Create Local History Entry"));
+        inputBox.title = ( localize(6814, "Create Local History Entry"));
         inputBox.ignoreFocusOut = true;
-        inputBox.placeholder = ( localizeWithPath(
-            _moduleId,
-            29,
+        inputBox.placeholder = ( localize(
+            6815,
             "Enter the new name of the local history entry for '{0}'",
             labelService.getUriBasenameLabel(resource)
         ));
@@ -459,9 +449,8 @@ async function openEntry(entry, editorService) {
     const resource = LocalHistoryFileSystemProvider.toLocalHistoryFileSystem({ location: entry.location, associatedResource: entry.workingCopy.resource });
     await editorService.openEditor({
         resource,
-        label: ( localizeWithPath(
-            _moduleId,
-            30,
+        label: ( localize(
+            6816,
             "{0} ({1} • {2})",
             entry.workingCopy.name,
             SaveSourceRegistry.getSourceLabel(entry.source),
@@ -481,9 +470,8 @@ function toDiffEditorArguments(arg1, arg2) {
     if (URI.isUri(arg2)) {
         const resource = arg2;
         modifiedResource = resource;
-        label = ( localizeWithPath(
-            _moduleId,
-            31,
+        label = ( localize(
+            6817,
             "{0} ({1} • {2}) ↔ {3}",
             arg1.workingCopy.name,
             SaveSourceRegistry.getSourceLabel(arg1.source),
@@ -494,9 +482,8 @@ function toDiffEditorArguments(arg1, arg2) {
     else {
         const modified = arg2;
         modifiedResource = LocalHistoryFileSystemProvider.toLocalHistoryFileSystem({ location: modified.location, associatedResource: modified.workingCopy.resource });
-        label = ( localizeWithPath(
-            _moduleId,
-            32,
+        label = ( localize(
+            6818,
             "{0} ({1} • {2}) ↔ {3} ({4} • {5})",
             arg1.workingCopy.name,
             SaveSourceRegistry.getSourceLabel(arg1.source),

package/vscode/src/vs/workbench/contrib/localHistory/browser/localHistoryTimeline.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 { Emitter } from 'vscode/vscode/vs/base/common/event';
 import { Disposable, MutableDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { ITimelineService } from 'vscode/vscode/vs/workbench/contrib/timeline/common/timeline.service';
@@ -20,7 +20,6 @@ import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/co
 import { getVirtualWorkspaceAuthority } from 'vscode/vscode/vs/platform/workspace/common/virtualWorkspace';
 
 var LocalHistoryTimeline_1;
-const _moduleId = "vs/workbench/contrib/localHistory/browser/localHistoryTimeline";
 let LocalHistoryTimeline = class LocalHistoryTimeline extends Disposable {
     static { LocalHistoryTimeline_1 = this; }
     static { this.ID = 'workbench.contrib.localHistoryTimeline'; }
@@ -35,7 +34,7 @@ let LocalHistoryTimeline = class LocalHistoryTimeline extends Disposable {
         this.configurationService = configurationService;
         this.contextService = contextService;
         this.id = 'timeline.localHistory';
-        this.label = ( localizeWithPath(_moduleId, 0, "Local History"));
+        this.label = ( localize(6819, "Local History"));
         this.scheme = '*';
         this._onDidChange = this._register(( (new Emitter())));
         this.onDidChange = this._onDidChange.event;

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

@@ -1,4 +1,4 @@
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize } from 'vscode/vscode/vs/nls';
 import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
 import 'vscode/vscode/vs/platform/instantiation/common/extensions';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
@@ -17,9 +17,8 @@ import { ResourceContextKey } from 'vscode/vscode/vs/workbench/common/contextkey
 import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
 import { registerIcon } from 'vscode/vscode/vs/platform/theme/common/iconRegistry';
 
-const _moduleId = "vs/workbench/contrib/timeline/browser/timeline.contribution";
-const timelineViewIcon = registerIcon('timeline-view-icon', Codicon.history, ( localizeWithPath(_moduleId, 0, 'View icon of the timeline view.')));
-const timelineOpenIcon = registerIcon('timeline-open', Codicon.history, ( localizeWithPath(_moduleId, 1, 'Icon for the open timeline action.')));
+const timelineViewIcon = registerIcon('timeline-view-icon', Codicon.history, ( localize(3014, 'View icon of the timeline view.')));
+const timelineOpenIcon = registerIcon('timeline-open', Codicon.history, ( localize(3015, 'Icon for the open timeline action.')));
 class TimelinePaneDescriptor {
     constructor() {
         this.id = TimelinePaneId;
@@ -40,24 +39,22 @@ const configurationRegistry = ( (Registry.as(Extensions.Configuration)));
 configurationRegistry.registerConfiguration({
     id: 'timeline',
     order: 1001,
-    title: ( localizeWithPath(_moduleId, 2, "Timeline")),
+    title: ( localize(3016, "Timeline")),
     type: 'object',
     properties: {
         'timeline.pageSize': {
             type: ['number', 'null'],
             default: null,
-            markdownDescription: ( localizeWithPath(
-                _moduleId,
-                3,
+            markdownDescription: ( localize(
+                3017,
                 "The number of items to show in the Timeline view by default and when loading more items. Setting to `null` (the default) will automatically choose a page size based on the visible area of the Timeline view."
             )),
         },
         'timeline.pageOnScroll': {
             type: 'boolean',
             default: false,
-            description: ( localizeWithPath(
-                _moduleId,
-                4,
+            description: ( localize(
+                3018,
                 "Experimental. Controls whether the Timeline view will load the next page of items when you scroll to the end of the list."
             )),
         },
@@ -67,7 +64,7 @@ configurationRegistry.registerConfiguration({
 var OpenTimelineAction;
 ( ((function(OpenTimelineAction) {
     OpenTimelineAction.ID = 'files.openTimeline';
-    OpenTimelineAction.LABEL = ( localizeWithPath(_moduleId, 5, "Open Timeline"));
+    OpenTimelineAction.LABEL = ( localize(3019, "Open Timeline"));
     function handler() {
         return (accessor, arg) => {
             const service = accessor.get(ITimelineService);
@@ -91,10 +88,10 @@ MenuRegistry.appendMenuItem(MenuId.ExplorerContext, ({
         TimelineHasProviderContext
     )))
 }));
-const timelineFilter = registerIcon('timeline-filter', Codicon.filter, ( localizeWithPath(_moduleId, 6, 'Icon for the filter timeline action.')));
+const timelineFilter = registerIcon('timeline-filter', Codicon.filter, ( localize(3020, 'Icon for the filter timeline action.')));
 MenuRegistry.appendMenuItem(MenuId.TimelineTitle, {
     submenu: MenuId.TimelineFilterSubMenu,
-    title: ( localizeWithPath(_moduleId, 7, "Filter Timeline")),
+    title: ( localize(3021, "Filter Timeline")),
     group: 'navigation',
     order: 100,
     icon: timelineFilter

package/vscode/src/vs/workbench/contrib/timeline/browser/timelinePane.js

@@ -1,6 +1,6 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import './media/timelinePane.css.js';
-import { localizeWithPath, localize2WithPath } from 'vscode/vscode/vs/nls';
+import { localize, localize2 } from 'vscode/vscode/vs/nls';
 import { clearNode, append, $, asCSSUrl } from 'vscode/vscode/vs/base/browser/dom';
 import { ActionRunner } from 'vscode/vscode/vs/base/common/actions';
 import { CancellationTokenSource } from 'vscode/vscode/vs/base/common/cancellation';
@@ -53,7 +53,6 @@ import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storag
 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/timeline/browser/timelinePane";
 const ItemHeight = 22;
 function isLoadMoreCommand(item) {
     return item instanceof LoadMoreCommand;
@@ -176,7 +175,7 @@ class LoadMoreCommand {
         return this.label;
     }
     get label() {
-        return this.loading ? ( localizeWithPath(_moduleId, 0, "Loading...")) : ( localizeWithPath(_moduleId, 1, "Load more"));
+        return this.loading ? ( localize(6769, "Loading...")) : ( localize(6770, "Load more"));
     }
     get themeIcon() {
         return undefined;
@@ -185,7 +184,7 @@ class LoadMoreCommand {
 const TimelineFollowActiveEditorContext = ( (new RawContextKey('timelineFollowActiveEditor', true, true)));
 const TimelineExcludeSources = ( (new RawContextKey('timelineExcludeSources', '[]', true)));
 let TimelinePane = class TimelinePane extends ViewPane {
-    static { this.TITLE = ( localize2WithPath(_moduleId, 2, "Timeline")); }
+    static { this.TITLE = ( localize2(6771, "Timeline")); }
     constructor(options, keybindingService, contextMenuService, contextKeyService, configurationService, storageService, viewDescriptorService, instantiationService, editorService, commandService, progressService, timelineService, openerService, themeService, telemetryService, hoverService, labelService, uriIdentityService, extensionService) {
         super({ ...options, titleMenuId: MenuId.TimelineTitle }, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService, hoverService);
         this.storageService = storageService;
@@ -621,7 +620,7 @@ let TimelinePane = class TimelinePane extends ViewPane {
         this._isEmpty = !this.hasVisibleItems;
         if (this.uri === undefined) {
             this.updateFilename(undefined);
-            this.message = ( localizeWithPath(_moduleId, 3, "The active editor cannot provide timeline information."));
+            this.message = ( localize(6772, "The active editor cannot provide timeline information."));
         }
         else if (this._isEmpty) {
             if (this.pendingRequests.size !== 0) {
@@ -631,25 +630,24 @@ let TimelinePane = class TimelinePane extends ViewPane {
                 this.updateFilename(this.labelService.getUriBasenameLabel(this.uri));
                 const scmProviderCount = this.contextKeyService.getContextKeyValue('scm.providerCount');
                 if (this.timelineService.getSources().filter(({ id }) => !( (this.excludedSources.has(id)))).length === 0) {
-                    this.message = ( localizeWithPath(_moduleId, 4, "All timeline sources have been filtered out."));
+                    this.message = ( localize(6773, "All timeline sources have been filtered out."));
                 }
                 else {
                     if (this.configurationService.getValue('workbench.localHistory.enabled') && !( (this.excludedSources.has('timeline.localHistory')))) {
-                        this.message = ( localizeWithPath(
-                            _moduleId,
-                            5,
+                        this.message = ( localize(
+                            6774,
                             "Local History will track recent changes as you save them unless the file has been excluded or is too large."
                         ));
                     }
                     else if (this.excludedSources.size > 0) {
-                        this.message = ( localizeWithPath(_moduleId, 6, "No filtered timeline information was provided."));
+                        this.message = ( localize(6775, "No filtered timeline information was provided."));
                     }
                     else {
-                        this.message = ( localizeWithPath(_moduleId, 7, "No timeline information was provided."));
+                        this.message = ( localize(6776, "No timeline information was provided."));
                     }
                 }
                 if (!scmProviderCount || scmProviderCount === 0) {
-                    this.message += ' ' + ( localizeWithPath(_moduleId, 8, "Source Control has not been configured."));
+                    this.message += ' ' + ( localize(6777, "Source Control has not been configured."));
                 }
             }
         }
@@ -706,7 +704,7 @@ let TimelinePane = class TimelinePane extends ViewPane {
         container.classList.add('tree-explorer-viewlet-tree-view', 'timeline-tree-view');
         this.$message = append(this.$container, $('.message'));
         this.$message.classList.add('timeline-subtle');
-        this.message = ( localizeWithPath(_moduleId, 3, "The active editor cannot provide timeline information."));
+        this.message = ( localize(6777, "The active editor cannot provide timeline information."));
         this.$tree = document.createElement('div');
         this.$tree.classList.add('customview-tree', 'file-icon-themable-tree', 'hide-arrows');
         container.appendChild(this.$tree);
@@ -723,13 +721,7 @@ let TimelinePane = class TimelinePane extends ViewPane {
                     if (isLoadMoreCommand(element)) {
                         return element.ariaLabel;
                     }
-                    return element.accessibilityInformation ? element.accessibilityInformation.label : ( localizeWithPath(
-                        _moduleId,
-                        9,
-                        "{0}: {1}",
-                        element.relativeTimeFullWord ?? '',
-                        element.label
-                    ));
+                    return element.accessibilityInformation ? element.accessibilityInformation.label : ( localize(6778, "{0}: {1}", element.relativeTimeFullWord ?? '', element.label));
                 },
                 getRole(element) {
                     if (isLoadMoreCommand(element)) {
@@ -738,7 +730,7 @@ let TimelinePane = class TimelinePane extends ViewPane {
                     return element.accessibilityInformation && element.accessibilityInformation.role ? element.accessibilityInformation.role : 'treeitem';
                 },
                 getWidgetAriaLabel() {
-                    return ( localizeWithPath(_moduleId, 2, "Timeline"));
+                    return ( localize(6778, "Timeline"));
                 }
             },
             keyboardNavigationLabelProvider: ( (new TimelineKeyboardNavigationLabelProvider())),
@@ -799,7 +791,7 @@ let TimelinePane = class TimelinePane extends ViewPane {
     setLoadingUriMessage() {
         const file = this.uri && this.labelService.getUriBasenameLabel(this.uri);
         this.updateFilename(file);
-        this.message = file ? ( localizeWithPath(_moduleId, 10, "Loading timeline for {0}...", file)) : '';
+        this.message = file ? ( localize(6779, "Loading timeline for {0}...", file)) : '';
     }
     onContextMenu(commands, treeEvent) {
         const item = treeEvent.element;
@@ -987,9 +979,9 @@ TimelineTreeRenderer = ( (__decorate([
     ( (__param(1, IInstantiationService))),
     ( (__param(2, IThemeService)))
 ], TimelineTreeRenderer)));
-const timelineRefresh = registerIcon('timeline-refresh', Codicon.refresh, ( localizeWithPath(_moduleId, 11, 'Icon for the refresh timeline action.')));
-const timelinePin = registerIcon('timeline-pin', Codicon.pin, ( localizeWithPath(_moduleId, 12, 'Icon for the pin timeline action.')));
-const timelineUnpin = registerIcon('timeline-unpin', Codicon.pinned, ( localizeWithPath(_moduleId, 13, 'Icon for the unpin timeline action.')));
+const timelineRefresh = registerIcon('timeline-refresh', Codicon.refresh, ( localize(6780, 'Icon for the refresh timeline action.')));
+const timelinePin = registerIcon('timeline-pin', Codicon.pin, ( localize(6781, 'Icon for the pin timeline action.')));
+const timelineUnpin = registerIcon('timeline-unpin', Codicon.pinned, ( localize(6782, 'Icon for the unpin timeline action.')));
 let TimelinePaneCommands = class TimelinePaneCommands extends Disposable {
     constructor(pane, timelineService, storageService, contextKeyService, menuService) {
         super();
@@ -1003,9 +995,9 @@ let TimelinePaneCommands = class TimelinePaneCommands extends Disposable {
             constructor() {
                 super({
                     id: 'timeline.refresh',
-                    title: ( localize2WithPath(_moduleId, 14, "Refresh")),
+                    title: ( localize2(6783, "Refresh")),
                     icon: timelineRefresh,
-                    category: ( localize2WithPath(_moduleId, 2, "Timeline")),
+                    category: ( localize2(6783, "Timeline")),
                     menu: {
                         id: MenuId.TimelineTitle,
                         group: 'navigation',
@@ -1021,9 +1013,9 @@ let TimelinePaneCommands = class TimelinePaneCommands extends Disposable {
         this._register(MenuRegistry.appendMenuItem(MenuId.TimelineTitle, ({
             command: {
                 id: 'timeline.toggleFollowActiveEditor',
-                title: ( localize2WithPath(_moduleId, 15, 'Pin the Current Timeline')),
+                title: ( localize2(6784, 'Pin the Current Timeline')),
                 icon: timelinePin,
-                category: ( localize2WithPath(_moduleId, 2, "Timeline")),
+                category: ( localize2(6784, "Timeline")),
             },
             group: 'navigation',
             order: 98,
@@ -1032,9 +1024,9 @@ let TimelinePaneCommands = class TimelinePaneCommands extends Disposable {
         this._register(MenuRegistry.appendMenuItem(MenuId.TimelineTitle, ({
             command: {
                 id: 'timeline.toggleFollowActiveEditor',
-                title: ( localize2WithPath(_moduleId, 16, 'Unpin the Current Timeline')),
+                title: ( localize2(6785, 'Unpin the Current Timeline')),
                 icon: timelineUnpin,
-                category: ( localize2WithPath(_moduleId, 2, "Timeline")),
+                category: ( localize2(6785, "Timeline")),
             },
             group: 'navigation',
             order: 98,
@@ -1054,12 +1046,11 @@ let TimelinePaneCommands = class TimelinePaneCommands extends Disposable {
             ['view', this.pane.id],
             [context.key, context.value],
         ]);
-        const menu = this.menuService.createMenu(menuId, contextKeyService);
+        const menu = this.menuService.getMenuActions(menuId, contextKeyService, { shouldForwardArgs: true });
         const primary = [];
         const secondary = [];
         const result = { primary, secondary };
-        createAndFillInContextMenuActions(menu, { shouldForwardArgs: true }, result, 'inline');
-        menu.dispose();
+        createAndFillInContextMenuActions(menu, result, 'inline');
         return result;
     }
     updateTimelineSourceFilters() {