@codingame/monaco-vscode-timeline-service-override 18.4.0 → 19.0.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-timeline-service-override",
-  "version": "18.4.0",
+  "version": "19.0.1",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - timeline service-override",
   "keywords": [],
@@ -15,11 +15,11 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-501b06ab-3f58-516b-8a1a-c29d375d3da4-common": "18.4.0",
-    "@codingame/monaco-vscode-97284942-b044-5fbb-b53b-3f46d2468746-common": "18.4.0",
-    "@codingame/monaco-vscode-api": "18.4.0",
-    "@codingame/monaco-vscode-b71b5434-ce96-5581-8993-e8da380bd63f-common": "18.4.0",
-    "@codingame/monaco-vscode-f48982c4-9e82-55e2-b800-20e6d1e6096f-common": "18.4.0"
+    "@codingame/monaco-vscode-501b06ab-3f58-516b-8a1a-c29d375d3da4-common": "19.0.1",
+    "@codingame/monaco-vscode-api": "19.0.1",
+    "@codingame/monaco-vscode-b71b5434-ce96-5581-8993-e8da380bd63f-common": "19.0.1",
+    "@codingame/monaco-vscode-dbfe5f85-b426-55ed-a79b-5f811b395762-common": "19.0.1",
+    "@codingame/monaco-vscode-f24e325c-2ce0-5bba-8236-bfc4f53180ab-common": "19.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(7581, "Icon for a local history entry in the timeline view.")));
-const LOCAL_HISTORY_ICON_RESTORE = registerIcon('localHistory-restore', Codicon.check, ( localize(7582, "Icon for restoring contents of a local history entry.")));
+const LOCAL_HISTORY_ICON_ENTRY = registerIcon('localHistory-icon', Codicon.circleOutline, ( localize(7744, "Icon for a local history entry in the timeline view.")));
+const LOCAL_HISTORY_ICON_RESTORE = registerIcon('localHistory-restore', Codicon.check, ( localize(7745, "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-dbfe5f85-b426-55ed-a79b-5f811b395762-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';
@@ -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(7583, 'Local History'));
+const LOCAL_HISTORY_CATEGORY = ( localize2(7746, 'Local History'));
 const CTX_LOCAL_HISTORY_ENABLED = ( ContextKeyExpr.has('config.workbench.localHistory.enabled'));
-const COMPARE_WITH_FILE_LABEL = ( localize2(7584, 'Compare with File'));
+const COMPARE_WITH_FILE_LABEL = ( localize2(7747, '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(7585, 'Compare with Previous')),
+            title: ( localize2(7748, '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(7586, 'Select for Compare')),
+            title: ( localize2(7749, '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(7587, 'Compare with Selected')),
+            title: ( localize2(7750, '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(7588, 'Show Contents')),
+            title: ( localize2(7751, 'Show Contents')),
             menu: {
                 id: MenuId.TimelineItemContext,
                 group: '3_contents',
@@ -158,7 +158,7 @@ registerAction2(class extends Action2 {
         }
     }
 });
-const RESTORE_CONTENTS_LABEL = ( localize2(7589, 'Restore Contents'));
+const RESTORE_CONTENTS_LABEL = ( localize2(7752, '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(7590, "File Restored")));
+const restoreSaveSource = SaveSourceRegistry.registerSource('localHistoryRestore.source', ( localize(7753, "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(
-                7591,
+                7754,
                 "Do you want to restore the contents of '{0}'?",
                 basename(entry.workingCopy.resource)
             )),
-            detail: ( localize(7592, "Restoring will discard any unsaved changes.")),
-            primaryButton: ( localize(7593, "&&Restore"))
+            detail: ( localize(7755, "Restoring will discard any unsaved changes.")),
+            primaryButton: ( localize(7756, "&&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(7594, "Unable to restore '{0}'.", basename(entry.workingCopy.resource))), toErrorMessage(error));
+            await dialogService.error(( localize(7757, "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(7595, 'Find Entry to Restore')),
+            title: ( localize2(7758, '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(7596, "Select the file to show local history for"));
+        resourcePicker.placeholder = ( localize(7759, "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(7597, "Select the local history entry to open"));
+        entryPicker.placeholder = ( localize(7760, "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(7598, '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(7761, '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(7599, 'Rename')),
+            title: ( localize2(7762, '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(7600, "Rename Local History Entry"));
+            inputBox.title = ( localize(7763, "Rename Local History Entry"));
             inputBox.ignoreFocusOut = true;
-            inputBox.placeholder = ( localize(7601, "Enter the new name of the local history entry"));
+            inputBox.placeholder = ( localize(7764, "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(7602, 'Delete')),
+            title: ( localize2(7765, '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(
-                    7603,
+                    7766,
                     "Do you want to delete the local history entry of '{0}' from {1}?",
                     entry.workingCopy.name,
                     toLocalHistoryEntryDateLabel(entry.timestamp)
                 )),
-                detail: ( localize(7604, "This action is irreversible!")),
-                primaryButton: ( localize(7605, "&&Delete")),
+                detail: ( localize(7767, "This action is irreversible!")),
+                primaryButton: ( localize(7768, "&&Delete")),
             });
             if (!confirmed) {
                 return;
@@ -407,7 +407,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.localHistory.deleteAll',
-            title: ( localize2(7606, 'Delete All')),
+            title: ( localize2(7769, '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(7607, "Do you want to delete all entries of all files in local history?")),
-            detail: ( localize(7608, "This action is irreversible!")),
-            primaryButton: ( localize(7609, "&&Delete All")),
+            message: ( localize(7770, "Do you want to delete all entries of all files in local history?")),
+            detail: ( localize(7771, "This action is irreversible!")),
+            primaryButton: ( localize(7772, "&&Delete All")),
         });
         if (!confirmed) {
             return;
@@ -432,7 +432,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.localHistory.create',
-            title: ( localize2(7610, 'Create Entry')),
+            title: ( localize2(7773, '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(7611, "Create Local History Entry"));
+        inputBox.title = ( localize(7774, "Create Local History Entry"));
         inputBox.ignoreFocusOut = true;
         inputBox.placeholder = ( localize(
-            7612,
+            7775,
             "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(
-            7613,
+            7776,
             "{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(
-            7614,
+            7777,
             "{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(
-            7615,
+            7778,
             "{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-dbfe5f85-b426-55ed-a79b-5f811b395762-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';
@@ -35,7 +35,7 @@ let LocalHistoryTimeline = class LocalHistoryTimeline extends Disposable {
         this.configurationService = configurationService;
         this.contextService = contextService;
         this.id = 'timeline.localHistory';
-        this.label = ( localize(7616, "Local History"));
+        this.label = ( localize(7779, "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-97284942-b044-5fbb-b53b-3f46d2468746-common/vscode/vs/workbench/contrib/files/common/files';
+import { ExplorerFolderContext } from '@codingame/monaco-vscode-f24e325c-2ce0-5bba-8236-bfc4f53180ab-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(11416, 'View icon of the timeline view.')));
-const timelineOpenIcon = registerIcon('timeline-open', Codicon.history, ( localize(11417, 'Icon for the open timeline action.')));
+const timelineViewIcon = registerIcon('timeline-view-icon', Codicon.history, ( localize(11687, 'View icon of the timeline view.')));
+const timelineOpenIcon = registerIcon('timeline-open', Codicon.history, ( localize(11688, '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(11418, "Timeline")),
+    title: ( localize(11689, "Timeline")),
     type: 'object',
     properties: {
         'timeline.pageSize': {
             type: ['number', 'null'],
             default: 50,
             markdownDescription: ( localize(
-                11419,
+                11690,
                 "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(
-                11420,
+                11691,
                 "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(11421, "Open Timeline"));
+    OpenTimelineAction.LABEL = ( localize(11692, "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(11422, 'Icon for the filter timeline action.')));
+const timelineFilter = registerIcon('timeline-filter', Codicon.filter, ( localize(11693, 'Icon for the filter timeline action.')));
 MenuRegistry.appendMenuItem(MenuId.TimelineTitle, {
     submenu: MenuId.TimelineFilterSubMenu,
-    title: ( localize(11423, "Filter Timeline")),
+    title: ( localize(11694, "Filter Timeline")),
     group: 'navigation',
     order: 100,
     icon: timelineFilter

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

@@ -33,6 +33,7 @@ import { CommandsRegistry } from '@codingame/monaco-vscode-api/vscode/vs/platfor
 import { ICommandService } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service';
 import { IThemeService } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/themeService.service';
 import { ThemeIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/themables';
+import { ViewContainerLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/views';
 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';
@@ -44,7 +45,7 @@ import { ActionViewItem } from '@codingame/monaco-vscode-api/vscode/vs/base/brow
 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-dbfe5f85-b426-55ed-a79b-5f811b395762-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';
@@ -179,7 +180,7 @@ class LoadMoreCommand {
         return this.label;
     }
     get label() {
-        return this.loading ? ( localize(11424, "Loading...")) : ( localize(11425, "Load more"));
+        return this.loading ? ( localize(11695, "Loading...")) : ( localize(11696, "Load more"));
     }
     get themeIcon() {
         return undefined;
@@ -189,7 +190,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(11426, "Timeline")); }
+    static { this.TITLE = ( localize2(11697, "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;
@@ -632,7 +633,7 @@ let TimelinePane = class TimelinePane extends ViewPane {
         this._isEmpty = !this.hasVisibleItems;
         if (this.uri === undefined) {
             this.updateFilename(undefined);
-            this.message = ( localize(11427, "The active editor cannot provide timeline information."));
+            this.message = ( localize(11698, "The active editor cannot provide timeline information."));
         }
         else if (this._isEmpty) {
             if (this.pendingRequests.size !== 0) {
@@ -642,24 +643,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(11428, "All timeline sources have been filtered out."));
+                    this.message = ( localize(11699, "All timeline sources have been filtered out."));
                 }
                 else {
                     if (this.configurationService.getValue('workbench.localHistory.enabled') && !( this.excludedSources.has('timeline.localHistory'))) {
                         this.message = ( localize(
-                            11429,
+                            11700,
                             "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(11430, "No filtered timeline information was provided."));
+                        this.message = ( localize(11701, "No filtered timeline information was provided."));
                     }
                     else {
-                        this.message = ( localize(11431, "No timeline information was provided."));
+                        this.message = ( localize(11702, "No timeline information was provided."));
                     }
                 }
                 if (!scmProviderCount || scmProviderCount === 0) {
-                    this.message += ' ' + ( localize(11432, "Source Control has not been configured."));
+                    this.message += ' ' + ( localize(11703, "Source Control has not been configured."));
                 }
             }
         }
@@ -716,11 +717,11 @@ 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(11427, "The active editor cannot provide timeline information."));
+        this.message = ( localize(11698, "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 = this.instantiationService.createInstance(TimelineTreeRenderer, this.commands, this.viewDescriptorService.getViewLocationById(this.id));
         this._register(this.treeRenderer.onDidScrollToEnd(item => {
             if (this.pageOnScroll) {
                 this.loadMore(item);
@@ -733,7 +734,7 @@ let TimelinePane = class TimelinePane extends ViewPane {
                     if (isLoadMoreCommand(element)) {
                         return element.ariaLabel;
                     }
-                    return element.accessibilityInformation ? element.accessibilityInformation.label : ( localize(11433, "{0}: {1}", element.relativeTimeFullWord ?? '', element.label));
+                    return element.accessibilityInformation ? element.accessibilityInformation.label : ( localize(11704, "{0}: {1}", element.relativeTimeFullWord ?? '', element.label));
                 },
                 getRole(element) {
                     if (isLoadMoreCommand(element)) {
@@ -742,7 +743,7 @@ let TimelinePane = class TimelinePane extends ViewPane {
                     return element.accessibilityInformation && element.accessibilityInformation.role ? element.accessibilityInformation.role : 'treeitem';
                 },
                 getWidgetAriaLabel() {
-                    return localize(11426, "Timeline");
+                    return localize(11697, "Timeline");
                 }
             },
             keyboardNavigationLabelProvider: ( new TimelineKeyboardNavigationLabelProvider()),
@@ -802,7 +803,7 @@ let TimelinePane = class TimelinePane extends ViewPane {
     setLoadingUriMessage() {
         const file = this.uri && this.labelService.getUriBasenameLabel(this.uri);
         this.updateFilename(file);
-        this.message = file ? ( localize(11434, "Loading timeline for {0}...", file)) : '';
+        this.message = file ? ( localize(11705, "Loading timeline for {0}...", file)) : '';
     }
     onContextMenu(commands, treeEvent) {
         const item = treeEvent.element;
@@ -916,15 +917,18 @@ class TimelineListVirtualDelegate {
     }
 }
 let TimelineTreeRenderer = class TimelineTreeRenderer {
-    constructor(commands, instantiationService, themeService) {
+    constructor(commands, viewContainerLocation, instantiationService, themeService) {
         this.commands = commands;
+        this.viewContainerLocation = viewContainerLocation;
         this.instantiationService = instantiationService;
         this.themeService = themeService;
         this._onDidScrollToEnd = ( new Emitter());
         this.onDidScrollToEnd = this._onDidScrollToEnd.event;
         this.templateId = TimelineElementTemplate.id;
         this.actionViewItemProvider = createActionViewItem.bind(undefined, this.instantiationService);
-        this._hoverDelegate = this.instantiationService.createInstance(WorkbenchHoverDelegate, 'element', { instantHover: true }, {
+        this._hoverDelegate = this.instantiationService.createInstance(WorkbenchHoverDelegate, this.viewContainerLocation === ViewContainerLocation.Panel ? 'mouse' : 'element', {
+            instantHover: this.viewContainerLocation !== ViewContainerLocation.Panel
+        }, {
             position: {
                 hoverPosition: HoverPosition.RIGHT
             }
@@ -989,12 +993,12 @@ let TimelineTreeRenderer = class TimelineTreeRenderer {
     }
 };
 TimelineTreeRenderer = ( __decorate([
-    ( __param(1, IInstantiationService)),
-    ( __param(2, IThemeService))
+    ( __param(2, IInstantiationService)),
+    ( __param(3, IThemeService))
 ], TimelineTreeRenderer));
-const timelineRefresh = registerIcon('timeline-refresh', Codicon.refresh, ( localize(11435, 'Icon for the refresh timeline action.')));
-const timelinePin = registerIcon('timeline-pin', Codicon.pin, ( localize(11436, 'Icon for the pin timeline action.')));
-const timelineUnpin = registerIcon('timeline-unpin', Codicon.pinned, ( localize(11437, 'Icon for the unpin timeline action.')));
+const timelineRefresh = registerIcon('timeline-refresh', Codicon.refresh, ( localize(11706, 'Icon for the refresh timeline action.')));
+const timelinePin = registerIcon('timeline-pin', Codicon.pin, ( localize(11707, 'Icon for the pin timeline action.')));
+const timelineUnpin = registerIcon('timeline-unpin', Codicon.pinned, ( localize(11708, 'Icon for the unpin timeline action.')));
 let TimelinePaneCommands = class TimelinePaneCommands extends Disposable {
     constructor(pane, timelineService, storageService, contextKeyService, menuService) {
         super();
@@ -1008,9 +1012,9 @@ let TimelinePaneCommands = class TimelinePaneCommands extends Disposable {
             constructor() {
                 super({
                     id: 'timeline.refresh',
-                    title: ( localize2(11438, "Refresh")),
+                    title: ( localize2(11709, "Refresh")),
                     icon: timelineRefresh,
-                    category: ( localize2(11426, "Timeline")),
+                    category: ( localize2(11697, "Timeline")),
                     menu: {
                         id: MenuId.TimelineTitle,
                         group: 'navigation',
@@ -1026,9 +1030,9 @@ let TimelinePaneCommands = class TimelinePaneCommands extends Disposable {
         this._register(MenuRegistry.appendMenuItem(MenuId.TimelineTitle, ({
             command: {
                 id: 'timeline.toggleFollowActiveEditor',
-                title: ( localize2(11439, 'Pin the Current Timeline')),
+                title: ( localize2(11710, 'Pin the Current Timeline')),
                 icon: timelinePin,
-                category: ( localize2(11426, "Timeline")),
+                category: ( localize2(11697, "Timeline")),
             },
             group: 'navigation',
             order: 98,
@@ -1037,9 +1041,9 @@ let TimelinePaneCommands = class TimelinePaneCommands extends Disposable {
         this._register(MenuRegistry.appendMenuItem(MenuId.TimelineTitle, ({
             command: {
                 id: 'timeline.toggleFollowActiveEditor',
-                title: ( localize2(11440, 'Unpin the Current Timeline')),
+                title: ( localize2(11711, 'Unpin the Current Timeline')),
                 icon: timelineUnpin,
-                category: ( localize2(11426, "Timeline")),
+                category: ( localize2(11697, "Timeline")),
             },
             group: 'navigation',
             order: 98,