@codingame/monaco-vscode-timeline-service-override 14.0.6 → 15.0.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-timeline-service-override",
-  "version": "14.0.6",
+  "version": "15.0.1",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - timeline service-override",
   "keywords": [],
@@ -15,12 +15,12 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-2cbab29e-9393-5de6-b701-9a9555360b6b-common": "14.0.6",
-    "@codingame/monaco-vscode-65619f8f-0eab-5d8b-855a-43b6353fe527-common": "14.0.6",
-    "@codingame/monaco-vscode-api": "14.0.6",
-    "@codingame/monaco-vscode-b71b5434-ce96-5581-8993-e8da380bd63f-common": "14.0.6",
-    "@codingame/monaco-vscode-eea37658-2307-56a5-8ed0-b2752c7b7a50-common": "14.0.6",
-    "@codingame/monaco-vscode-f48982c4-9e82-55e2-b800-20e6d1e6096f-common": "14.0.6"
+    "@codingame/monaco-vscode-38f25ab8-ea30-5ba9-8a08-ae3308c297c0-common": "15.0.1",
+    "@codingame/monaco-vscode-65619f8f-0eab-5d8b-855a-43b6353fe527-common": "15.0.1",
+    "@codingame/monaco-vscode-7559b0be-bfa5-5fe6-b731-1973fe9fffa1-common": "15.0.1",
+    "@codingame/monaco-vscode-a4c2011e-8775-52bd-abf0-4a3c07a9696b-common": "15.0.1",
+    "@codingame/monaco-vscode-api": "15.0.1",
+    "@codingame/monaco-vscode-b71b5434-ce96-5581-8993-e8da380bd63f-common": "15.0.1"
   },
   "main": "index.js",
   "module": "index.js",

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

@@ -19,7 +19,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, ( localize(7122, "Icon for a local history entry in the timeline view.")));
-const LOCAL_HISTORY_ICON_RESTORE = registerIcon('localHistory-restore', Codicon.check, ( localize(7123, "Icon for restoring contents of a local history entry.")));
+const LOCAL_HISTORY_ICON_ENTRY = registerIcon('localHistory-icon', Codicon.circleOutline, ( localize(7220, "Icon for a local history entry in the timeline view.")));
+const LOCAL_HISTORY_ICON_RESTORE = registerIcon('localHistory-restore', Codicon.check, ( localize(7221, "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

@@ -6,7 +6,7 @@ import { Schemas } from '@codingame/monaco-vscode-api/vscode/vs/base/common/netw
 import { toErrorMessage } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errorMessage';
 import { CancellationToken, CancellationTokenSource } from '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
 import { IWorkingCopyHistoryService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/workingCopy/common/workingCopyHistory.service';
-import { API_OPEN_DIFF_EDITOR_COMMAND_ID } from '@codingame/monaco-vscode-f48982c4-9e82-55e2-b800-20e6d1e6096f-common/vscode/vs/workbench/browser/parts/editor/editorCommands';
+import { API_OPEN_DIFF_EDITOR_COMMAND_ID } from '@codingame/monaco-vscode-38f25ab8-ea30-5ba9-8a08-ae3308c297c0-common/vscode/vs/workbench/browser/parts/editor/editorCommands';
 import { LocalHistoryFileSystemProvider } from './localHistoryFileSystemProvider.js';
 import { ContextKeyExpr, RawContextKey } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
 import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
@@ -21,8 +21,8 @@ import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench
 import { ResourceContextKey, ActiveEditorContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contextkeys';
 import { IQuickInputService } from '@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickInput.service';
 import { getIconClasses } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/getIconClasses';
-import { IModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/model';
-import { ILanguageService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/language';
+import { IModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/model.service';
+import { ILanguageService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/language.service';
 import { ILabelService } from '@codingame/monaco-vscode-api/vscode/vs/platform/label/common/label.service';
 import { coalesce } from '@codingame/monaco-vscode-api/vscode/vs/base/common/arrays';
 import { LOCAL_HISTORY_MENU_CONTEXT_KEY, LOCAL_HISTORY_ICON_RESTORE, getLocalHistoryDateFormatter } from './localHistory.js';
@@ -31,9 +31,9 @@ import { ResourceSet } from '@codingame/monaco-vscode-api/vscode/vs/base/common/
 import { IHistoryService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/history/common/history.service';
 import { DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 
-const LOCAL_HISTORY_CATEGORY = ( localize2(7124, 'Local History'));
+const LOCAL_HISTORY_CATEGORY = ( localize2(7222, 'Local History'));
 const CTX_LOCAL_HISTORY_ENABLED = ( ContextKeyExpr.has('config.workbench.localHistory.enabled'));
-const COMPARE_WITH_FILE_LABEL = ( localize2(7125, 'Compare with File'));
+const COMPARE_WITH_FILE_LABEL = ( localize2(7223, 'Compare with File'));
 registerAction2(class extends Action2 {
     constructor() {
         super({
@@ -60,7 +60,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.localHistory.compareWithPrevious',
-            title: ( localize2(7126, 'Compare with Previous')),
+            title: ( localize2(7224, 'Compare with Previous')),
             menu: {
                 id: MenuId.TimelineItemContext,
                 group: '1_compare',
@@ -88,7 +88,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.localHistory.selectForCompare',
-            title: ( localize2(7127, 'Select for Compare')),
+            title: ( localize2(7225, 'Select for Compare')),
             menu: {
                 id: MenuId.TimelineItemContext,
                 group: '2_compare_with',
@@ -111,7 +111,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.localHistory.compareWithSelected',
-            title: ( localize2(7128, 'Compare with Selected')),
+            title: ( localize2(7226, 'Compare with Selected')),
             menu: {
                 id: MenuId.TimelineItemContext,
                 group: '2_compare_with',
@@ -140,7 +140,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.localHistory.open',
-            title: ( localize2(7129, 'Show Contents')),
+            title: ( localize2(7227, 'Show Contents')),
             menu: {
                 id: MenuId.TimelineItemContext,
                 group: '3_contents',
@@ -158,7 +158,7 @@ registerAction2(class extends Action2 {
         }
     }
 });
-const RESTORE_CONTENTS_LABEL = ( localize2(7130, 'Restore Contents'));
+const RESTORE_CONTENTS_LABEL = ( localize2(7228, 'Restore Contents'));
 registerAction2(class extends Action2 {
     constructor() {
         super({
@@ -195,7 +195,7 @@ registerAction2(class extends Action2 {
         return restore(accessor, item);
     }
 });
-const restoreSaveSource = SaveSourceRegistry.registerSource('localHistoryRestore.source', ( localize(7131, "File Restored")));
+const restoreSaveSource = SaveSourceRegistry.registerSource('localHistoryRestore.source', ( localize(7229, "File Restored")));
 async function restore(accessor, item) {
     const fileService = accessor.get(IFileService);
     const dialogService = accessor.get(IDialogService);
@@ -207,12 +207,12 @@ async function restore(accessor, item) {
         const { confirmed } = await dialogService.confirm({
             type: 'warning',
             message: ( localize(
-                7132,
+                7230,
                 "Do you want to restore the contents of '{0}'?",
                 basename(entry.workingCopy.resource)
             )),
-            detail: ( localize(7133, "Restoring will discard any unsaved changes.")),
-            primaryButton: ( localize(7134, "&&Restore"))
+            detail: ( localize(7231, "Restoring will discard any unsaved changes.")),
+            primaryButton: ( localize(7232, "&&Restore"))
         });
         if (!confirmed) {
             return;
@@ -229,7 +229,7 @@ async function restore(accessor, item) {
             await fileService.cloneFile(entry.location, entry.workingCopy.resource);
         }
         catch (error) {
-            await dialogService.error(( localize(7135, "Unable to restore '{0}'.", basename(entry.workingCopy.resource))), toErrorMessage(error));
+            await dialogService.error(( localize(7233, "Unable to restore '{0}'.", basename(entry.workingCopy.resource))), toErrorMessage(error));
             return;
         }
         if (workingCopies) {
@@ -249,7 +249,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.localHistory.restoreViaPicker',
-            title: ( localize2(7136, 'Find Entry to Restore')),
+            title: ( localize2(7234, 'Find Entry to Restore')),
             f1: true,
             category: LOCAL_HISTORY_CATEGORY,
             precondition: CTX_LOCAL_HISTORY_ENABLED
@@ -282,7 +282,7 @@ registerAction2(class extends Action2 {
         }
         resourcesSortedByRecency.push(...[...resources].sort((r1, r2) => r1.fsPath < r2.fsPath ? -1 : 1));
         resourcePicker.busy = false;
-        resourcePicker.placeholder = ( localize(7137, "Select the file to show local history for"));
+        resourcePicker.placeholder = ( localize(7235, "Select the file to show local history for"));
         resourcePicker.matchOnLabel = true;
         resourcePicker.matchOnDescription = true;
         resourcePicker.items = ( [...resourcesSortedByRecency].map(resource => ({
@@ -306,7 +306,7 @@ registerAction2(class extends Action2 {
         const entries = await workingCopyHistoryService.getEntries(resource, cts.token);
         entryPicker.busy = false;
         entryPicker.canAcceptInBackground = true;
-        entryPicker.placeholder = ( localize(7138, "Select the local history entry to open"));
+        entryPicker.placeholder = ( localize(7236, "Select the local history entry to open"));
         entryPicker.matchOnLabel = true;
         entryPicker.matchOnDescription = true;
         entryPicker.items = ( Array.from(entries).reverse().map(entry => ({
@@ -330,12 +330,12 @@ registerAction2(class extends Action2 {
         }));
     }
 });
-MenuRegistry.appendMenuItem(MenuId.TimelineTitle, { command: { id: 'workbench.action.localHistory.restoreViaPicker', title: ( localize2(7139, 'Local History: Find Entry to Restore...')) }, group: 'submenu', order: 1, when: CTX_LOCAL_HISTORY_ENABLED });
+MenuRegistry.appendMenuItem(MenuId.TimelineTitle, { command: { id: 'workbench.action.localHistory.restoreViaPicker', title: ( localize2(7237, '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: ( localize2(7140, 'Rename')),
+            title: ( localize2(7238, 'Rename')),
             menu: {
                 id: MenuId.TimelineItemContext,
                 group: '5_edit',
@@ -351,9 +351,9 @@ registerAction2(class extends Action2 {
         if (entry) {
             const disposables = ( new DisposableStore());
             const inputBox = disposables.add(quickInputService.createInputBox());
-            inputBox.title = ( localize(7141, "Rename Local History Entry"));
+            inputBox.title = ( localize(7239, "Rename Local History Entry"));
             inputBox.ignoreFocusOut = true;
-            inputBox.placeholder = ( localize(7142, "Enter the new name of the local history entry"));
+            inputBox.placeholder = ( localize(7240, "Enter the new name of the local history entry"));
             inputBox.value = SaveSourceRegistry.getSourceLabel(entry.source);
             inputBox.show();
             disposables.add(inputBox.onDidAccept(() => {
@@ -369,7 +369,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.localHistory.delete',
-            title: ( localize2(7143, 'Delete')),
+            title: ( localize2(7241, 'Delete')),
             menu: {
                 id: MenuId.TimelineItemContext,
                 group: '5_edit',
@@ -387,13 +387,13 @@ registerAction2(class extends Action2 {
             const { confirmed } = await dialogService.confirm({
                 type: 'warning',
                 message: ( localize(
-                    7144,
+                    7242,
                     "Do you want to delete the local history entry of '{0}' from {1}?",
                     entry.workingCopy.name,
                     toLocalHistoryEntryDateLabel(entry.timestamp)
                 )),
-                detail: ( localize(7145, "This action is irreversible!")),
-                primaryButton: ( localize(7146, "&&Delete")),
+                detail: ( localize(7243, "This action is irreversible!")),
+                primaryButton: ( localize(7244, "&&Delete")),
             });
             if (!confirmed) {
                 return;
@@ -407,7 +407,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.localHistory.deleteAll',
-            title: ( localize2(7147, 'Delete All')),
+            title: ( localize2(7245, 'Delete All')),
             f1: true,
             category: LOCAL_HISTORY_CATEGORY,
             precondition: CTX_LOCAL_HISTORY_ENABLED
@@ -418,9 +418,9 @@ registerAction2(class extends Action2 {
         const workingCopyHistoryService = accessor.get(IWorkingCopyHistoryService);
         const { confirmed } = await dialogService.confirm({
             type: 'warning',
-            message: ( localize(7148, "Do you want to delete all entries of all files in local history?")),
-            detail: ( localize(7149, "This action is irreversible!")),
-            primaryButton: ( localize(7150, "&&Delete All")),
+            message: ( localize(7246, "Do you want to delete all entries of all files in local history?")),
+            detail: ( localize(7247, "This action is irreversible!")),
+            primaryButton: ( localize(7248, "&&Delete All")),
         });
         if (!confirmed) {
             return;
@@ -432,7 +432,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.localHistory.create',
-            title: ( localize2(7151, 'Create Entry')),
+            title: ( localize2(7249, 'Create Entry')),
             f1: true,
             category: LOCAL_HISTORY_CATEGORY,
             precondition: ( ContextKeyExpr.and(CTX_LOCAL_HISTORY_ENABLED, ActiveEditorContext))
@@ -450,10 +450,10 @@ registerAction2(class extends Action2 {
         }
         const disposables = ( new DisposableStore());
         const inputBox = disposables.add(quickInputService.createInputBox());
-        inputBox.title = ( localize(7152, "Create Local History Entry"));
+        inputBox.title = ( localize(7250, "Create Local History Entry"));
         inputBox.ignoreFocusOut = true;
         inputBox.placeholder = ( localize(
-            7153,
+            7251,
             "Enter the new name of the local history entry for '{0}'",
             labelService.getUriBasenameLabel(resource)
         ));
@@ -472,7 +472,7 @@ async function openEntry(entry, editorService, options) {
     await editorService.openEditor({
         resource,
         label: ( localize(
-            7154,
+            7252,
             "{0} ({1} • {2})",
             entry.workingCopy.name,
             SaveSourceRegistry.getSourceLabel(entry.source),
@@ -494,7 +494,7 @@ function toDiffEditorArguments(arg1, arg2, options) {
         const resource = arg2;
         modifiedResource = resource;
         label = ( localize(
-            7155,
+            7253,
             "{0} ({1} • {2}) ↔ {3}",
             arg1.workingCopy.name,
             SaveSourceRegistry.getSourceLabel(arg1.source),
@@ -506,7 +506,7 @@ function toDiffEditorArguments(arg1, arg2, options) {
         const modified = arg2;
         modifiedResource = LocalHistoryFileSystemProvider.toLocalHistoryFileSystem({ location: modified.location, associatedResource: modified.workingCopy.resource });
         label = ( localize(
-            7156,
+            7254,
             "{0} ({1} • {2}) ↔ {3} ({4} • {5})",
             arg1.workingCopy.name,
             SaveSourceRegistry.getSourceLabel(arg1.source),

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

@@ -7,7 +7,7 @@ import { ITimelineService } from '@codingame/monaco-vscode-api/vscode/vs/workben
 import { IWorkingCopyHistoryService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/workingCopy/common/workingCopyHistory.service';
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { IPathService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/path/common/pathService.service';
-import { API_OPEN_DIFF_EDITOR_COMMAND_ID } from '@codingame/monaco-vscode-f48982c4-9e82-55e2-b800-20e6d1e6096f-common/vscode/vs/workbench/browser/parts/editor/editorCommands';
+import { API_OPEN_DIFF_EDITOR_COMMAND_ID } from '@codingame/monaco-vscode-38f25ab8-ea30-5ba9-8a08-ae3308c297c0-common/vscode/vs/workbench/browser/parts/editor/editorCommands';
 import { IFileService } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service';
 import { LocalHistoryFileSystemProvider } from './localHistoryFileSystemProvider.js';
 import { IWorkbenchEnvironmentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/environment/common/environmentService.service';
@@ -18,7 +18,7 @@ import { MarkdownString } from '@codingame/monaco-vscode-api/vscode/vs/base/comm
 import { LOCAL_HISTORY_MENU_CONTEXT_VALUE, LOCAL_HISTORY_ICON_ENTRY, getLocalHistoryDateFormatter } from './localHistory.js';
 import { Schemas } from '@codingame/monaco-vscode-api/vscode/vs/base/common/network';
 import { IWorkspaceContextService } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service';
-import { getVirtualWorkspaceAuthority } from '@codingame/monaco-vscode-2cbab29e-9393-5de6-b701-9a9555360b6b-common/vscode/vs/platform/workspace/common/virtualWorkspace';
+import { getVirtualWorkspaceAuthority } from '@codingame/monaco-vscode-7559b0be-bfa5-5fe6-b731-1973fe9fffa1-common/vscode/vs/platform/workspace/common/virtualWorkspace';
 
 var LocalHistoryTimeline_1;
 let LocalHistoryTimeline = class LocalHistoryTimeline extends Disposable {
@@ -35,7 +35,7 @@ let LocalHistoryTimeline = class LocalHistoryTimeline extends Disposable {
         this.configurationService = configurationService;
         this.contextService = contextService;
         this.id = 'timeline.localHistory';
-        this.label = ( localize(7157, "Local History"));
+        this.label = ( localize(7255, "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

@@ -13,13 +13,13 @@ import { Extensions } from '@codingame/monaco-vscode-api/vscode/vs/platform/conf
 import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
 import { MenuRegistry, MenuId } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
 import { CommandsRegistry } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands';
-import { ExplorerFolderContext } from '@codingame/monaco-vscode-eea37658-2307-56a5-8ed0-b2752c7b7a50-common/vscode/vs/workbench/contrib/files/common/files';
+import { ExplorerFolderContext } from '@codingame/monaco-vscode-a4c2011e-8775-52bd-abf0-4a3c07a9696b-common/vscode/vs/workbench/contrib/files/common/files';
 import { ResourceContextKey } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contextkeys';
 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';
 
-const timelineViewIcon = registerIcon('timeline-view-icon', Codicon.history, ( localize(10582, 'View icon of the timeline view.')));
-const timelineOpenIcon = registerIcon('timeline-open', Codicon.history, ( localize(10583, 'Icon for the open timeline action.')));
+const timelineViewIcon = registerIcon('timeline-view-icon', Codicon.history, ( localize(10704, 'View icon of the timeline view.')));
+const timelineOpenIcon = registerIcon('timeline-open', Codicon.history, ( localize(10705, 'Icon for the open timeline action.')));
 class TimelinePaneDescriptor {
     constructor() {
         this.id = TimelinePaneId;
@@ -40,14 +40,14 @@ const configurationRegistry = ( Registry.as(Extensions.Configuration));
 configurationRegistry.registerConfiguration({
     id: 'timeline',
     order: 1001,
-    title: ( localize(10584, "Timeline")),
+    title: ( localize(10706, "Timeline")),
     type: 'object',
     properties: {
         'timeline.pageSize': {
             type: ['number', 'null'],
             default: 50,
             markdownDescription: ( localize(
-                10585,
+                10707,
                 "The number of items to show in the Timeline view by default and when loading more items. Setting to `null` will automatically choose a page size based on the visible area of the Timeline view."
             )),
         },
@@ -55,7 +55,7 @@ configurationRegistry.registerConfiguration({
             type: 'boolean',
             default: true,
             description: ( localize(
-                10586,
+                10708,
                 "Controls whether the Timeline view will load the next page of items when you scroll to the end of the list."
             )),
         },
@@ -65,7 +65,7 @@ configurationRegistry.registerConfiguration({
 var OpenTimelineAction;
 (function (OpenTimelineAction) {
     OpenTimelineAction.ID = 'files.openTimeline';
-    OpenTimelineAction.LABEL = ( localize(10587, "Open Timeline"));
+    OpenTimelineAction.LABEL = ( localize(10709, "Open Timeline"));
     function handler() {
         return (accessor, arg) => {
             const service = accessor.get(ITimelineService);
@@ -85,10 +85,10 @@ MenuRegistry.appendMenuItem(MenuId.ExplorerContext, ({
     },
     when: ( ContextKeyExpr.and(( ExplorerFolderContext.toNegated()), ResourceContextKey.HasResource, TimelineHasProviderContext))
 }));
-const timelineFilter = registerIcon('timeline-filter', Codicon.filter, ( localize(10588, 'Icon for the filter timeline action.')));
+const timelineFilter = registerIcon('timeline-filter', Codicon.filter, ( localize(10710, 'Icon for the filter timeline action.')));
 MenuRegistry.appendMenuItem(MenuId.TimelineTitle, {
     submenu: MenuId.TimelineFilterSubMenu,
-    title: ( localize(10589, "Filter Timeline")),
+    title: ( localize(10711, "Filter Timeline")),
     group: 'navigation',
     order: 100,
     icon: timelineFilter

package/vscode/src/vs/workbench/contrib/timeline/browser/timelinePane.d.ts

@@ -17,7 +17,6 @@ import { ThemeIcon } from "@codingame/monaco-vscode-api/vscode/vs/base/common/th
 import { IViewDescriptorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/views.service";
 import { IProgressService } from "@codingame/monaco-vscode-api/vscode/vs/platform/progress/common/progress.service";
 import { IOpenerService } from "@codingame/monaco-vscode-api/vscode/vs/platform/opener/common/opener.service";
-import { ITelemetryService } from "@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service";
 import { IUriIdentityService } from "@codingame/monaco-vscode-api/vscode/vs/platform/uriIdentity/common/uriIdentity.service";
 import { IExtensionService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service";
 import { IStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service";
@@ -71,7 +70,7 @@ export declare class TimelinePane extends ViewPane {
     private pendingRequests;
     private timelinesBySource;
     private uri;
-    constructor(options: IViewPaneOptions, keybindingService: IKeybindingService, contextMenuService: IContextMenuService, contextKeyService: IContextKeyService, configurationService: IConfigurationService, storageService: IStorageService, viewDescriptorService: IViewDescriptorService, instantiationService: IInstantiationService, editorService: IEditorService, commandService: ICommandService, progressService: IProgressService, timelineService: ITimelineService, openerService: IOpenerService, themeService: IThemeService, telemetryService: ITelemetryService, hoverService: IHoverService, labelService: ILabelService, uriIdentityService: IUriIdentityService, extensionService: IExtensionService);
+    constructor(options: IViewPaneOptions, keybindingService: IKeybindingService, contextMenuService: IContextMenuService, contextKeyService: IContextKeyService, configurationService: IConfigurationService, storageService: IStorageService, viewDescriptorService: IViewDescriptorService, instantiationService: IInstantiationService, editorService: IEditorService, commandService: ICommandService, progressService: IProgressService, timelineService: ITimelineService, openerService: IOpenerService, themeService: IThemeService, hoverService: IHoverService, labelService: ILabelService, uriIdentityService: IUriIdentityService, extensionService: IExtensionService);
     private _followActiveEditor;
     get followActiveEditor(): boolean;
     set followActiveEditor(value: boolean);

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

@@ -39,12 +39,11 @@ import { ActionBar } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/u
 import { createActionViewItem, getContextMenuActions } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/browser/menuEntryActionViewItem';
 import { MenuId, registerAction2, Action2, MenuRegistry } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
 import { IMenuService } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions.service';
-import { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service';
 import { ActionViewItem } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/actionbar/actionViewItems';
 import { ColorScheme } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/theme';
 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 { API_OPEN_EDITOR_COMMAND_ID, API_OPEN_DIFF_EDITOR_COMMAND_ID } from '@codingame/monaco-vscode-f48982c4-9e82-55e2-b800-20e6d1e6096f-common/vscode/vs/workbench/browser/parts/editor/editorCommands';
+import { API_OPEN_EDITOR_COMMAND_ID, API_OPEN_DIFF_EDITOR_COMMAND_ID } from '@codingame/monaco-vscode-38f25ab8-ea30-5ba9-8a08-ae3308c297c0-common/vscode/vs/workbench/browser/parts/editor/editorCommands';
 import { MarshalledId } from '@codingame/monaco-vscode-api/vscode/vs/base/common/marshallingIds';
 import { isString } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
 import { renderMarkdownAsPlaintext } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/markdownRenderer';
@@ -178,7 +177,7 @@ class LoadMoreCommand {
         return this.label;
     }
     get label() {
-        return this.loading ? ( localize(10590, "Loading...")) : ( localize(10591, "Load more"));
+        return this.loading ? ( localize(10712, "Loading...")) : ( localize(10713, "Load more"));
     }
     get themeIcon() {
         return undefined;
@@ -188,9 +187,9 @@ const TimelineFollowActiveEditorContext = ( new RawContextKey('timelineFollowAct
 const TimelineExcludeSources = ( new RawContextKey('timelineExcludeSources', '[]', true));
 const TimelineViewFocusedContext = ( new RawContextKey('timelineFocused', true));
 let TimelinePane = class TimelinePane extends ViewPane {
-    static { this.TITLE = ( localize2(10592, "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);
+    static { this.TITLE = ( localize2(10714, "Timeline")); }
+    constructor(options, keybindingService, contextMenuService, contextKeyService, configurationService, storageService, viewDescriptorService, instantiationService, editorService, commandService, progressService, timelineService, openerService, themeService, hoverService, labelService, uriIdentityService, extensionService) {
+        super({ ...options, titleMenuId: MenuId.TimelineTitle }, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, hoverService);
         this.storageService = storageService;
         this.editorService = editorService;
         this.commandService = commandService;
@@ -376,8 +375,9 @@ let TimelinePane = class TimelinePane extends ViewPane {
         this._maxItemCount = this.pageSize;
         this.timelinesBySource.clear();
         if (cancelPending) {
-            for (const { tokenSource } of ( this.pendingRequests.values())) {
-                tokenSource.dispose(true);
+            for (const pendingRequest of ( this.pendingRequests.values())) {
+                pendingRequest.request.tokenSource.cancel();
+                pendingRequest.dispose();
             }
             this.pendingRequests.clear();
             if (!this.isBodyVisible() && this.tree) {
@@ -443,28 +443,33 @@ let TimelinePane = class TimelinePane extends ViewPane {
             }
             options = { cursor: reset ? undefined : timeline?.cursor, limit: this.pageSize };
         }
-        let request = this.pendingRequests.get(source);
-        if (request !== undefined) {
-            options.cursor = request.options.cursor;
+        const pendingRequest = this.pendingRequests.get(source);
+        if (pendingRequest !== undefined) {
+            options.cursor = pendingRequest.request.options.cursor;
             if (typeof options.limit === 'number') {
-                if (typeof request.options.limit === 'number') {
-                    options.limit += request.options.limit;
+                if (typeof pendingRequest.request.options.limit === 'number') {
+                    options.limit += pendingRequest.request.options.limit;
                 }
                 else {
-                    options.limit = request.options.limit;
+                    options.limit = pendingRequest.request.options.limit;
                 }
             }
         }
-        request?.tokenSource.dispose(true);
+        pendingRequest?.request?.tokenSource.cancel();
+        pendingRequest?.dispose();
         options.cacheResults = true;
         options.resetCache = reset;
-        request = this.timelineService.getTimeline(source, uri, options, ( new CancellationTokenSource()));
-        if (request === undefined) {
+        const tokenSource = ( new CancellationTokenSource());
+        const newRequest = this.timelineService.getTimeline(source, uri, options, tokenSource);
+        if (newRequest === undefined) {
+            tokenSource.dispose();
             return false;
         }
-        this.pendingRequests.set(source, request);
-        request.tokenSource.token.onCancellationRequested(() => this.pendingRequests.delete(source));
-        this.handleRequest(request);
+        const disposables = ( new DisposableStore());
+        this.pendingRequests.set(source, { request: newRequest, dispose: () => disposables.dispose() });
+        disposables.add(tokenSource);
+        disposables.add(tokenSource.token.onCancellationRequested(() => this.pendingRequests.delete(source)));
+        this.handleRequest(newRequest);
         return true;
     }
     updateTimeline(timeline, reset) {
@@ -484,6 +489,7 @@ let TimelinePane = class TimelinePane extends ViewPane {
             response = await this.progressService.withProgress({ location: this.id }, () => request.result);
         }
         finally {
+            this.pendingRequests.get(request.source)?.dispose();
             this.pendingRequests.delete(request.source);
         }
         if (response === undefined ||
@@ -624,7 +630,7 @@ let TimelinePane = class TimelinePane extends ViewPane {
         this._isEmpty = !this.hasVisibleItems;
         if (this.uri === undefined) {
             this.updateFilename(undefined);
-            this.message = ( localize(10593, "The active editor cannot provide timeline information."));
+            this.message = ( localize(10715, "The active editor cannot provide timeline information."));
         }
         else if (this._isEmpty) {
             if (this.pendingRequests.size !== 0) {
@@ -634,24 +640,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 = ( localize(10594, "All timeline sources have been filtered out."));
+                    this.message = ( localize(10716, "All timeline sources have been filtered out."));
                 }
                 else {
                     if (this.configurationService.getValue('workbench.localHistory.enabled') && !( this.excludedSources.has('timeline.localHistory'))) {
                         this.message = ( localize(
-                            10595,
+                            10717,
                             "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 = ( localize(10596, "No filtered timeline information was provided."));
+                        this.message = ( localize(10718, "No filtered timeline information was provided."));
                     }
                     else {
-                        this.message = ( localize(10597, "No timeline information was provided."));
+                        this.message = ( localize(10719, "No timeline information was provided."));
                     }
                 }
                 if (!scmProviderCount || scmProviderCount === 0) {
-                    this.message += ' ' + ( localize(10598, "Source Control has not been configured."));
+                    this.message += ' ' + ( localize(10720, "Source Control has not been configured."));
                 }
             }
         }
@@ -708,16 +714,16 @@ 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 = ( localize(10593, "The active editor cannot provide timeline information."));
+        this.message = ( localize(10715, "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);
         this.treeRenderer = this.instantiationService.createInstance(TimelineTreeRenderer, this.commands);
-        this.treeRenderer.onDidScrollToEnd(item => {
+        this._register(this.treeRenderer.onDidScrollToEnd(item => {
             if (this.pageOnScroll) {
                 this.loadMore(item);
             }
-        });
+        }));
         this.tree = this.instantiationService.createInstance((WorkbenchObjectTree), 'TimelinePane', this.$tree, ( new TimelineListVirtualDelegate()), [this.treeRenderer], {
             identityProvider: ( new TimelineIdentityProvider()),
             accessibilityProvider: {
@@ -725,7 +731,7 @@ let TimelinePane = class TimelinePane extends ViewPane {
                     if (isLoadMoreCommand(element)) {
                         return element.ariaLabel;
                     }
-                    return element.accessibilityInformation ? element.accessibilityInformation.label : ( localize(10599, "{0}: {1}", element.relativeTimeFullWord ?? '', element.label));
+                    return element.accessibilityInformation ? element.accessibilityInformation.label : ( localize(10721, "{0}: {1}", element.relativeTimeFullWord ?? '', element.label));
                 },
                 getRole(element) {
                     if (isLoadMoreCommand(element)) {
@@ -734,7 +740,7 @@ let TimelinePane = class TimelinePane extends ViewPane {
                     return element.accessibilityInformation && element.accessibilityInformation.role ? element.accessibilityInformation.role : 'treeitem';
                 },
                 getWidgetAriaLabel() {
-                    return localize(10592, "Timeline");
+                    return localize(10714, "Timeline");
                 }
             },
             keyboardNavigationLabelProvider: ( new TimelineKeyboardNavigationLabelProvider()),
@@ -794,7 +800,7 @@ let TimelinePane = class TimelinePane extends ViewPane {
     setLoadingUriMessage() {
         const file = this.uri && this.labelService.getUriBasenameLabel(this.uri);
         this.updateFilename(file);
-        this.message = file ? ( localize(10600, "Loading timeline for {0}...", file)) : '';
+        this.message = file ? ( localize(10722, "Loading timeline for {0}...", file)) : '';
     }
     onContextMenu(commands, treeEvent) {
         const item = treeEvent.element;
@@ -849,11 +855,10 @@ TimelinePane = ( __decorate([
     ( __param(11, ITimelineService)),
     ( __param(12, IOpenerService)),
     ( __param(13, IThemeService)),
-    ( __param(14, ITelemetryService)),
-    ( __param(15, IHoverService)),
-    ( __param(16, ILabelService)),
-    ( __param(17, IUriIdentityService)),
-    ( __param(18, IExtensionService))
+    ( __param(14, IHoverService)),
+    ( __param(15, ILabelService)),
+    ( __param(16, IUriIdentityService)),
+    ( __param(17, IExtensionService))
 ], TimelinePane));
 class TimelineElementTemplate {
     static { this.id = 'TimelineElementTemplate'; }
@@ -917,7 +922,7 @@ let TimelineTreeRenderer = class TimelineTreeRenderer {
         this.onDidScrollToEnd = this._onDidScrollToEnd.event;
         this.templateId = TimelineElementTemplate.id;
         this.actionViewItemProvider = createActionViewItem.bind(undefined, this.instantiationService);
-        this._hoverDelegate = this.instantiationService.createInstance(WorkbenchHoverDelegate, 'element', true, {
+        this._hoverDelegate = this.instantiationService.createInstance(WorkbenchHoverDelegate, 'element', { instantHover: true }, {
             position: {
                 hoverPosition: HoverPosition.RIGHT
             }
@@ -974,6 +979,9 @@ let TimelineTreeRenderer = class TimelineTreeRenderer {
             setTimeout(() => this._onDidScrollToEnd.fire(item), 0);
         }
     }
+    disposeElement(element, index, templateData, height) {
+        templateData.actionBar.actionRunner.dispose();
+    }
     disposeTemplate(template) {
         template.dispose();
     }
@@ -982,9 +990,9 @@ TimelineTreeRenderer = ( __decorate([
     ( __param(1, IInstantiationService)),
     ( __param(2, IThemeService))
 ], TimelineTreeRenderer));
-const timelineRefresh = registerIcon('timeline-refresh', Codicon.refresh, ( localize(10601, 'Icon for the refresh timeline action.')));
-const timelinePin = registerIcon('timeline-pin', Codicon.pin, ( localize(10602, 'Icon for the pin timeline action.')));
-const timelineUnpin = registerIcon('timeline-unpin', Codicon.pinned, ( localize(10603, 'Icon for the unpin timeline action.')));
+const timelineRefresh = registerIcon('timeline-refresh', Codicon.refresh, ( localize(10723, 'Icon for the refresh timeline action.')));
+const timelinePin = registerIcon('timeline-pin', Codicon.pin, ( localize(10724, 'Icon for the pin timeline action.')));
+const timelineUnpin = registerIcon('timeline-unpin', Codicon.pinned, ( localize(10725, 'Icon for the unpin timeline action.')));
 let TimelinePaneCommands = class TimelinePaneCommands extends Disposable {
     constructor(pane, timelineService, storageService, contextKeyService, menuService) {
         super();
@@ -998,9 +1006,9 @@ let TimelinePaneCommands = class TimelinePaneCommands extends Disposable {
             constructor() {
                 super({
                     id: 'timeline.refresh',
-                    title: ( localize2(10604, "Refresh")),
+                    title: ( localize2(10726, "Refresh")),
                     icon: timelineRefresh,
-                    category: ( localize2(10592, "Timeline")),
+                    category: ( localize2(10714, "Timeline")),
                     menu: {
                         id: MenuId.TimelineTitle,
                         group: 'navigation',
@@ -1016,9 +1024,9 @@ let TimelinePaneCommands = class TimelinePaneCommands extends Disposable {
         this._register(MenuRegistry.appendMenuItem(MenuId.TimelineTitle, ({
             command: {
                 id: 'timeline.toggleFollowActiveEditor',
-                title: ( localize2(10605, 'Pin the Current Timeline')),
+                title: ( localize2(10727, 'Pin the Current Timeline')),
                 icon: timelinePin,
-                category: ( localize2(10592, "Timeline")),
+                category: ( localize2(10714, "Timeline")),
             },
             group: 'navigation',
             order: 98,
@@ -1027,9 +1035,9 @@ let TimelinePaneCommands = class TimelinePaneCommands extends Disposable {
         this._register(MenuRegistry.appendMenuItem(MenuId.TimelineTitle, ({
             command: {
                 id: 'timeline.toggleFollowActiveEditor',
-                title: ( localize2(10606, 'Unpin the Current Timeline')),
+                title: ( localize2(10728, 'Unpin the Current Timeline')),
                 icon: timelineUnpin,
-                category: ( localize2(10592, "Timeline")),
+                category: ( localize2(10714, "Timeline")),
             },
             group: 'navigation',
             order: 98,

package/vscode/src/vs/workbench/contrib/timeline/common/timelineService.d.ts

@@ -1,6 +1,5 @@
 import { CancellationTokenSource } from "@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation";
-import { Event } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event";
-import { IDisposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+import { Disposable, IDisposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
 import { TimelineChangeEvent, TimelineOptions, TimelineProvidersChangeEvent, TimelineProvider } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/timeline/common/timeline";
@@ -10,18 +9,18 @@ import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/pl
 import { RawContextKey } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey";
 import { IContextKeyService } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service";
 export declare const TimelineHasProviderContext: RawContextKey<boolean>;
-export declare class TimelineService implements ITimelineService {
+export declare class TimelineService extends Disposable implements ITimelineService {
     private readonly logService;
     protected viewsService: IViewsService;
     protected configurationService: IConfigurationService;
     protected contextKeyService: IContextKeyService;
     readonly _serviceBrand: undefined;
     private readonly _onDidChangeProviders;
-    readonly onDidChangeProviders: Event<TimelineProvidersChangeEvent>;
+    readonly onDidChangeProviders: import("@codingame/monaco-vscode-api/vscode/vs/base/common/event").Event<TimelineProvidersChangeEvent>;
     private readonly _onDidChangeTimeline;
-    readonly onDidChangeTimeline: Event<TimelineChangeEvent>;
+    readonly onDidChangeTimeline: import("@codingame/monaco-vscode-api/vscode/vs/base/common/event").Event<TimelineChangeEvent>;
     private readonly _onDidChangeUri;
-    readonly onDidChangeUri: Event<URI>;
+    readonly onDidChangeUri: import("@codingame/monaco-vscode-api/vscode/vs/base/common/event").Event<URI>;
     private readonly hasProviderContext;
     private readonly providers;
     private readonly providerSubscriptions;

package/vscode/src/vs/workbench/contrib/timeline/common/timelineService.js

@@ -1,6 +1,7 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
+import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
 import { TimelinePaneId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/timeline/common/timeline';
 import { IViewsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/views/common/viewsService.service';
@@ -9,17 +10,18 @@ import { RawContextKey } from '@codingame/monaco-vscode-api/vscode/vs/platform/c
 import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
 
 const TimelineHasProviderContext = ( new RawContextKey('timelineHasProvider', false));
-let TimelineService = class TimelineService {
+let TimelineService = class TimelineService extends Disposable {
     constructor(logService, viewsService, configurationService, contextKeyService) {
+        super();
         this.logService = logService;
         this.viewsService = viewsService;
         this.configurationService = configurationService;
         this.contextKeyService = contextKeyService;
-        this._onDidChangeProviders = ( new Emitter());
+        this._onDidChangeProviders = this._register(( new Emitter()));
         this.onDidChangeProviders = this._onDidChangeProviders.event;
-        this._onDidChangeTimeline = ( new Emitter());
+        this._onDidChangeTimeline = this._register(( new Emitter()));
         this.onDidChangeTimeline = this._onDidChangeTimeline.event;
-        this._onDidChangeUri = ( new Emitter());
+        this._onDidChangeUri = this._register(( new Emitter()));
         this.onDidChangeUri = this._onDidChangeUri.event;
         this.providers = ( new Map());
         this.providerSubscriptions = ( new Map());
@@ -53,10 +55,10 @@ let TimelineService = class TimelineService {
                 result.items.sort((a, b) => (b.timestamp - a.timestamp) || b.source.localeCompare(a.source, undefined, { numeric: true, sensitivity: 'base' }));
                 return result;
             }),
-            options: options,
+            options,
             source: provider.id,
-            tokenSource: tokenSource,
-            uri: uri
+            tokenSource,
+            uri
         };
     }
     registerTimelineProvider(provider) {
@@ -88,6 +90,7 @@ let TimelineService = class TimelineService {
             return;
         }
         this.providers.delete(id);
+        this.providerSubscriptions.get(id)?.dispose();
         this.providerSubscriptions.delete(id);
         this.updateHasProviderContext();
         this._onDidChangeProviders.fire({ removed: [id] });