@codingame/monaco-vscode-timeline-service-override 15.0.2 → 16.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-timeline-service-override",
-  "version": "15.0.2",
+  "version": "16.0.0",
   "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-38f25ab8-ea30-5ba9-8a08-ae3308c297c0-common": "15.0.2",
-    "@codingame/monaco-vscode-65619f8f-0eab-5d8b-855a-43b6353fe527-common": "15.0.2",
-    "@codingame/monaco-vscode-7559b0be-bfa5-5fe6-b731-1973fe9fffa1-common": "15.0.2",
-    "@codingame/monaco-vscode-a4c2011e-8775-52bd-abf0-4a3c07a9696b-common": "15.0.2",
-    "@codingame/monaco-vscode-api": "15.0.2",
-    "@codingame/monaco-vscode-b71b5434-ce96-5581-8993-e8da380bd63f-common": "15.0.2"
+    "@codingame/monaco-vscode-38f25ab8-ea30-5ba9-8a08-ae3308c297c0-common": "16.0.0",
+    "@codingame/monaco-vscode-65619f8f-0eab-5d8b-855a-43b6353fe527-common": "16.0.0",
+    "@codingame/monaco-vscode-68b3311c-eb96-5711-8f72-f5f4b2e31932-common": "16.0.0",
+    "@codingame/monaco-vscode-7559b0be-bfa5-5fe6-b731-1973fe9fffa1-common": "16.0.0",
+    "@codingame/monaco-vscode-api": "16.0.0",
+    "@codingame/monaco-vscode-b71b5434-ce96-5581-8993-e8da380bd63f-common": "16.0.0"
   },
   "main": "index.js",
   "module": "index.js",
@@ -29,6 +29,9 @@
     ".": {
       "default": "./index.js"
     },
+    "./vscode/*.css": {
+      "default": "./vscode/src/*.css"
+    },
     "./vscode/*": {
       "types": "./vscode/src/*.d.ts",
       "default": "./vscode/src/*.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(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.")));
+const LOCAL_HISTORY_ICON_ENTRY = registerIcon('localHistory-icon', Codicon.circleOutline, ( localize(7368, "Icon for a local history entry in the timeline view.")));
+const LOCAL_HISTORY_ICON_RESTORE = registerIcon('localHistory-restore', Codicon.check, ( localize(7369, "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

@@ -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(7222, 'Local History'));
+const LOCAL_HISTORY_CATEGORY = ( localize2(7370, 'Local History'));
 const CTX_LOCAL_HISTORY_ENABLED = ( ContextKeyExpr.has('config.workbench.localHistory.enabled'));
-const COMPARE_WITH_FILE_LABEL = ( localize2(7223, 'Compare with File'));
+const COMPARE_WITH_FILE_LABEL = ( localize2(7371, '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(7224, 'Compare with Previous')),
+            title: ( localize2(7372, '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(7225, 'Select for Compare')),
+            title: ( localize2(7373, '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(7226, 'Compare with Selected')),
+            title: ( localize2(7374, '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(7227, 'Show Contents')),
+            title: ( localize2(7375, 'Show Contents')),
             menu: {
                 id: MenuId.TimelineItemContext,
                 group: '3_contents',
@@ -158,7 +158,7 @@ registerAction2(class extends Action2 {
         }
     }
 });
-const RESTORE_CONTENTS_LABEL = ( localize2(7228, 'Restore Contents'));
+const RESTORE_CONTENTS_LABEL = ( localize2(7376, '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(7229, "File Restored")));
+const restoreSaveSource = SaveSourceRegistry.registerSource('localHistoryRestore.source', ( localize(7377, "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(
-                7230,
+                7378,
                 "Do you want to restore the contents of '{0}'?",
                 basename(entry.workingCopy.resource)
             )),
-            detail: ( localize(7231, "Restoring will discard any unsaved changes.")),
-            primaryButton: ( localize(7232, "&&Restore"))
+            detail: ( localize(7379, "Restoring will discard any unsaved changes.")),
+            primaryButton: ( localize(7380, "&&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(7233, "Unable to restore '{0}'.", basename(entry.workingCopy.resource))), toErrorMessage(error));
+            await dialogService.error(( localize(7381, "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(7234, 'Find Entry to Restore')),
+            title: ( localize2(7382, '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(7235, "Select the file to show local history for"));
+        resourcePicker.placeholder = ( localize(7383, "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(7236, "Select the local history entry to open"));
+        entryPicker.placeholder = ( localize(7384, "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(7237, '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(7385, '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(7238, 'Rename')),
+            title: ( localize2(7386, '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(7239, "Rename Local History Entry"));
+            inputBox.title = ( localize(7387, "Rename Local History Entry"));
             inputBox.ignoreFocusOut = true;
-            inputBox.placeholder = ( localize(7240, "Enter the new name of the local history entry"));
+            inputBox.placeholder = ( localize(7388, "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(7241, 'Delete')),
+            title: ( localize2(7389, '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(
-                    7242,
+                    7390,
                     "Do you want to delete the local history entry of '{0}' from {1}?",
                     entry.workingCopy.name,
                     toLocalHistoryEntryDateLabel(entry.timestamp)
                 )),
-                detail: ( localize(7243, "This action is irreversible!")),
-                primaryButton: ( localize(7244, "&&Delete")),
+                detail: ( localize(7391, "This action is irreversible!")),
+                primaryButton: ( localize(7392, "&&Delete")),
             });
             if (!confirmed) {
                 return;
@@ -407,7 +407,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.localHistory.deleteAll',
-            title: ( localize2(7245, 'Delete All')),
+            title: ( localize2(7393, '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(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")),
+            message: ( localize(7394, "Do you want to delete all entries of all files in local history?")),
+            detail: ( localize(7395, "This action is irreversible!")),
+            primaryButton: ( localize(7396, "&&Delete All")),
         });
         if (!confirmed) {
             return;
@@ -432,7 +432,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.localHistory.create',
-            title: ( localize2(7249, 'Create Entry')),
+            title: ( localize2(7397, '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(7250, "Create Local History Entry"));
+        inputBox.title = ( localize(7398, "Create Local History Entry"));
         inputBox.ignoreFocusOut = true;
         inputBox.placeholder = ( localize(
-            7251,
+            7399,
             "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(
-            7252,
+            7400,
             "{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(
-            7253,
+            7401,
             "{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(
-            7254,
+            7402,
             "{0} ({1} • {2}) ↔ {3} ({4} • {5})",
             arg1.workingCopy.name,
             SaveSourceRegistry.getSourceLabel(arg1.source),

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

@@ -35,7 +35,7 @@ let LocalHistoryTimeline = class LocalHistoryTimeline extends Disposable {
         this.configurationService = configurationService;
         this.contextService = contextService;
         this.id = 'timeline.localHistory';
-        this.label = ( localize(7255, "Local History"));
+        this.label = ( localize(7403, "Local History"));
         this.scheme = '*';
         this._onDidChange = this._register(( new Emitter()));
         this.onDidChange = this._onDidChange.event;

package/vscode/src/vs/workbench/contrib/timeline/browser/media/timelinePane.css

@@ -0,0 +1,50 @@
+.monaco-workbench .timeline-tree-view {
+	position: relative;
+}
+.monaco-workbench .timeline-tree-view .message.timeline-subtle {
+	opacity: 0.5;
+	padding: 10px 22px 0 22px;
+	position: absolute;
+	pointer-events: none;
+	z-index: 1;
+}
+.timeline-tree-view .monaco-list .monaco-list-row .custom-view-tree-node-item .monaco-icon-label {
+	flex: 1;
+	text-overflow: ellipsis;
+	overflow: hidden;
+}
+.timeline-tree-view .monaco-list .monaco-list-row .custom-view-tree-node-item .timeline-timestamp-container {
+	margin-left: 2px;
+	margin-right: 4px;
+	opacity: 0.5;
+	overflow: hidden;
+	text-overflow: ellipsis;
+}
+.timeline-tree-view .monaco-list .monaco-list-row .custom-view-tree-node-item .timeline-timestamp-container.timeline-timestamp--duplicate::before {
+	content: ' ';
+	position: absolute;
+	right: 10px;
+	border-right: 1px solid currentColor;
+	display: block;
+	height: 100%;
+	width: 1px;
+	opacity: 0.25;
+}
+.timeline-tree-view .monaco-list .monaco-list-row:hover .custom-view-tree-node-item .timeline-timestamp-container.timeline-timestamp--duplicate::before,
+.timeline-tree-view .monaco-list .monaco-list-row.selected .custom-view-tree-node-item .timeline-timestamp-container.timeline-timestamp--duplicate::before,
+.timeline-tree-view .monaco-list .monaco-list-row.focused .custom-view-tree-node-item .timeline-timestamp-container.timeline-timestamp--duplicate::before {
+	display: none;
+}
+.timeline-tree-view .monaco-list .monaco-list-row .custom-view-tree-node-item .timeline-timestamp-container .timeline-timestamp {
+	display: inline-block;
+}
+.timeline-tree-view .monaco-list .monaco-list-row .custom-view-tree-node-item .timeline-timestamp-container.timeline-timestamp--duplicate .timeline-timestamp {
+	visibility: hidden;
+	width: 10px;
+}
+.timeline-tree-view .monaco-list .monaco-list-row:hover .custom-view-tree-node-item .timeline-timestamp-container.timeline-timestamp--duplicate .timeline-timestamp,
+.timeline-tree-view .monaco-list .monaco-list-row.selected .custom-view-tree-node-item .timeline-timestamp-container.timeline-timestamp--duplicate .timeline-timestamp,
+.timeline-tree-view .monaco-list .monaco-list-row.focused .custom-view-tree-node-item .timeline-timestamp-container.timeline-timestamp--duplicate .timeline-timestamp {
+	visibility: visible !important;
+	width: initial;
+}

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-a4c2011e-8775-52bd-abf0-4a3c07a9696b-common/vscode/vs/workbench/contrib/files/common/files';
+import { ExplorerFolderContext } from '@codingame/monaco-vscode-68b3311c-eb96-5711-8f72-f5f4b2e31932-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(10704, 'View icon of the timeline view.')));
-const timelineOpenIcon = registerIcon('timeline-open', Codicon.history, ( localize(10705, 'Icon for the open timeline action.')));
+const timelineViewIcon = registerIcon('timeline-view-icon', Codicon.history, ( localize(11026, 'View icon of the timeline view.')));
+const timelineOpenIcon = registerIcon('timeline-open', Codicon.history, ( localize(11027, '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(10706, "Timeline")),
+    title: ( localize(11028, "Timeline")),
     type: 'object',
     properties: {
         'timeline.pageSize': {
             type: ['number', 'null'],
             default: 50,
             markdownDescription: ( localize(
-                10707,
+                11029,
                 "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(
-                10708,
+                11030,
                 "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(10709, "Open Timeline"));
+    OpenTimelineAction.LABEL = ( localize(11031, "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(10710, 'Icon for the filter timeline action.')));
+const timelineFilter = registerIcon('timeline-filter', Codicon.filter, ( localize(11032, 'Icon for the filter timeline action.')));
 MenuRegistry.appendMenuItem(MenuId.TimelineTitle, {
     submenu: MenuId.TimelineFilterSubMenu,
-    title: ( localize(10711, "Filter Timeline")),
+    title: ( localize(11033, "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 '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
-import './media/timelinePane.css.js';
+import './media/timelinePane.css';
 import { localize, localize2 } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { clearNode, append, $ } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
 import { asCSSUrl } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/cssValue';
@@ -177,7 +177,7 @@ class LoadMoreCommand {
         return this.label;
     }
     get label() {
-        return this.loading ? ( localize(10712, "Loading...")) : ( localize(10713, "Load more"));
+        return this.loading ? ( localize(11034, "Loading...")) : ( localize(11035, "Load more"));
     }
     get themeIcon() {
         return undefined;
@@ -187,7 +187,7 @@ 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(10714, "Timeline")); }
+    static { this.TITLE = ( localize2(11036, "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;
@@ -630,7 +630,7 @@ let TimelinePane = class TimelinePane extends ViewPane {
         this._isEmpty = !this.hasVisibleItems;
         if (this.uri === undefined) {
             this.updateFilename(undefined);
-            this.message = ( localize(10715, "The active editor cannot provide timeline information."));
+            this.message = ( localize(11037, "The active editor cannot provide timeline information."));
         }
         else if (this._isEmpty) {
             if (this.pendingRequests.size !== 0) {
@@ -640,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(10716, "All timeline sources have been filtered out."));
+                    this.message = ( localize(11038, "All timeline sources have been filtered out."));
                 }
                 else {
                     if (this.configurationService.getValue('workbench.localHistory.enabled') && !( this.excludedSources.has('timeline.localHistory'))) {
                         this.message = ( localize(
-                            10717,
+                            11039,
                             "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(10718, "No filtered timeline information was provided."));
+                        this.message = ( localize(11040, "No filtered timeline information was provided."));
                     }
                     else {
-                        this.message = ( localize(10719, "No timeline information was provided."));
+                        this.message = ( localize(11041, "No timeline information was provided."));
                     }
                 }
                 if (!scmProviderCount || scmProviderCount === 0) {
-                    this.message += ' ' + ( localize(10720, "Source Control has not been configured."));
+                    this.message += ' ' + ( localize(11042, "Source Control has not been configured."));
                 }
             }
         }
@@ -714,7 +714,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 = ( localize(10715, "The active editor cannot provide timeline information."));
+        this.message = ( localize(11037, "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);
@@ -731,7 +731,7 @@ let TimelinePane = class TimelinePane extends ViewPane {
                     if (isLoadMoreCommand(element)) {
                         return element.ariaLabel;
                     }
-                    return element.accessibilityInformation ? element.accessibilityInformation.label : ( localize(10721, "{0}: {1}", element.relativeTimeFullWord ?? '', element.label));
+                    return element.accessibilityInformation ? element.accessibilityInformation.label : ( localize(11043, "{0}: {1}", element.relativeTimeFullWord ?? '', element.label));
                 },
                 getRole(element) {
                     if (isLoadMoreCommand(element)) {
@@ -740,7 +740,7 @@ let TimelinePane = class TimelinePane extends ViewPane {
                     return element.accessibilityInformation && element.accessibilityInformation.role ? element.accessibilityInformation.role : 'treeitem';
                 },
                 getWidgetAriaLabel() {
-                    return localize(10714, "Timeline");
+                    return localize(11036, "Timeline");
                 }
             },
             keyboardNavigationLabelProvider: ( new TimelineKeyboardNavigationLabelProvider()),
@@ -800,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(10722, "Loading timeline for {0}...", file)) : '';
+        this.message = file ? ( localize(11044, "Loading timeline for {0}...", file)) : '';
     }
     onContextMenu(commands, treeEvent) {
         const item = treeEvent.element;
@@ -990,9 +990,9 @@ TimelineTreeRenderer = ( __decorate([
     ( __param(1, IInstantiationService)),
     ( __param(2, IThemeService))
 ], TimelineTreeRenderer));
-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.')));
+const timelineRefresh = registerIcon('timeline-refresh', Codicon.refresh, ( localize(11045, 'Icon for the refresh timeline action.')));
+const timelinePin = registerIcon('timeline-pin', Codicon.pin, ( localize(11046, 'Icon for the pin timeline action.')));
+const timelineUnpin = registerIcon('timeline-unpin', Codicon.pinned, ( localize(11047, 'Icon for the unpin timeline action.')));
 let TimelinePaneCommands = class TimelinePaneCommands extends Disposable {
     constructor(pane, timelineService, storageService, contextKeyService, menuService) {
         super();
@@ -1006,9 +1006,9 @@ let TimelinePaneCommands = class TimelinePaneCommands extends Disposable {
             constructor() {
                 super({
                     id: 'timeline.refresh',
-                    title: ( localize2(10726, "Refresh")),
+                    title: ( localize2(11048, "Refresh")),
                     icon: timelineRefresh,
-                    category: ( localize2(10714, "Timeline")),
+                    category: ( localize2(11036, "Timeline")),
                     menu: {
                         id: MenuId.TimelineTitle,
                         group: 'navigation',
@@ -1024,9 +1024,9 @@ let TimelinePaneCommands = class TimelinePaneCommands extends Disposable {
         this._register(MenuRegistry.appendMenuItem(MenuId.TimelineTitle, ({
             command: {
                 id: 'timeline.toggleFollowActiveEditor',
-                title: ( localize2(10727, 'Pin the Current Timeline')),
+                title: ( localize2(11049, 'Pin the Current Timeline')),
                 icon: timelinePin,
-                category: ( localize2(10714, "Timeline")),
+                category: ( localize2(11036, "Timeline")),
             },
             group: 'navigation',
             order: 98,
@@ -1035,9 +1035,9 @@ let TimelinePaneCommands = class TimelinePaneCommands extends Disposable {
         this._register(MenuRegistry.appendMenuItem(MenuId.TimelineTitle, ({
             command: {
                 id: 'timeline.toggleFollowActiveEditor',
-                title: ( localize2(10728, 'Unpin the Current Timeline')),
+                title: ( localize2(11050, 'Unpin the Current Timeline')),
                 icon: timelineUnpin,
-                category: ( localize2(10714, "Timeline")),
+                category: ( localize2(11036, "Timeline")),
             },
             group: 'navigation',
             order: 98,

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

@@ -1,7 +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 { Disposable, DisposableMap } 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';
@@ -24,7 +24,7 @@ let TimelineService = class TimelineService extends Disposable {
         this._onDidChangeUri = this._register(( new Emitter()));
         this.onDidChangeUri = this._onDidChangeUri.event;
         this.providers = ( new Map());
-        this.providerSubscriptions = ( new Map());
+        this.providerSubscriptions = this._register(( new DisposableMap()));
         this.hasProviderContext = TimelineHasProviderContext.bindTo(this.contextKeyService);
         this.updateHasProviderContext();
     }
@@ -90,8 +90,7 @@ let TimelineService = class TimelineService extends Disposable {
             return;
         }
         this.providers.delete(id);
-        this.providerSubscriptions.get(id)?.dispose();
-        this.providerSubscriptions.delete(id);
+        this.providerSubscriptions.deleteAndDispose(id);
         this.updateHasProviderContext();
         this._onDidChangeProviders.fire({ removed: [id] });
     }

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

@@ -1,6 +0,0 @@
-import n from '@codingame/monaco-vscode-api/external/rollup-plugin-styles/dist/runtime/inject-css';
-
-var css = ".monaco-workbench .timeline-tree-view{position:relative}.monaco-workbench .timeline-tree-view .message.timeline-subtle{opacity:.5;padding:10px 22px 0;pointer-events:none;position:absolute;z-index:1}.timeline-tree-view .monaco-list .monaco-list-row .custom-view-tree-node-item .monaco-icon-label{flex:1;overflow:hidden;text-overflow:ellipsis}.timeline-tree-view .monaco-list .monaco-list-row .custom-view-tree-node-item .timeline-timestamp-container{margin-left:2px;margin-right:4px;opacity:.5;overflow:hidden;text-overflow:ellipsis}.timeline-tree-view .monaco-list .monaco-list-row .custom-view-tree-node-item .timeline-timestamp-container.timeline-timestamp--duplicate:before{border-right:1px solid;content:\" \";display:block;height:100%;opacity:.25;position:absolute;right:10px;width:1px}.timeline-tree-view .monaco-list .monaco-list-row.focused .custom-view-tree-node-item .timeline-timestamp-container.timeline-timestamp--duplicate:before,.timeline-tree-view .monaco-list .monaco-list-row.selected .custom-view-tree-node-item .timeline-timestamp-container.timeline-timestamp--duplicate:before,.timeline-tree-view .monaco-list .monaco-list-row:hover .custom-view-tree-node-item .timeline-timestamp-container.timeline-timestamp--duplicate:before{display:none}.timeline-tree-view .monaco-list .monaco-list-row .custom-view-tree-node-item .timeline-timestamp-container .timeline-timestamp{display:inline-block}.timeline-tree-view .monaco-list .monaco-list-row .custom-view-tree-node-item .timeline-timestamp-container.timeline-timestamp--duplicate .timeline-timestamp{visibility:hidden;width:10px}.timeline-tree-view .monaco-list .monaco-list-row.focused .custom-view-tree-node-item .timeline-timestamp-container.timeline-timestamp--duplicate .timeline-timestamp,.timeline-tree-view .monaco-list .monaco-list-row.selected .custom-view-tree-node-item .timeline-timestamp-container.timeline-timestamp--duplicate .timeline-timestamp,.timeline-tree-view .monaco-list .monaco-list-row:hover .custom-view-tree-node-item .timeline-timestamp-container.timeline-timestamp--duplicate .timeline-timestamp{visibility:visible!important;width:auto}";
-n(css,{});
-
-export { css, css as default };