@codingame/monaco-vscode-timeline-service-override 11.1.1 → 12.0.0

package/index.d.ts

@@ -1 +1,2 @@
-export { default } from 'vscode/service-override/timeline';
+import { type IEditorOverrideServices } from "vscode/vscode/vs/editor/standalone/browser/standaloneServices";
+export default function getServiceOverride(): IEditorOverrideServices;

package/index.js

@@ -1 +1,15 @@
-export { default } from './timeline.js';
+
+import 'vscode/vscode/vs/editor/standalone/browser/standaloneServices';
+import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
+import './vscode/src/vs/workbench/contrib/timeline/browser/timeline.contribution.js';
+import './vscode/src/vs/workbench/contrib/localHistory/browser/localHistory.contribution.js';
+import { ITimelineService } from 'vscode/vscode/vs/workbench/contrib/timeline/common/timeline.service';
+import { TimelineService } from './vscode/src/vs/workbench/contrib/timeline/common/timelineService.js';
+
+function getServiceOverride() {
+    return {
+        [ITimelineService.toString()]: new SyncDescriptor(TimelineService, [], true)
+    };
+}
+
+export { getServiceOverride as default };

package/package.json

@@ -1,6 +1,8 @@
 {
   "name": "@codingame/monaco-vscode-timeline-service-override",
-  "version": "11.1.1",
+  "version": "12.0.0",
+  "private": false,
+  "description": "VSCode public API plugged on the monaco editor - timeline service-override",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -12,8 +14,22 @@
     "url": "git+ssh://git@github.com/CodinGame/monaco-vscode-api.git"
   },
   "type": "module",
-  "private": false,
-  "description": "VSCode public API plugged on the monaco editor - timeline service-override",
+  "dependencies": {
+    "@codingame/monaco-vscode-65619f8f-0eab-5d8b-855a-43b6353fe527-common": "12.0.0",
+    "@codingame/monaco-vscode-b71b5434-ce96-5581-8993-e8da380bd63f-common": "12.0.0",
+    "@codingame/monaco-vscode-cc9ccbec-e2a1-599d-84ae-46f5efc666e3-common": "12.0.0",
+    "@codingame/monaco-vscode-d6e33d82-c101-549d-a885-0807ab3e0cfb-common": "12.0.0",
+    "@codingame/monaco-vscode-f48982c4-9e82-55e2-b800-20e6d1e6096f-common": "12.0.0",
+    "vscode": "npm:@codingame/monaco-vscode-api@12.0.0"
+  },
+  "peerDependencies": {
+    "@codingame/monaco-vscode-working-copy-service-override": "12.0.0"
+  },
+  "peerDependenciesMeta": {
+    "@codingame/monaco-vscode-working-copy-service-override": {
+      "optional": true
+    }
+  },
   "main": "index.js",
   "module": "index.js",
   "types": "index.d.ts",
@@ -22,10 +38,12 @@
       "default": "./index.js"
     },
     "./vscode/*": {
-      "default": "./vscode/src/*.js"
+      "default": "./vscode/src/*.js",
+      "types": "./vscode/src/*.d.ts"
+    },
+    "./*": {
+      "default": "./*.js",
+      "types": "./*.d.ts"
     }
-  },
-  "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@11.1.1"
   }
 }

package/vscode/src/vs/workbench/contrib/localHistory/browser/localHistory.contribution.d.ts

@@ -0,0 +1 @@
+

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

@@ -1,5 +1,6 @@
+
 import './localHistoryCommands.js';
-import { registerWorkbenchContribution2 } from 'vscode/vscode/vs/workbench/common/contributions';
+import { registerWorkbenchContribution2, WorkbenchPhase } from 'vscode/vscode/vs/workbench/common/contributions';
 import { LocalHistoryTimeline } from './localHistoryTimeline.js';
 
-registerWorkbenchContribution2(LocalHistoryTimeline.ID, LocalHistoryTimeline, 2 );
+registerWorkbenchContribution2(LocalHistoryTimeline.ID, LocalHistoryTimeline, WorkbenchPhase.BlockRestore );

package/vscode/src/vs/workbench/contrib/localHistory/browser/localHistory.d.ts

@@ -0,0 +1,9 @@
+interface ILocalHistoryDateFormatter {
+    format: (timestamp: number) => string;
+}
+export declare function getLocalHistoryDateFormatter(): ILocalHistoryDateFormatter;
+export declare const LOCAL_HISTORY_MENU_CONTEXT_VALUE = "localHistory:item";
+export declare const LOCAL_HISTORY_MENU_CONTEXT_KEY: import("vscode/vscode/vs/platform/contextkey/common/contextkey").ContextKeyExpression;
+export declare const LOCAL_HISTORY_ICON_ENTRY: import("vscode/vscode/vs/base/common/themables").ThemeIcon;
+export declare const LOCAL_HISTORY_ICON_RESTORE: import("vscode/vscode/vs/base/common/themables").ThemeIcon;
+export {};

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

@@ -1,20 +1,16 @@
+
 import { localize } from 'vscode/vscode/vs/nls';
 import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
 import { language } from 'vscode/vscode/vs/base/common/platform';
 import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { registerIcon } from 'vscode/vscode/vs/platform/theme/common/iconRegistry';
+import { safeIntl } from 'vscode/vscode/vs/base/common/date';
 
 let localHistoryDateFormatter = undefined;
 function getLocalHistoryDateFormatter() {
     if (!localHistoryDateFormatter) {
         const options = { year: 'numeric', month: 'long', day: 'numeric', hour: 'numeric', minute: 'numeric' };
-        let formatter;
-        try {
-            formatter = new Intl.DateTimeFormat(language, options);
-        }
-        catch (error) {
-            formatter = new Intl.DateTimeFormat(undefined, options);
-        }
+        const formatter = safeIntl.DateTimeFormat(language, options);
         localHistoryDateFormatter = {
             format: date => formatter.format(date)
         };
@@ -22,8 +18,8 @@ function getLocalHistoryDateFormatter() {
     return localHistoryDateFormatter;
 }
 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(10721, "Icon for a local history entry in the timeline view.")));
-const LOCAL_HISTORY_ICON_RESTORE = registerIcon('localHistory-restore', Codicon.check, ( localize(10722, "Icon for restoring contents of a local history entry.")));
+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(6960, "Icon for a local history entry in the timeline view.")));
+const LOCAL_HISTORY_ICON_RESTORE = registerIcon('localHistory-restore', Codicon.check, ( localize(6961, "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.d.ts

@@ -0,0 +1,15 @@
+import { URI } from "vscode/vscode/vs/base/common/uri";
+import { IWorkingCopyHistoryEntry } from "@codingame/monaco-vscode-working-copy-service-override/vscode/vs/workbench/services/workingCopy/common/workingCopyHistory";
+import { IWorkingCopyHistoryService } from "vscode/vscode/vs/workbench/services/workingCopy/common/workingCopyHistory.service";
+import { IEditorOptions } from "vscode/vscode/vs/platform/editor/common/editor";
+export interface ITimelineCommandArgument {
+    uri: URI;
+    handle: string;
+}
+export declare const COMPARE_WITH_FILE_LABEL: import("vscode/vscode/vs/nls").ILocalizedString;
+export declare function toDiffEditorArguments(entry: IWorkingCopyHistoryEntry, resource: URI, options?: IEditorOptions): unknown[];
+export declare function toDiffEditorArguments(previousEntry: IWorkingCopyHistoryEntry, entry: IWorkingCopyHistoryEntry, options?: IEditorOptions): unknown[];
+export declare function findLocalHistoryEntry(workingCopyHistoryService: IWorkingCopyHistoryService, descriptor: ITimelineCommandArgument): Promise<{
+    entry: IWorkingCopyHistoryEntry | undefined;
+    previous: IWorkingCopyHistoryEntry | undefined;
+}>;

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

@@ -1,3 +1,4 @@
+
 import { localize2, localize } from 'vscode/vscode/vs/nls';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
 import { Event } from 'vscode/vscode/vs/base/common/event';
@@ -5,7 +6,7 @@ import { Schemas } from 'vscode/vscode/vs/base/common/network';
 import { toErrorMessage } from 'vscode/vscode/vs/base/common/errorMessage';
 import { CancellationToken, CancellationTokenSource } from 'vscode/vscode/vs/base/common/cancellation';
 import { IWorkingCopyHistoryService } from 'vscode/vscode/vs/workbench/services/workingCopy/common/workingCopyHistory.service';
-import { API_OPEN_DIFF_EDITOR_COMMAND_ID } from 'vscode/vscode/vs/workbench/browser/parts/editor/editorCommands';
+import { API_OPEN_DIFF_EDITOR_COMMAND_ID } from '@codingame/monaco-vscode-f48982c4-9e82-55e2-b800-20e6d1e6096f-common/vscode/vs/workbench/browser/parts/editor/editorCommands';
 import { LocalHistoryFileSystemProvider } from './localHistoryFileSystemProvider.js';
 import { ContextKeyExpr, RawContextKey } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
@@ -30,9 +31,9 @@ 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(6614, 'Local History'));
-const CTX_LOCAL_HISTORY_ENABLED = ( (ContextKeyExpr.has('config.workbench.localHistory.enabled')));
-const COMPARE_WITH_FILE_LABEL = ( localize2(6615, 'Compare with File'));
+const LOCAL_HISTORY_CATEGORY = ( localize2(6962, 'Local History'));
+const CTX_LOCAL_HISTORY_ENABLED = ( ContextKeyExpr.has('config.workbench.localHistory.enabled'));
+const COMPARE_WITH_FILE_LABEL = ( localize2(6963, 'Compare with File'));
 registerAction2(class extends Action2 {
     constructor() {
         super({
@@ -59,7 +60,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.localHistory.compareWithPrevious',
-            title: ( localize2(6616, 'Compare with Previous')),
+            title: ( localize2(6964, 'Compare with Previous')),
             menu: {
                 id: MenuId.TimelineItemContext,
                 group: '1_compare',
@@ -82,12 +83,12 @@ registerAction2(class extends Action2 {
     }
 });
 let itemSelectedForCompare = undefined;
-const LocalHistoryItemSelectedForCompare = ( (new RawContextKey('localHistoryItemSelectedForCompare', false, true)));
+const LocalHistoryItemSelectedForCompare = ( new RawContextKey('localHistoryItemSelectedForCompare', false, true));
 registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.localHistory.selectForCompare',
-            title: ( localize2(6617, 'Select for Compare')),
+            title: ( localize2(6965, 'Select for Compare')),
             menu: {
                 id: MenuId.TimelineItemContext,
                 group: '2_compare_with',
@@ -110,12 +111,12 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.localHistory.compareWithSelected',
-            title: ( localize2(6618, 'Compare with Selected')),
+            title: ( localize2(6966, 'Compare with Selected')),
             menu: {
                 id: MenuId.TimelineItemContext,
                 group: '2_compare_with',
                 order: 1,
-                when: ( (ContextKeyExpr.and(LOCAL_HISTORY_MENU_CONTEXT_KEY, LocalHistoryItemSelectedForCompare)))
+                when: ( ContextKeyExpr.and(LOCAL_HISTORY_MENU_CONTEXT_KEY, LocalHistoryItemSelectedForCompare))
             }
         });
     }
@@ -139,7 +140,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.localHistory.open',
-            title: ( localize2(6619, 'Show Contents')),
+            title: ( localize2(6967, 'Show Contents')),
             menu: {
                 id: MenuId.TimelineItemContext,
                 group: '3_contents',
@@ -157,7 +158,7 @@ registerAction2(class extends Action2 {
         }
     }
 });
-const RESTORE_CONTENTS_LABEL = ( localize2(6620, 'Restore Contents'));
+const RESTORE_CONTENTS_LABEL = ( localize2(6968, 'Restore Contents'));
 registerAction2(class extends Action2 {
     constructor() {
         super({
@@ -167,7 +168,7 @@ registerAction2(class extends Action2 {
                 id: MenuId.EditorTitle,
                 group: 'navigation',
                 order: -10,
-                when: ( (ResourceContextKey.Scheme.isEqualTo(LocalHistoryFileSystemProvider.SCHEMA)))
+                when: ( ResourceContextKey.Scheme.isEqualTo(LocalHistoryFileSystemProvider.SCHEMA))
             },
             icon: LOCAL_HISTORY_ICON_RESTORE
         });
@@ -194,7 +195,7 @@ registerAction2(class extends Action2 {
         return restore(accessor, item);
     }
 });
-const restoreSaveSource = SaveSourceRegistry.registerSource('localHistoryRestore.source', ( localize(6621, "File Restored")));
+const restoreSaveSource = SaveSourceRegistry.registerSource('localHistoryRestore.source', ( localize(6969, "File Restored")));
 async function restore(accessor, item) {
     const fileService = accessor.get(IFileService);
     const dialogService = accessor.get(IDialogService);
@@ -206,12 +207,12 @@ async function restore(accessor, item) {
         const { confirmed } = await dialogService.confirm({
             type: 'warning',
             message: ( localize(
-                6622,
+                6970,
                 "Do you want to restore the contents of '{0}'?",
                 basename(entry.workingCopy.resource)
             )),
-            detail: ( localize(6623, "Restoring will discard any unsaved changes.")),
-            primaryButton: ( localize(6624, "&&Restore"))
+            detail: ( localize(6971, "Restoring will discard any unsaved changes.")),
+            primaryButton: ( localize(6972, "&&Restore"))
         });
         if (!confirmed) {
             return;
@@ -228,7 +229,7 @@ async function restore(accessor, item) {
             await fileService.cloneFile(entry.location, entry.workingCopy.resource);
         }
         catch (error) {
-            await dialogService.error(( localize(6625, "Unable to restore '{0}'.", basename(entry.workingCopy.resource))), toErrorMessage(error));
+            await dialogService.error(( localize(6973, "Unable to restore '{0}'.", basename(entry.workingCopy.resource))), toErrorMessage(error));
             return;
         }
         if (workingCopies) {
@@ -248,7 +249,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.localHistory.restoreViaPicker',
-            title: ( localize2(6626, 'Find Entry to Restore')),
+            title: ( localize2(6974, 'Find Entry to Restore')),
             f1: true,
             category: LOCAL_HISTORY_CATEGORY,
             precondition: CTX_LOCAL_HISTORY_ENABLED
@@ -264,57 +265,55 @@ registerAction2(class extends Action2 {
         const fileService = accessor.get(IFileService);
         const commandService = accessor.get(ICommandService);
         const historyService = accessor.get(IHistoryService);
-        const resourcePickerDisposables = ( (new DisposableStore()));
+        const resourcePickerDisposables = ( new DisposableStore());
         const resourcePicker = resourcePickerDisposables.add(quickInputService.createQuickPick());
-        let cts = ( (new CancellationTokenSource()));
+        let cts = ( new CancellationTokenSource());
         resourcePickerDisposables.add(resourcePicker.onDidHide(() => cts.dispose(true)));
         resourcePicker.busy = true;
         resourcePicker.show();
-        const resources = ( (new ResourceSet(await workingCopyHistoryService.getAll(cts.token))));
-        const recentEditorResources = ( (new ResourceSet(
-            coalesce(( (historyService.getHistory().map(({ resource }) => resource))))
-        )));
+        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)))) {
+            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(6627, "Select the file to show local history for"));
+        resourcePicker.placeholder = ( localize(6975, "Select the file to show local history for"));
         resourcePicker.matchOnLabel = true;
         resourcePicker.matchOnDescription = true;
-        resourcePicker.items = ( ([...resourcesSortedByRecency].map(resource => ({
+        resourcePicker.items = ( [...resourcesSortedByRecency].map(resource => ({
             resource,
             label: basenameOrAuthority(resource),
             description: labelService.getUriLabel(dirname(resource), { relative: true }),
             iconClasses: getIconClasses(modelService, languageService, resource)
-        }))));
+        })));
         await Event.toPromise(resourcePicker.onDidAccept);
         resourcePickerDisposables.dispose();
         const resource = resourcePicker.selectedItems.at(0)?.resource;
         if (!resource) {
             return;
         }
-        const entryPickerDisposables = ( (new DisposableStore()));
+        const entryPickerDisposables = ( new DisposableStore());
         const entryPicker = entryPickerDisposables.add(quickInputService.createQuickPick());
-        cts = ( (new CancellationTokenSource()));
+        cts = ( new CancellationTokenSource());
         entryPickerDisposables.add(entryPicker.onDidHide(() => cts.dispose(true)));
         entryPicker.busy = true;
         entryPicker.show();
         const entries = await workingCopyHistoryService.getEntries(resource, cts.token);
         entryPicker.busy = false;
         entryPicker.canAcceptInBackground = true;
-        entryPicker.placeholder = ( localize(6628, "Select the local history entry to open"));
+        entryPicker.placeholder = ( localize(6976, "Select the local history entry to open"));
         entryPicker.matchOnLabel = true;
         entryPicker.matchOnDescription = true;
-        entryPicker.items = ( (Array.from(entries).reverse().map(entry => ({
+        entryPicker.items = ( Array.from(entries).reverse().map(entry => ({
             entry,
             label: `$(circle-outline) ${SaveSourceRegistry.getSourceLabel(entry.source)}`,
             description: toLocalHistoryEntryDateLabel(entry.timestamp)
-        }))));
+        })));
         entryPickerDisposables.add(entryPicker.onDidAccept(async (e) => {
             if (!e.inBackground) {
                 entryPickerDisposables.dispose();
@@ -331,12 +330,12 @@ registerAction2(class extends Action2 {
         }));
     }
 });
-MenuRegistry.appendMenuItem(MenuId.TimelineTitle, { command: { id: 'workbench.action.localHistory.restoreViaPicker', title: ( localize2(6629, '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(6977, '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(6630, 'Rename')),
+            title: ( localize2(6978, 'Rename')),
             menu: {
                 id: MenuId.TimelineItemContext,
                 group: '5_edit',
@@ -350,11 +349,11 @@ registerAction2(class extends Action2 {
         const quickInputService = accessor.get(IQuickInputService);
         const { entry } = await findLocalHistoryEntry(workingCopyHistoryService, item);
         if (entry) {
-            const disposables = ( (new DisposableStore()));
+            const disposables = ( new DisposableStore());
             const inputBox = disposables.add(quickInputService.createInputBox());
-            inputBox.title = ( localize(6631, "Rename Local History Entry"));
+            inputBox.title = ( localize(6979, "Rename Local History Entry"));
             inputBox.ignoreFocusOut = true;
-            inputBox.placeholder = ( localize(6632, "Enter the new name of the local history entry"));
+            inputBox.placeholder = ( localize(6980, "Enter the new name of the local history entry"));
             inputBox.value = SaveSourceRegistry.getSourceLabel(entry.source);
             inputBox.show();
             disposables.add(inputBox.onDidAccept(() => {
@@ -370,7 +369,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.localHistory.delete',
-            title: ( localize2(6633, 'Delete')),
+            title: ( localize2(6981, 'Delete')),
             menu: {
                 id: MenuId.TimelineItemContext,
                 group: '5_edit',
@@ -388,13 +387,13 @@ registerAction2(class extends Action2 {
             const { confirmed } = await dialogService.confirm({
                 type: 'warning',
                 message: ( localize(
-                    6634,
+                    6982,
                     "Do you want to delete the local history entry of '{0}' from {1}?",
                     entry.workingCopy.name,
                     toLocalHistoryEntryDateLabel(entry.timestamp)
                 )),
-                detail: ( localize(6635, "This action is irreversible!")),
-                primaryButton: ( localize(6636, "&&Delete")),
+                detail: ( localize(6983, "This action is irreversible!")),
+                primaryButton: ( localize(6984, "&&Delete")),
             });
             if (!confirmed) {
                 return;
@@ -408,7 +407,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.localHistory.deleteAll',
-            title: ( localize2(6637, 'Delete All')),
+            title: ( localize2(6985, 'Delete All')),
             f1: true,
             category: LOCAL_HISTORY_CATEGORY,
             precondition: CTX_LOCAL_HISTORY_ENABLED
@@ -419,9 +418,9 @@ registerAction2(class extends Action2 {
         const workingCopyHistoryService = accessor.get(IWorkingCopyHistoryService);
         const { confirmed } = await dialogService.confirm({
             type: 'warning',
-            message: ( localize(6638, "Do you want to delete all entries of all files in local history?")),
-            detail: ( localize(6639, "This action is irreversible!")),
-            primaryButton: ( localize(6640, "&&Delete All")),
+            message: ( localize(6986, "Do you want to delete all entries of all files in local history?")),
+            detail: ( localize(6987, "This action is irreversible!")),
+            primaryButton: ( localize(6988, "&&Delete All")),
         });
         if (!confirmed) {
             return;
@@ -433,10 +432,10 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.localHistory.create',
-            title: ( localize2(6641, 'Create Entry')),
+            title: ( localize2(6989, 'Create Entry')),
             f1: true,
             category: LOCAL_HISTORY_CATEGORY,
-            precondition: ( (ContextKeyExpr.and(CTX_LOCAL_HISTORY_ENABLED, ActiveEditorContext)))
+            precondition: ( ContextKeyExpr.and(CTX_LOCAL_HISTORY_ENABLED, ActiveEditorContext))
         });
     }
     async run(accessor) {
@@ -449,12 +448,12 @@ registerAction2(class extends Action2 {
         if (resource?.scheme !== pathService.defaultUriScheme && resource?.scheme !== Schemas.vscodeUserData) {
             return;
         }
-        const disposables = ( (new DisposableStore()));
+        const disposables = ( new DisposableStore());
         const inputBox = disposables.add(quickInputService.createInputBox());
-        inputBox.title = ( localize(6642, "Create Local History Entry"));
+        inputBox.title = ( localize(6990, "Create Local History Entry"));
         inputBox.ignoreFocusOut = true;
         inputBox.placeholder = ( localize(
-            6643,
+            6991,
             "Enter the new name of the local history entry for '{0}'",
             labelService.getUriBasenameLabel(resource)
         ));
@@ -473,7 +472,7 @@ async function openEntry(entry, editorService, options) {
     await editorService.openEditor({
         resource,
         label: ( localize(
-            6644,
+            6992,
             "{0} ({1} • {2})",
             entry.workingCopy.name,
             SaveSourceRegistry.getSourceLabel(entry.source),
@@ -495,7 +494,7 @@ function toDiffEditorArguments(arg1, arg2, options) {
         const resource = arg2;
         modifiedResource = resource;
         label = ( localize(
-            6645,
+            6993,
             "{0} ({1} • {2}) ↔ {3}",
             arg1.workingCopy.name,
             SaveSourceRegistry.getSourceLabel(arg1.source),
@@ -507,7 +506,7 @@ function toDiffEditorArguments(arg1, arg2, options) {
         const modified = arg2;
         modifiedResource = LocalHistoryFileSystemProvider.toLocalHistoryFileSystem({ location: modified.location, associatedResource: modified.workingCopy.resource });
         label = ( localize(
-            6646,
+            6994,
             "{0} ({1} • {2}) ↔ {3} ({4} • {5})",
             arg1.workingCopy.name,
             SaveSourceRegistry.getSourceLabel(arg1.source),

package/vscode/src/vs/workbench/contrib/localHistory/browser/localHistoryFileSystemProvider.d.ts

@@ -0,0 +1,35 @@
+import { Event } from "vscode/vscode/vs/base/common/event";
+import { IDisposable } from "vscode/vscode/vs/base/common/lifecycle";
+import { URI } from "vscode/vscode/vs/base/common/uri";
+import { IFileDeleteOptions, IFileOverwriteOptions, FileType, IFileWriteOptions, IFileSystemProvider, IFileSystemProviderWithFileReadWriteCapability, IStat, IWatchOptions } from "vscode/vscode/vs/platform/files/common/files";
+import { IFileService } from "vscode/vscode/vs/platform/files/common/files.service";
+interface ILocalHistoryResource {
+    readonly location: URI;
+    readonly associatedResource: URI;
+}
+export declare class LocalHistoryFileSystemProvider implements IFileSystemProvider, IFileSystemProviderWithFileReadWriteCapability {
+    private readonly fileService;
+    static readonly SCHEMA = "vscode-local-history";
+    static toLocalHistoryFileSystem(resource: ILocalHistoryResource): URI;
+    static fromLocalHistoryFileSystem(resource: URI): ILocalHistoryResource;
+    private static readonly EMPTY_RESOURCE;
+    static readonly EMPTY: ILocalHistoryResource;
+    get capabilities(): number;
+    constructor(fileService: IFileService);
+    private readonly mapSchemeToProvider;
+    private withProvider;
+    stat(resource: URI): Promise<IStat>;
+    readFile(resource: URI): Promise<Uint8Array>;
+    readonly onDidChangeCapabilities: Event<any>;
+    readonly onDidChangeFile: Event<any>;
+    writeFile(resource: URI, content: Uint8Array, opts: IFileWriteOptions): Promise<void>;
+    mkdir(resource: URI): Promise<void>;
+    readdir(resource: URI): Promise<[
+        string,
+        FileType
+    ][]>;
+    rename(from: URI, to: URI, opts: IFileOverwriteOptions): Promise<void>;
+    delete(resource: URI, opts: IFileDeleteOptions): Promise<void>;
+    watch(resource: URI, opts: IWatchOptions): IDisposable;
+}
+export {};

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

@@ -1,7 +1,8 @@
+
 import { Event } from 'vscode/vscode/vs/base/common/event';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
-import { FileType, hasReadWriteCapability } from 'vscode/vscode/vs/platform/files/common/files';
+import { FileSystemProviderCapabilities, FileType, hasReadWriteCapability } from 'vscode/vscode/vs/platform/files/common/files';
 import { isEqual } from 'vscode/vscode/vs/base/common/resources';
 import { VSBuffer } from 'vscode/vscode/vs/base/common/buffer';
 
@@ -30,7 +31,7 @@ class LocalHistoryFileSystemProvider {
         associatedResource: LocalHistoryFileSystemProvider.EMPTY_RESOURCE
     }; }
     get capabilities() {
-        return 2  | 2048 ;
+        return FileSystemProviderCapabilities.FileReadWrite | FileSystemProviderCapabilities.Readonly;
     }
     constructor(fileService) {
         this.fileService = fileService;

package/vscode/src/vs/workbench/contrib/localHistory/browser/localHistoryTimeline.d.ts

@@ -0,0 +1,36 @@
+import { CancellationToken } from "vscode/vscode/vs/base/common/cancellation";
+import { Disposable } from "vscode/vscode/vs/base/common/lifecycle";
+import { IWorkbenchContribution } from "vscode/vscode/vs/workbench/common/contributions";
+import { Timeline, TimelineChangeEvent, TimelineOptions, TimelineProvider } from "vscode/vscode/vs/workbench/contrib/timeline/common/timeline";
+import { ITimelineService } from "vscode/vscode/vs/workbench/contrib/timeline/common/timeline.service";
+import { IWorkingCopyHistoryService } from "vscode/vscode/vs/workbench/services/workingCopy/common/workingCopyHistory.service";
+import { URI } from "vscode/vscode/vs/base/common/uri";
+import { IPathService } from "vscode/vscode/vs/workbench/services/path/common/pathService.service";
+import { IFileService } from "vscode/vscode/vs/platform/files/common/files.service";
+import { IWorkbenchEnvironmentService } from "vscode/vscode/vs/workbench/services/environment/common/environmentService.service";
+import { IConfigurationService } from "vscode/vscode/vs/platform/configuration/common/configuration.service";
+import { IWorkspaceContextService } from "vscode/vscode/vs/platform/workspace/common/workspace.service";
+export declare class LocalHistoryTimeline extends Disposable implements IWorkbenchContribution, TimelineProvider {
+    private readonly timelineService;
+    private readonly workingCopyHistoryService;
+    private readonly pathService;
+    private readonly fileService;
+    private readonly environmentService;
+    private readonly configurationService;
+    private readonly contextService;
+    static readonly ID = "workbench.contrib.localHistoryTimeline";
+    private static readonly LOCAL_HISTORY_ENABLED_SETTINGS_KEY;
+    readonly id = "timeline.localHistory";
+    readonly label: string;
+    readonly scheme = "*";
+    private readonly _onDidChange;
+    readonly onDidChange: import("vscode/vscode/vs/base/common/event").Event<TimelineChangeEvent>;
+    private readonly timelineProviderDisposable;
+    constructor(timelineService: ITimelineService, workingCopyHistoryService: IWorkingCopyHistoryService, pathService: IPathService, fileService: IFileService, environmentService: IWorkbenchEnvironmentService, configurationService: IConfigurationService, contextService: IWorkspaceContextService);
+    private registerComponents;
+    private updateTimelineRegistration;
+    private registerListeners;
+    private onDidChangeWorkingCopyHistoryEntry;
+    provideTimeline(uri: URI, options: TimelineOptions, token: CancellationToken): Promise<Timeline>;
+    private toTimelineItem;
+}