@codingame/monaco-vscode-timeline-service-override 8.0.4 → 9.0.0

package/package.json

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

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

@@ -23,7 +23,7 @@ function getLocalHistoryDateFormatter() {
 }
 const LOCAL_HISTORY_MENU_CONTEXT_VALUE = 'localHistory:item';
 const LOCAL_HISTORY_MENU_CONTEXT_KEY = ( (ContextKeyExpr.equals('timelineItem', LOCAL_HISTORY_MENU_CONTEXT_VALUE)));
-const LOCAL_HISTORY_ICON_ENTRY = registerIcon('localHistory-icon', Codicon.circleOutline, ( localize(10529, "Icon for a local history entry in the timeline view.")));
-const LOCAL_HISTORY_ICON_RESTORE = registerIcon('localHistory-restore', Codicon.check, ( localize(10530, "Icon for restoring contents of a local history entry.")));
+const LOCAL_HISTORY_ICON_ENTRY = registerIcon('localHistory-icon', Codicon.circleOutline, ( localize(10563, "Icon for a local history entry in the timeline view.")));
+const LOCAL_HISTORY_ICON_RESTORE = registerIcon('localHistory-restore', Codicon.check, ( localize(10564, "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

@@ -23,13 +23,16 @@ import { getIconClasses } from 'vscode/vscode/vs/editor/common/services/getIconC
 import { IModelService } from 'vscode/vscode/vs/editor/common/services/model';
 import { ILanguageService } from 'vscode/vscode/vs/editor/common/languages/language';
 import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label.service';
-import { firstOrDefault } from 'vscode/vscode/vs/base/common/arrays';
+import { coalesce, firstOrDefault } from 'vscode/vscode/vs/base/common/arrays';
 import { LOCAL_HISTORY_MENU_CONTEXT_KEY, LOCAL_HISTORY_ICON_RESTORE, getLocalHistoryDateFormatter } from './localHistory.js';
 import { IPathService } from 'vscode/vscode/vs/workbench/services/path/common/pathService.service';
+import { ResourceSet } from 'vscode/vscode/vs/base/common/map';
+import { IHistoryService } from 'vscode/vscode/vs/workbench/services/history/common/history.service';
+import { DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
 
-const LOCAL_HISTORY_CATEGORY = ( localize2(6711, 'Local History'));
+const LOCAL_HISTORY_CATEGORY = ( localize2(6650, 'Local History'));
 const CTX_LOCAL_HISTORY_ENABLED = ( (ContextKeyExpr.has('config.workbench.localHistory.enabled')));
-const COMPARE_WITH_FILE_LABEL = ( localize2(6712, 'Compare with File'));
+const COMPARE_WITH_FILE_LABEL = ( localize2(6651, 'Compare with File'));
 registerAction2(class extends Action2 {
     constructor() {
         super({
@@ -56,7 +59,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.localHistory.compareWithPrevious',
-            title: ( localize2(6713, 'Compare with Previous')),
+            title: ( localize2(6652, 'Compare with Previous')),
             menu: {
                 id: MenuId.TimelineItemContext,
                 group: '1_compare',
@@ -84,7 +87,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.localHistory.selectForCompare',
-            title: ( localize2(6714, 'Select for Compare')),
+            title: ( localize2(6653, 'Select for Compare')),
             menu: {
                 id: MenuId.TimelineItemContext,
                 group: '2_compare_with',
@@ -107,7 +110,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.localHistory.compareWithSelected',
-            title: ( localize2(6715, 'Compare with Selected')),
+            title: ( localize2(6654, 'Compare with Selected')),
             menu: {
                 id: MenuId.TimelineItemContext,
                 group: '2_compare_with',
@@ -136,7 +139,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.localHistory.open',
-            title: ( localize2(6716, 'Show Contents')),
+            title: ( localize2(6655, 'Show Contents')),
             menu: {
                 id: MenuId.TimelineItemContext,
                 group: '3_contents',
@@ -154,7 +157,7 @@ registerAction2(class extends Action2 {
         }
     }
 });
-const RESTORE_CONTENTS_LABEL = ( localize2(6717, 'Restore Contents'));
+const RESTORE_CONTENTS_LABEL = ( localize2(6656, 'Restore Contents'));
 registerAction2(class extends Action2 {
     constructor() {
         super({
@@ -191,7 +194,7 @@ registerAction2(class extends Action2 {
         return restore(accessor, item);
     }
 });
-const restoreSaveSource = SaveSourceRegistry.registerSource('localHistoryRestore.source', ( localize(6718, "File Restored")));
+const restoreSaveSource = SaveSourceRegistry.registerSource('localHistoryRestore.source', ( localize(6657, "File Restored")));
 async function restore(accessor, item) {
     const fileService = accessor.get(IFileService);
     const dialogService = accessor.get(IDialogService);
@@ -203,12 +206,12 @@ async function restore(accessor, item) {
         const { confirmed } = await dialogService.confirm({
             type: 'warning',
             message: ( localize(
-                6719,
+                6658,
                 "Do you want to restore the contents of '{0}'?",
                 basename(entry.workingCopy.resource)
             )),
-            detail: ( localize(6720, "Restoring will discard any unsaved changes.")),
-            primaryButton: ( localize(6721, "&&Restore"))
+            detail: ( localize(6659, "Restoring will discard any unsaved changes.")),
+            primaryButton: ( localize(6660, "&&Restore"))
         });
         if (!confirmed) {
             return;
@@ -225,7 +228,7 @@ async function restore(accessor, item) {
             await fileService.cloneFile(entry.location, entry.workingCopy.resource);
         }
         catch (error) {
-            await dialogService.error(( localize(6722, "Unable to restore '{0}'.", basename(entry.workingCopy.resource))), toErrorMessage(error));
+            await dialogService.error(( localize(6661, "Unable to restore '{0}'.", basename(entry.workingCopy.resource))), toErrorMessage(error));
             return;
         }
         if (workingCopies) {
@@ -245,7 +248,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.localHistory.restoreViaPicker',
-            title: ( localize2(6723, 'Find Entry to Restore')),
+            title: ( localize2(6662, 'Find Entry to Restore')),
             f1: true,
             category: LOCAL_HISTORY_CATEGORY,
             precondition: CTX_LOCAL_HISTORY_ENABLED
@@ -260,36 +263,51 @@ registerAction2(class extends Action2 {
         const editorService = accessor.get(IEditorService);
         const fileService = accessor.get(IFileService);
         const commandService = accessor.get(ICommandService);
-        const resourcePicker = quickInputService.createQuickPick();
+        const historyService = accessor.get(IHistoryService);
+        const resourcePickerDisposables = ( (new DisposableStore()));
+        const resourcePicker = resourcePickerDisposables.add(quickInputService.createQuickPick());
         let cts = ( (new CancellationTokenSource()));
-        resourcePicker.onDidHide(() => cts.dispose(true));
+        resourcePickerDisposables.add(resourcePicker.onDidHide(() => cts.dispose(true)));
         resourcePicker.busy = true;
         resourcePicker.show();
-        const resources = await workingCopyHistoryService.getAll(cts.token);
+        const resources = ( (new ResourceSet(await workingCopyHistoryService.getAll(cts.token))));
+        const recentEditorResources = ( (new ResourceSet(
+            coalesce(( (historyService.getHistory().map(({ resource }) => resource))))
+        )));
+        const resourcesSortedByRecency = [];
+        for (const resource of recentEditorResources) {
+            if (( (resources.has(resource)))) {
+                resourcesSortedByRecency.push(resource);
+                resources.delete(resource);
+            }
+        }
+        resourcesSortedByRecency.push(...[...resources].sort((r1, r2) => r1.fsPath < r2.fsPath ? -1 : 1));
         resourcePicker.busy = false;
-        resourcePicker.placeholder = ( localize(6724, "Select the file to show local history for"));
+        resourcePicker.placeholder = ( localize(6663, "Select the file to show local history for"));
         resourcePicker.matchOnLabel = true;
         resourcePicker.matchOnDescription = true;
-        resourcePicker.items = ( (resources.map(resource => ({
+        resourcePicker.items = ( ([...resourcesSortedByRecency].map(resource => ({
             resource,
             label: basenameOrAuthority(resource),
             description: labelService.getUriLabel(dirname(resource), { relative: true }),
             iconClasses: getIconClasses(modelService, languageService, resource)
-        })))).sort((r1, r2) => r1.resource.fsPath < r2.resource.fsPath ? -1 : 1);
+        }))));
         await Event.toPromise(resourcePicker.onDidAccept);
-        resourcePicker.dispose();
+        resourcePickerDisposables.dispose();
         const resource = firstOrDefault(resourcePicker.selectedItems)?.resource;
         if (!resource) {
             return;
         }
-        const entryPicker = quickInputService.createQuickPick();
+        const entryPickerDisposables = ( (new DisposableStore()));
+        const entryPicker = entryPickerDisposables.add(quickInputService.createQuickPick());
         cts = ( (new CancellationTokenSource()));
-        entryPicker.onDidHide(() => cts.dispose(true));
+        entryPickerDisposables.add(entryPicker.onDidHide(() => cts.dispose(true)));
         entryPicker.busy = true;
         entryPicker.show();
         const entries = await workingCopyHistoryService.getEntries(resource, cts.token);
         entryPicker.busy = false;
-        entryPicker.placeholder = ( localize(6725, "Select the local history entry to open"));
+        entryPicker.canAcceptInBackground = true;
+        entryPicker.placeholder = ( localize(6664, "Select the local history entry to open"));
         entryPicker.matchOnLabel = true;
         entryPicker.matchOnDescription = true;
         entryPicker.items = ( (Array.from(entries).reverse().map(entry => ({
@@ -297,25 +315,28 @@ registerAction2(class extends Action2 {
             label: `$(circle-outline) ${SaveSourceRegistry.getSourceLabel(entry.source)}`,
             description: toLocalHistoryEntryDateLabel(entry.timestamp)
         }))));
-        await Event.toPromise(entryPicker.onDidAccept);
-        entryPicker.dispose();
-        const selectedItem = firstOrDefault(entryPicker.selectedItems);
-        if (!selectedItem) {
-            return;
-        }
-        const resourceExists = await fileService.exists(selectedItem.entry.workingCopy.resource);
-        if (resourceExists) {
-            return commandService.executeCommand(API_OPEN_DIFF_EDITOR_COMMAND_ID, ...toDiffEditorArguments(selectedItem.entry, selectedItem.entry.workingCopy.resource));
-        }
-        return openEntry(selectedItem.entry, editorService);
+        entryPickerDisposables.add(entryPicker.onDidAccept(async (e) => {
+            if (!e.inBackground) {
+                entryPickerDisposables.dispose();
+            }
+            const selectedItem = firstOrDefault(entryPicker.selectedItems);
+            if (!selectedItem) {
+                return;
+            }
+            const resourceExists = await fileService.exists(selectedItem.entry.workingCopy.resource);
+            if (resourceExists) {
+                return commandService.executeCommand(API_OPEN_DIFF_EDITOR_COMMAND_ID, ...toDiffEditorArguments(selectedItem.entry, selectedItem.entry.workingCopy.resource, { preserveFocus: e.inBackground }));
+            }
+            return openEntry(selectedItem.entry, editorService, { preserveFocus: e.inBackground });
+        }));
     }
 });
-MenuRegistry.appendMenuItem(MenuId.TimelineTitle, { command: { id: 'workbench.action.localHistory.restoreViaPicker', title: ( localize2(6726, '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(6665, '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(6727, 'Rename')),
+            title: ( localize2(6666, 'Rename')),
             menu: {
                 id: MenuId.TimelineItemContext,
                 group: '5_edit',
@@ -329,18 +350,19 @@ registerAction2(class extends Action2 {
         const quickInputService = accessor.get(IQuickInputService);
         const { entry } = await findLocalHistoryEntry(workingCopyHistoryService, item);
         if (entry) {
-            const inputBox = quickInputService.createInputBox();
-            inputBox.title = ( localize(6728, "Rename Local History Entry"));
+            const disposables = ( (new DisposableStore()));
+            const inputBox = disposables.add(quickInputService.createInputBox());
+            inputBox.title = ( localize(6667, "Rename Local History Entry"));
             inputBox.ignoreFocusOut = true;
-            inputBox.placeholder = ( localize(6729, "Enter the new name of the local history entry"));
+            inputBox.placeholder = ( localize(6668, "Enter the new name of the local history entry"));
             inputBox.value = SaveSourceRegistry.getSourceLabel(entry.source);
             inputBox.show();
-            inputBox.onDidAccept(() => {
+            disposables.add(inputBox.onDidAccept(() => {
                 if (inputBox.value) {
                     workingCopyHistoryService.updateEntry(entry, { source: inputBox.value }, CancellationToken.None);
                 }
-                inputBox.dispose();
-            });
+                disposables.dispose();
+            }));
         }
     }
 });
@@ -348,7 +370,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.localHistory.delete',
-            title: ( localize2(6730, 'Delete')),
+            title: ( localize2(6669, 'Delete')),
             menu: {
                 id: MenuId.TimelineItemContext,
                 group: '5_edit',
@@ -366,13 +388,13 @@ registerAction2(class extends Action2 {
             const { confirmed } = await dialogService.confirm({
                 type: 'warning',
                 message: ( localize(
-                    6731,
+                    6670,
                     "Do you want to delete the local history entry of '{0}' from {1}?",
                     entry.workingCopy.name,
                     toLocalHistoryEntryDateLabel(entry.timestamp)
                 )),
-                detail: ( localize(6732, "This action is irreversible!")),
-                primaryButton: ( localize(6733, "&&Delete")),
+                detail: ( localize(6671, "This action is irreversible!")),
+                primaryButton: ( localize(6672, "&&Delete")),
             });
             if (!confirmed) {
                 return;
@@ -386,7 +408,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.localHistory.deleteAll',
-            title: ( localize2(6734, 'Delete All')),
+            title: ( localize2(6673, 'Delete All')),
             f1: true,
             category: LOCAL_HISTORY_CATEGORY,
             precondition: CTX_LOCAL_HISTORY_ENABLED
@@ -397,9 +419,9 @@ registerAction2(class extends Action2 {
         const workingCopyHistoryService = accessor.get(IWorkingCopyHistoryService);
         const { confirmed } = await dialogService.confirm({
             type: 'warning',
-            message: ( localize(6735, "Do you want to delete all entries of all files in local history?")),
-            detail: ( localize(6736, "This action is irreversible!")),
-            primaryButton: ( localize(6737, "&&Delete All")),
+            message: ( localize(6674, "Do you want to delete all entries of all files in local history?")),
+            detail: ( localize(6675, "This action is irreversible!")),
+            primaryButton: ( localize(6676, "&&Delete All")),
         });
         if (!confirmed) {
             return;
@@ -411,7 +433,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.localHistory.create',
-            title: ( localize2(6738, 'Create Entry')),
+            title: ( localize2(6677, 'Create Entry')),
             f1: true,
             category: LOCAL_HISTORY_CATEGORY,
             precondition: ( (ContextKeyExpr.and(CTX_LOCAL_HISTORY_ENABLED, ActiveEditorContext)))
@@ -427,35 +449,37 @@ registerAction2(class extends Action2 {
         if (resource?.scheme !== pathService.defaultUriScheme && resource?.scheme !== Schemas.vscodeUserData) {
             return;
         }
-        const inputBox = quickInputService.createInputBox();
-        inputBox.title = ( localize(6739, "Create Local History Entry"));
+        const disposables = ( (new DisposableStore()));
+        const inputBox = disposables.add(quickInputService.createInputBox());
+        inputBox.title = ( localize(6678, "Create Local History Entry"));
         inputBox.ignoreFocusOut = true;
         inputBox.placeholder = ( localize(
-            6740,
+            6679,
             "Enter the new name of the local history entry for '{0}'",
             labelService.getUriBasenameLabel(resource)
         ));
         inputBox.show();
-        inputBox.onDidAccept(async () => {
+        disposables.add(inputBox.onDidAccept(async () => {
             const entrySource = inputBox.value;
-            inputBox.dispose();
+            disposables.dispose();
             if (entrySource) {
                 await workingCopyHistoryService.addEntry({ resource, source: inputBox.value }, CancellationToken.None);
             }
-        });
+        }));
     }
 });
-async function openEntry(entry, editorService) {
+async function openEntry(entry, editorService, options) {
     const resource = LocalHistoryFileSystemProvider.toLocalHistoryFileSystem({ location: entry.location, associatedResource: entry.workingCopy.resource });
     await editorService.openEditor({
         resource,
         label: ( localize(
-            6741,
+            6680,
             "{0} ({1} • {2})",
             entry.workingCopy.name,
             SaveSourceRegistry.getSourceLabel(entry.source),
             toLocalHistoryEntryDateLabel(entry.timestamp)
-        ))
+        )),
+        options
     });
 }
 async function closeEntry(entry, editorService) {
@@ -463,7 +487,7 @@ async function closeEntry(entry, editorService) {
     const editors = editorService.findEditors(resource, { supportSideBySide: SideBySideEditor.ANY });
     await editorService.closeEditors(editors, { preserveFocus: true });
 }
-function toDiffEditorArguments(arg1, arg2) {
+function toDiffEditorArguments(arg1, arg2, options) {
     const originalResource = LocalHistoryFileSystemProvider.toLocalHistoryFileSystem({ location: arg1.location, associatedResource: arg1.workingCopy.resource });
     let label;
     let modifiedResource;
@@ -471,7 +495,7 @@ function toDiffEditorArguments(arg1, arg2) {
         const resource = arg2;
         modifiedResource = resource;
         label = ( localize(
-            6742,
+            6681,
             "{0} ({1} • {2}) ↔ {3}",
             arg1.workingCopy.name,
             SaveSourceRegistry.getSourceLabel(arg1.source),
@@ -483,7 +507,7 @@ function toDiffEditorArguments(arg1, arg2) {
         const modified = arg2;
         modifiedResource = LocalHistoryFileSystemProvider.toLocalHistoryFileSystem({ location: modified.location, associatedResource: modified.workingCopy.resource });
         label = ( localize(
-            6743,
+            6682,
             "{0} ({1} • {2}) ↔ {3} ({4} • {5})",
             arg1.workingCopy.name,
             SaveSourceRegistry.getSourceLabel(arg1.source),
@@ -497,7 +521,7 @@ function toDiffEditorArguments(arg1, arg2) {
         originalResource,
         modifiedResource,
         label,
-        undefined
+        options ? [undefined, options] : undefined
     ];
 }
 async function findLocalHistoryEntry(workingCopyHistoryService, descriptor) {

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

@@ -34,7 +34,7 @@ let LocalHistoryTimeline = class LocalHistoryTimeline extends Disposable {
         this.configurationService = configurationService;
         this.contextService = contextService;
         this.id = 'timeline.localHistory';
-        this.label = ( localize(6744, "Local History"));
+        this.label = ( localize(6683, "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

@@ -17,8 +17,8 @@ import { ResourceContextKey } from 'vscode/vscode/vs/workbench/common/contextkey
 import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
 import { registerIcon } from 'vscode/vscode/vs/platform/theme/common/iconRegistry';
 
-const timelineViewIcon = registerIcon('timeline-view-icon', Codicon.history, ( localize(2983, 'View icon of the timeline view.')));
-const timelineOpenIcon = registerIcon('timeline-open', Codicon.history, ( localize(2984, 'Icon for the open timeline action.')));
+const timelineViewIcon = registerIcon('timeline-view-icon', Codicon.history, ( localize(2503, 'View icon of the timeline view.')));
+const timelineOpenIcon = registerIcon('timeline-open', Codicon.history, ( localize(2504, 'Icon for the open timeline action.')));
 class TimelinePaneDescriptor {
     constructor() {
         this.id = TimelinePaneId;
@@ -39,14 +39,14 @@ const configurationRegistry = ( (Registry.as(Extensions.Configuration)));
 configurationRegistry.registerConfiguration({
     id: 'timeline',
     order: 1001,
-    title: ( localize(2985, "Timeline")),
+    title: ( localize(2505, "Timeline")),
     type: 'object',
     properties: {
         'timeline.pageSize': {
             type: ['number', 'null'],
             default: null,
             markdownDescription: ( localize(
-                2986,
+                2506,
                 "The number of items to show in the Timeline view by default and when loading more items. Setting to `null` (the default) will automatically choose a page size based on the visible area of the Timeline view."
             )),
         },
@@ -54,7 +54,7 @@ configurationRegistry.registerConfiguration({
             type: 'boolean',
             default: false,
             description: ( localize(
-                2987,
+                2507,
                 "Experimental. Controls whether the Timeline view will load the next page of items when you scroll to the end of the list."
             )),
         },
@@ -64,7 +64,7 @@ configurationRegistry.registerConfiguration({
 var OpenTimelineAction;
 ( ((function(OpenTimelineAction) {
     OpenTimelineAction.ID = 'files.openTimeline';
-    OpenTimelineAction.LABEL = ( localize(2988, "Open Timeline"));
+    OpenTimelineAction.LABEL = ( localize(2508, "Open Timeline"));
     function handler() {
         return (accessor, arg) => {
             const service = accessor.get(ITimelineService);
@@ -88,10 +88,10 @@ MenuRegistry.appendMenuItem(MenuId.ExplorerContext, ({
         TimelineHasProviderContext
     )))
 }));
-const timelineFilter = registerIcon('timeline-filter', Codicon.filter, ( localize(2989, 'Icon for the filter timeline action.')));
+const timelineFilter = registerIcon('timeline-filter', Codicon.filter, ( localize(2509, 'Icon for the filter timeline action.')));
 MenuRegistry.appendMenuItem(MenuId.TimelineTitle, {
     submenu: MenuId.TimelineFilterSubMenu,
-    title: ( localize(2990, "Filter Timeline")),
+    title: ( localize(2510, "Filter Timeline")),
     group: 'navigation',
     order: 100,
     icon: timelineFilter

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

@@ -58,7 +58,7 @@ function isLoadMoreCommand(item) {
     return item instanceof LoadMoreCommand;
 }
 function isTimelineItem(item) {
-    return !item?.handle.startsWith('vscode-command:') ?? false;
+    return !!item && !item.handle.startsWith('vscode-command:');
 }
 function updateRelativeTime(item, lastRelativeTime) {
     item.relativeTime = isTimelineItem(item) ? fromNow(item.timestamp) : undefined;
@@ -175,7 +175,7 @@ class LoadMoreCommand {
         return this.label;
     }
     get label() {
-        return this.loading ? ( localize(6694, "Loading...")) : ( localize(6695, "Load more"));
+        return this.loading ? ( localize(6633, "Loading...")) : ( localize(6634, "Load more"));
     }
     get themeIcon() {
         return undefined;
@@ -184,7 +184,7 @@ class LoadMoreCommand {
 const TimelineFollowActiveEditorContext = ( (new RawContextKey('timelineFollowActiveEditor', true, true)));
 const TimelineExcludeSources = ( (new RawContextKey('timelineExcludeSources', '[]', true)));
 let TimelinePane = class TimelinePane extends ViewPane {
-    static { this.TITLE = ( localize2(6696, "Timeline")); }
+    static { this.TITLE = ( localize2(6635, "Timeline")); }
     constructor(options, keybindingService, contextMenuService, contextKeyService, configurationService, storageService, viewDescriptorService, instantiationService, editorService, commandService, progressService, timelineService, openerService, themeService, telemetryService, hoverService, labelService, uriIdentityService, extensionService) {
         super({ ...options, titleMenuId: MenuId.TimelineTitle }, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService, hoverService);
         this.storageService = storageService;
@@ -620,7 +620,7 @@ let TimelinePane = class TimelinePane extends ViewPane {
         this._isEmpty = !this.hasVisibleItems;
         if (this.uri === undefined) {
             this.updateFilename(undefined);
-            this.message = ( localize(6697, "The active editor cannot provide timeline information."));
+            this.message = ( localize(6636, "The active editor cannot provide timeline information."));
         }
         else if (this._isEmpty) {
             if (this.pendingRequests.size !== 0) {
@@ -630,24 +630,24 @@ let TimelinePane = class TimelinePane extends ViewPane {
                 this.updateFilename(this.labelService.getUriBasenameLabel(this.uri));
                 const scmProviderCount = this.contextKeyService.getContextKeyValue('scm.providerCount');
                 if (this.timelineService.getSources().filter(({ id }) => !( (this.excludedSources.has(id)))).length === 0) {
-                    this.message = ( localize(6698, "All timeline sources have been filtered out."));
+                    this.message = ( localize(6637, "All timeline sources have been filtered out."));
                 }
                 else {
                     if (this.configurationService.getValue('workbench.localHistory.enabled') && !( (this.excludedSources.has('timeline.localHistory')))) {
                         this.message = ( localize(
-                            6699,
+                            6638,
                             "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(6700, "No filtered timeline information was provided."));
+                        this.message = ( localize(6639, "No filtered timeline information was provided."));
                     }
                     else {
-                        this.message = ( localize(6701, "No timeline information was provided."));
+                        this.message = ( localize(6640, "No timeline information was provided."));
                     }
                 }
                 if (!scmProviderCount || scmProviderCount === 0) {
-                    this.message += ' ' + ( localize(6702, "Source Control has not been configured."));
+                    this.message += ' ' + ( localize(6641, "Source Control has not been configured."));
                 }
             }
         }
@@ -704,7 +704,7 @@ let TimelinePane = class TimelinePane extends ViewPane {
         container.classList.add('tree-explorer-viewlet-tree-view', 'timeline-tree-view');
         this.$message = append(this.$container, $('.message'));
         this.$message.classList.add('timeline-subtle');
-        this.message = ( localize(6697, "The active editor cannot provide timeline information."));
+        this.message = ( localize(6636, "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);
@@ -721,7 +721,7 @@ let TimelinePane = class TimelinePane extends ViewPane {
                     if (isLoadMoreCommand(element)) {
                         return element.ariaLabel;
                     }
-                    return element.accessibilityInformation ? element.accessibilityInformation.label : ( localize(6703, "{0}: {1}", element.relativeTimeFullWord ?? '', element.label));
+                    return element.accessibilityInformation ? element.accessibilityInformation.label : ( localize(6642, "{0}: {1}", element.relativeTimeFullWord ?? '', element.label));
                 },
                 getRole(element) {
                     if (isLoadMoreCommand(element)) {
@@ -730,7 +730,7 @@ let TimelinePane = class TimelinePane extends ViewPane {
                     return element.accessibilityInformation && element.accessibilityInformation.role ? element.accessibilityInformation.role : 'treeitem';
                 },
                 getWidgetAriaLabel() {
-                    return ( localize(6696, "Timeline"));
+                    return ( localize(6635, "Timeline"));
                 }
             },
             keyboardNavigationLabelProvider: ( (new TimelineKeyboardNavigationLabelProvider())),
@@ -791,7 +791,7 @@ let TimelinePane = class TimelinePane extends ViewPane {
     setLoadingUriMessage() {
         const file = this.uri && this.labelService.getUriBasenameLabel(this.uri);
         this.updateFilename(file);
-        this.message = file ? ( localize(6704, "Loading timeline for {0}...", file)) : '';
+        this.message = file ? ( localize(6643, "Loading timeline for {0}...", file)) : '';
     }
     onContextMenu(commands, treeEvent) {
         const item = treeEvent.element;
@@ -979,9 +979,9 @@ TimelineTreeRenderer = ( (__decorate([
     ( (__param(1, IInstantiationService))),
     ( (__param(2, IThemeService)))
 ], TimelineTreeRenderer)));
-const timelineRefresh = registerIcon('timeline-refresh', Codicon.refresh, ( localize(6705, 'Icon for the refresh timeline action.')));
-const timelinePin = registerIcon('timeline-pin', Codicon.pin, ( localize(6706, 'Icon for the pin timeline action.')));
-const timelineUnpin = registerIcon('timeline-unpin', Codicon.pinned, ( localize(6707, 'Icon for the unpin timeline action.')));
+const timelineRefresh = registerIcon('timeline-refresh', Codicon.refresh, ( localize(6644, 'Icon for the refresh timeline action.')));
+const timelinePin = registerIcon('timeline-pin', Codicon.pin, ( localize(6645, 'Icon for the pin timeline action.')));
+const timelineUnpin = registerIcon('timeline-unpin', Codicon.pinned, ( localize(6646, 'Icon for the unpin timeline action.')));
 let TimelinePaneCommands = class TimelinePaneCommands extends Disposable {
     constructor(pane, timelineService, storageService, contextKeyService, menuService) {
         super();
@@ -995,9 +995,9 @@ let TimelinePaneCommands = class TimelinePaneCommands extends Disposable {
             constructor() {
                 super({
                     id: 'timeline.refresh',
-                    title: ( localize2(6708, "Refresh")),
+                    title: ( localize2(6647, "Refresh")),
                     icon: timelineRefresh,
-                    category: ( localize2(6696, "Timeline")),
+                    category: ( localize2(6635, "Timeline")),
                     menu: {
                         id: MenuId.TimelineTitle,
                         group: 'navigation',
@@ -1013,9 +1013,9 @@ let TimelinePaneCommands = class TimelinePaneCommands extends Disposable {
         this._register(MenuRegistry.appendMenuItem(MenuId.TimelineTitle, ({
             command: {
                 id: 'timeline.toggleFollowActiveEditor',
-                title: ( localize2(6709, 'Pin the Current Timeline')),
+                title: ( localize2(6648, 'Pin the Current Timeline')),
                 icon: timelinePin,
-                category: ( localize2(6696, "Timeline")),
+                category: ( localize2(6635, "Timeline")),
             },
             group: 'navigation',
             order: 98,
@@ -1024,9 +1024,9 @@ let TimelinePaneCommands = class TimelinePaneCommands extends Disposable {
         this._register(MenuRegistry.appendMenuItem(MenuId.TimelineTitle, ({
             command: {
                 id: 'timeline.toggleFollowActiveEditor',
-                title: ( localize2(6710, 'Unpin the Current Timeline')),
+                title: ( localize2(6649, 'Unpin the Current Timeline')),
                 icon: timelineUnpin,
-                category: ( localize2(6696, "Timeline")),
+                category: ( localize2(6635, "Timeline")),
             },
             group: 'navigation',
             order: 98,