@codingame/monaco-vscode-edit-sessions-service-override 11.1.2 → 12.0.0

package/vscode/src/vs/workbench/contrib/editSessions/browser/editSessionsViews.js

@@ -1,17 +1,18 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { localize } from 'vscode/vscode/vs/nls';
 import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
-import { TreeView, TreeViewPane } from 'vscode/vscode/vs/workbench/browser/parts/views/treeView';
+import { TreeView, TreeViewPane } from '@codingame/monaco-vscode-4a316137-39d1-5d77-8b53-112db3547c1e-common/vscode/vs/workbench/browser/parts/views/treeView';
 import { Extensions, TreeItemCollapsibleState } from 'vscode/vscode/vs/workbench/common/views';
 import { EDIT_SESSIONS_DATA_VIEW_ID, EDIT_SESSIONS_TITLE, EDIT_SESSIONS_SHOW_VIEW, EDIT_SESSIONS_SCHEME, ChangeType } from '../common/editSessions.js';
 import { IEditSessionsStorageService } from 'vscode/vscode/vs/workbench/contrib/editSessions/common/editSessions.service';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
 import { fromNow } from 'vscode/vscode/vs/base/common/date';
 import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
-import { API_OPEN_EDITOR_COMMAND_ID } from 'vscode/vscode/vs/workbench/browser/parts/editor/editorCommands';
+import { API_OPEN_EDITOR_COMMAND_ID } from '@codingame/monaco-vscode-f48982c4-9e82-55e2-b800-20e6d1e6096f-common/vscode/vs/workbench/browser/parts/editor/editorCommands';
 import { registerAction2, Action2, MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { RawContextKey, ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
@@ -23,7 +24,7 @@ import { IFileService } from 'vscode/vscode/vs/platform/files/common/files.servi
 import { basename } from 'vscode/vscode/vs/base/common/path';
 
 const EDIT_SESSIONS_COUNT_KEY = 'editSessionsCount';
-const EDIT_SESSIONS_COUNT_CONTEXT_KEY = ( (new RawContextKey(EDIT_SESSIONS_COUNT_KEY, 0)));
+const EDIT_SESSIONS_COUNT_CONTEXT_KEY = ( new RawContextKey(EDIT_SESSIONS_COUNT_KEY, 0));
 let EditSessionsDataViews = class EditSessionsDataViews extends Disposable {
     constructor(container, instantiationService) {
         super();
@@ -36,46 +37,43 @@ let EditSessionsDataViews = class EditSessionsDataViews extends Disposable {
         treeView.showCollapseAllAction = true;
         treeView.showRefreshAction = true;
         treeView.dataProvider = this.instantiationService.createInstance(EditSessionDataViewDataProvider);
-        const viewsRegistry = ( (Registry.as(Extensions.ViewsRegistry)));
+        const viewsRegistry = ( Registry.as(Extensions.ViewsRegistry));
         viewsRegistry.registerViews([{
                 id: viewId,
                 name: EDIT_SESSIONS_TITLE,
-                ctorDescriptor: ( (new SyncDescriptor(TreeViewPane))),
+                ctorDescriptor: ( new SyncDescriptor(TreeViewPane)),
                 canToggleVisibility: true,
                 canMoveView: false,
                 treeView,
                 collapsed: false,
-                when: ( (ContextKeyExpr.and(EDIT_SESSIONS_SHOW_VIEW))),
+                when: ( ContextKeyExpr.and(EDIT_SESSIONS_SHOW_VIEW)),
                 order: 100,
                 hideByDefault: true,
             }], container);
         viewsRegistry.registerViewWelcomeContent(viewId, {
             content: ( localize(
-                5703,
+                5701,
                 'You have no stored changes in the cloud to display.\n{0}',
-                `[${( localize(5704, 'Store Working Changes'))}](command:workbench.editSessions.actions.store)`
+                `[${( localize(5702, 'Store Working Changes'))}](command:workbench.editSessions.actions.store)`
             )),
-            when: ( (ContextKeyExpr.equals(EDIT_SESSIONS_COUNT_KEY, 0))),
+            when: ( ContextKeyExpr.equals(EDIT_SESSIONS_COUNT_KEY, 0)),
             order: 1
         });
         this._register(registerAction2(class extends Action2 {
             constructor() {
                 super({
                     id: 'workbench.editSessions.actions.resume',
-                    title: ( localize(5705, "Resume Working Changes")),
+                    title: ( localize(5703, "Resume Working Changes")),
                     icon: Codicon.desktopDownload,
                     menu: {
                         id: MenuId.ViewItemContext,
-                        when: ( (ContextKeyExpr.and(
-                             (ContextKeyExpr.equals('view', viewId)),
-                             (ContextKeyExpr.regex('viewItem', /edit-session/i))
-                        ))),
+                        when: ( ContextKeyExpr.and(( ContextKeyExpr.equals('view', viewId)), ( ContextKeyExpr.regex('viewItem', /edit-session/i)))),
                         group: 'inline'
                     }
                 });
             }
             async run(accessor, handle) {
-                const editSessionId = ( (URI.parse(handle.$treeItemHandle))).path.substring(1);
+                const editSessionId = ( URI.parse(handle.$treeItemHandle)).path.substring(1);
                 const commandService = accessor.get(ICommandService);
                 await commandService.executeCommand('workbench.editSessions.actions.resumeLatest', editSessionId, true);
                 await treeView.refresh();
@@ -85,7 +83,7 @@ let EditSessionsDataViews = class EditSessionsDataViews extends Disposable {
             constructor() {
                 super({
                     id: 'workbench.editSessions.actions.store',
-                    title: ( localize(5706, "Store Working Changes")),
+                    title: ( localize(5704, "Store Working Changes")),
                     icon: Codicon.cloudUpload,
                 });
             }
@@ -99,29 +97,26 @@ let EditSessionsDataViews = class EditSessionsDataViews extends Disposable {
             constructor() {
                 super({
                     id: 'workbench.editSessions.actions.delete',
-                    title: ( localize(5707, "Delete Working Changes")),
+                    title: ( localize(5705, "Delete Working Changes")),
                     icon: Codicon.trash,
                     menu: {
                         id: MenuId.ViewItemContext,
-                        when: ( (ContextKeyExpr.and(
-                             (ContextKeyExpr.equals('view', viewId)),
-                             (ContextKeyExpr.regex('viewItem', /edit-session/i))
-                        ))),
+                        when: ( ContextKeyExpr.and(( ContextKeyExpr.equals('view', viewId)), ( ContextKeyExpr.regex('viewItem', /edit-session/i)))),
                         group: 'inline'
                     }
                 });
             }
             async run(accessor, handle) {
-                const editSessionId = ( (URI.parse(handle.$treeItemHandle))).path.substring(1);
+                const editSessionId = ( URI.parse(handle.$treeItemHandle)).path.substring(1);
                 const dialogService = accessor.get(IDialogService);
                 const editSessionStorageService = accessor.get(IEditSessionsStorageService);
                 const result = await dialogService.confirm({
                     message: ( localize(
-                        5708,
+                        5706,
                         'Are you sure you want to permanently delete your working changes with ref {0}?',
                         editSessionId
                     )),
-                    detail: ( localize(5709, ' You cannot undo this action.')),
+                    detail: ( localize(5707, ' You cannot undo this action.')),
                     type: 'warning',
                     title: EDIT_SESSIONS_TITLE.value
                 });
@@ -135,14 +130,11 @@ let EditSessionsDataViews = class EditSessionsDataViews extends Disposable {
             constructor() {
                 super({
                     id: 'workbench.editSessions.actions.deleteAll',
-                    title: ( localize(5710, "Delete All Working Changes from Cloud")),
+                    title: ( localize(5708, "Delete All Working Changes from Cloud")),
                     icon: Codicon.trash,
                     menu: {
                         id: MenuId.ViewTitle,
-                        when: ( (ContextKeyExpr.and(
-                             (ContextKeyExpr.equals('view', viewId)),
-                            ContextKeyExpr.greater(EDIT_SESSIONS_COUNT_KEY, 0)
-                        ))),
+                        when: ( ContextKeyExpr.and(( ContextKeyExpr.equals('view', viewId)), ContextKeyExpr.greater(EDIT_SESSIONS_COUNT_KEY, 0))),
                     }
                 });
             }
@@ -151,10 +143,10 @@ let EditSessionsDataViews = class EditSessionsDataViews extends Disposable {
                 const editSessionStorageService = accessor.get(IEditSessionsStorageService);
                 const result = await dialogService.confirm({
                     message: ( localize(
-                        5711,
+                        5709,
                         'Are you sure you want to permanently delete all stored changes from the cloud?'
                     )),
-                    detail: ( localize(5712, ' You cannot undo this action.')),
+                    detail: ( localize(5710, ' You cannot undo this action.')),
                     type: 'warning',
                     title: EDIT_SESSIONS_TITLE.value
                 });
@@ -166,9 +158,9 @@ let EditSessionsDataViews = class EditSessionsDataViews extends Disposable {
         }));
     }
 };
-EditSessionsDataViews = ( (__decorate([
-    ( (__param(1, IInstantiationService)))
-], EditSessionsDataViews)));
+EditSessionsDataViews = ( __decorate([
+    ( __param(1, IInstantiationService))
+], EditSessionsDataViews));
 let EditSessionDataViewDataProvider = class EditSessionDataViewDataProvider {
     constructor(editSessionsStorageService, contextKeyService, workspaceContextService, fileService) {
         this.editSessionsStorageService = editSessionsStorageService;
@@ -181,7 +173,7 @@ let EditSessionDataViewDataProvider = class EditSessionDataViewDataProvider {
         if (!element) {
             return this.getAllEditSessions();
         }
-        const [ref, folderName, filePath] = ( (URI.parse(element.handle))).path.substring(1).split('/');
+        const [ref, folderName, filePath] = ( URI.parse(element.handle)).path.substring(1).split('/');
         if (ref && !folderName) {
             return this.getEditSession(ref);
         }
@@ -195,20 +187,20 @@ let EditSessionDataViewDataProvider = class EditSessionDataViewDataProvider {
         this.editSessionsCount.set(allEditSessions.length);
         const editSessions = [];
         for (const session of allEditSessions) {
-            const resource = ( (URI.from(
+            const resource = ( URI.from(
                 { scheme: EDIT_SESSIONS_SCHEME, authority: 'remote-session-content', path: `/${session.ref}` }
-            )));
+            ));
             const sessionData = await this.editSessionsStorageService.read('editSessions', session.ref);
             if (!sessionData) {
                 continue;
             }
             const content = JSON.parse(sessionData.content);
-            const label = ( (content.folders.map((folder) => folder.name))).join(', ') ?? session.ref;
+            const label = ( content.folders.map((folder) => folder.name)).join(', ') ?? session.ref;
             const machineId = content.machine;
             const machineName = machineId ? await this.editSessionsStorageService.getMachineById(machineId) : undefined;
             const description = machineName === undefined ? fromNow(session.created, true) : `${fromNow(session.created, true)}\u00a0\u00a0\u2022\u00a0\u00a0${machineName}`;
             editSessions.push({
-                handle: ( (resource.toString())),
+                handle: ( resource.toString()),
                 collapsibleState: TreeItemCollapsibleState.Collapsed,
                 label: { label },
                 description: description,
@@ -228,19 +220,17 @@ let EditSessionDataViewDataProvider = class EditSessionDataViewDataProvider {
             const folder = content.folders[0];
             return this.getEditSessionFolderContents(ref, folder.name);
         }
-        return (
-             (content.folders.map((folder) => {
-                const resource = ( (URI.from(
-                    { scheme: EDIT_SESSIONS_SCHEME, authority: 'remote-session-content', path: `/${data.ref}/${folder.name}` }
-                )));
-                return {
-                    handle: ( (resource.toString())),
-                    collapsibleState: TreeItemCollapsibleState.Collapsed,
-                    label: { label: folder.name },
-                    themeIcon: Codicon.folder
-                };
-            }))
-        );
+        return ( content.folders.map((folder) => {
+            const resource = ( URI.from(
+                { scheme: EDIT_SESSIONS_SCHEME, authority: 'remote-session-content', path: `/${data.ref}/${folder.name}` }
+            ));
+            return {
+                handle: ( resource.toString()),
+                collapsibleState: TreeItemCollapsibleState.Collapsed,
+                label: { label: folder.name },
+                themeIcon: Codicon.folder
+            };
+        }));
     }
     async getEditSessionFolderContents(ref, folderName) {
         const data = await this.editSessionsStorageService.read('editSessions', ref);
@@ -253,26 +243,26 @@ let EditSessionDataViewDataProvider = class EditSessionDataViewDataProvider {
         if (!editSessionFolder) {
             return [];
         }
-        return Promise.all(( (editSessionFolder.workingChanges.map(async (change) => {
-            const cloudChangeUri = ( (URI.from(
+        return Promise.all(( editSessionFolder.workingChanges.map(async (change) => {
+            const cloudChangeUri = ( URI.from(
                 { scheme: EDIT_SESSIONS_SCHEME, authority: 'remote-session-content', path: `/${data.ref}/${folderName}/${change.relativeFilePath}` }
-            )));
+            ));
             if (currentWorkspaceFolder?.uri) {
                 const localCopy = joinPath(currentWorkspaceFolder.uri, change.relativeFilePath);
                 if (change.type === ChangeType.Addition && (await this.fileService.exists(localCopy))) {
                     return {
-                        handle: ( (cloudChangeUri.toString())),
+                        handle: ( cloudChangeUri.toString()),
                         resourceUri: cloudChangeUri,
                         collapsibleState: TreeItemCollapsibleState.None,
                         label: { label: change.relativeFilePath },
                         themeIcon: Codicon.file,
                         command: {
                             id: 'vscode.diff',
-                            title: ( localize(5713, 'Compare Changes')),
+                            title: ( localize(5711, 'Compare Changes')),
                             arguments: [
                                 localCopy,
                                 cloudChangeUri,
-                                `${basename(change.relativeFilePath)} (${( localize(5714, 'Local Copy'))} \u2194 ${( localize(5715, 'Cloud Changes'))})`,
+                                `${basename(change.relativeFilePath)} (${( localize(5712, 'Local Copy'))} \u2194 ${( localize(5713, 'Cloud Changes'))})`,
                                 undefined
                             ]
                         }
@@ -280,25 +270,25 @@ let EditSessionDataViewDataProvider = class EditSessionDataViewDataProvider {
                 }
             }
             return {
-                handle: ( (cloudChangeUri.toString())),
+                handle: ( cloudChangeUri.toString()),
                 resourceUri: cloudChangeUri,
                 collapsibleState: TreeItemCollapsibleState.None,
                 label: { label: change.relativeFilePath },
                 themeIcon: Codicon.file,
                 command: {
                     id: API_OPEN_EDITOR_COMMAND_ID,
-                    title: ( localize(5716, 'Open File')),
+                    title: ( localize(5714, 'Open File')),
                     arguments: [cloudChangeUri, undefined, undefined]
                 }
             };
-        }))));
+        })));
     }
 };
-EditSessionDataViewDataProvider = ( (__decorate([
-    ( (__param(0, IEditSessionsStorageService))),
-    ( (__param(1, IContextKeyService))),
-    ( (__param(2, IWorkspaceContextService))),
-    ( (__param(3, IFileService)))
-], EditSessionDataViewDataProvider)));
+EditSessionDataViewDataProvider = ( __decorate([
+    ( __param(0, IEditSessionsStorageService)),
+    ( __param(1, IContextKeyService)),
+    ( __param(2, IWorkspaceContextService)),
+    ( __param(3, IFileService))
+], EditSessionDataViewDataProvider));
 
 export { EditSessionsDataViews };

package/vscode/src/vs/workbench/contrib/editSessions/common/editSessions.d.ts

@@ -0,0 +1,52 @@
+import { VSBuffer } from "vscode/vscode/vs/base/common/buffer";
+import { ILocalizedString } from "vscode/vscode/vs/platform/action/common/action";
+import { RawContextKey } from "vscode/vscode/vs/platform/contextkey/common/contextkey";
+export declare const EDIT_SESSION_SYNC_CATEGORY: import("vscode/vscode/vs/nls").ILocalizedString;
+export type SyncResource = "editSessions" | "workspaceState";
+export declare enum ChangeType {
+    Addition = 1,
+    Deletion = 2
+}
+export declare enum FileType {
+    File = 1
+}
+interface Addition {
+    relativeFilePath: string;
+    fileType: FileType.File;
+    contents: string;
+    type: ChangeType.Addition;
+}
+interface Deletion {
+    relativeFilePath: string;
+    fileType: FileType.File;
+    contents: undefined;
+    type: ChangeType.Deletion;
+}
+export type Change = Addition | Deletion;
+export interface Folder {
+    name: string;
+    canonicalIdentity: string | undefined;
+    workingChanges: Change[];
+    absoluteUri: string | undefined;
+}
+export declare const EditSessionSchemaVersion = 3;
+export interface EditSession {
+    version: number;
+    workspaceStateId?: string;
+    machine?: string;
+    folders: Folder[];
+}
+export declare const EDIT_SESSIONS_SIGNED_IN_KEY = "editSessionsSignedIn";
+export declare const EDIT_SESSIONS_SIGNED_IN: RawContextKey<boolean>;
+export declare const EDIT_SESSIONS_PENDING_KEY = "editSessionsPending";
+export declare const EDIT_SESSIONS_PENDING: RawContextKey<boolean>;
+export declare const EDIT_SESSIONS_CONTAINER_ID = "workbench.view.editSessions";
+export declare const EDIT_SESSIONS_DATA_VIEW_ID = "workbench.views.editSessions.data";
+export declare const EDIT_SESSIONS_TITLE: ILocalizedString;
+export declare const EDIT_SESSIONS_VIEW_ICON: import("vscode/vscode/vs/base/common/themables").ThemeIcon;
+export declare const EDIT_SESSIONS_SHOW_VIEW: RawContextKey<boolean>;
+export declare const EDIT_SESSIONS_SCHEME = "vscode-edit-sessions";
+export declare function decodeEditSessionFileContent(version: number, content: string): VSBuffer;
+export declare function hashedEditSessionId(editSessionId: string): string;
+export declare const editSessionsLogId = "editSessions";
+export {};

package/vscode/src/vs/workbench/contrib/editSessions/common/editSessions.js

@@ -1,3 +1,4 @@
+
 import { decodeBase64, VSBuffer } from 'vscode/vscode/vs/base/common/buffer';
 import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
 import { localize2, localize } from 'vscode/vscode/vs/nls';
@@ -5,26 +6,26 @@ import { RawContextKey } from 'vscode/vscode/vs/platform/contextkey/common/conte
 import { registerIcon } from 'vscode/vscode/vs/platform/theme/common/iconRegistry';
 import { StringSHA1 } from 'vscode/vscode/vs/base/common/hash';
 
-const EDIT_SESSION_SYNC_CATEGORY = ( localize2(5691, 'Cloud Changes'));
+const EDIT_SESSION_SYNC_CATEGORY = ( localize2(5715, 'Cloud Changes'));
 var ChangeType;
-( ((function(ChangeType) {
+(function (ChangeType) {
     ChangeType[ChangeType["Addition"] = 1] = "Addition";
     ChangeType[ChangeType["Deletion"] = 2] = "Deletion";
-})(ChangeType || (ChangeType = {}))));
+})(ChangeType || (ChangeType = {}));
 var FileType;
-( ((function(FileType) {
+(function (FileType) {
     FileType[FileType["File"] = 1] = "File";
-})(FileType || (FileType = {}))));
+})(FileType || (FileType = {}));
 const EditSessionSchemaVersion = 3;
 const EDIT_SESSIONS_SIGNED_IN_KEY = 'editSessionsSignedIn';
-const EDIT_SESSIONS_SIGNED_IN = ( (new RawContextKey(EDIT_SESSIONS_SIGNED_IN_KEY, false)));
+const EDIT_SESSIONS_SIGNED_IN = ( new RawContextKey(EDIT_SESSIONS_SIGNED_IN_KEY, false));
 const EDIT_SESSIONS_PENDING_KEY = 'editSessionsPending';
-const EDIT_SESSIONS_PENDING = ( (new RawContextKey(EDIT_SESSIONS_PENDING_KEY, false)));
+const EDIT_SESSIONS_PENDING = ( new RawContextKey(EDIT_SESSIONS_PENDING_KEY, false));
 const EDIT_SESSIONS_CONTAINER_ID = 'workbench.view.editSessions';
 const EDIT_SESSIONS_DATA_VIEW_ID = 'workbench.views.editSessions.data';
-const EDIT_SESSIONS_TITLE = ( localize2(5691, 'Cloud Changes'));
-const EDIT_SESSIONS_VIEW_ICON = registerIcon('edit-sessions-view-icon', Codicon.cloudDownload, ( localize(5692, 'View icon of the cloud changes view.')));
-const EDIT_SESSIONS_SHOW_VIEW = ( (new RawContextKey('editSessionsShowView', false)));
+const EDIT_SESSIONS_TITLE = ( localize2(5715, 'Cloud Changes'));
+const EDIT_SESSIONS_VIEW_ICON = registerIcon('edit-sessions-view-icon', Codicon.cloudDownload, ( localize(5716, 'View icon of the cloud changes view.')));
+const EDIT_SESSIONS_SHOW_VIEW = ( new RawContextKey('editSessionsShowView', false));
 const EDIT_SESSIONS_SCHEME = 'vscode-edit-sessions';
 function decodeEditSessionFileContent(version, content) {
     switch (version) {
@@ -33,11 +34,11 @@ function decodeEditSessionFileContent(version, content) {
         case 2:
             return decodeBase64(content);
         default:
-            throw ( (new Error('Upgrade to a newer version to decode this content.')));
+            throw ( new Error('Upgrade to a newer version to decode this content.'));
     }
 }
 function hashedEditSessionId(editSessionId) {
-    const sha1 = ( (new StringSHA1()));
+    const sha1 = ( new StringSHA1());
     sha1.update(editSessionId);
     return sha1.digest();
 }

package/vscode/src/vs/workbench/contrib/editSessions/common/editSessionsLogService.d.ts

@@ -0,0 +1,15 @@
+import { IEnvironmentService } from "vscode/vscode/vs/platform/environment/common/environment.service";
+import { AbstractLogger } from "vscode/vscode/vs/platform/log/common/log";
+import { ILoggerService } from "vscode/vscode/vs/platform/log/common/log.service";
+import { IEditSessionsLogService } from "vscode/vscode/vs/workbench/contrib/editSessions/common/editSessions.service";
+export declare class EditSessionsLogService extends AbstractLogger implements IEditSessionsLogService {
+    readonly _serviceBrand: undefined;
+    private readonly logger;
+    constructor(loggerService: ILoggerService, environmentService: IEnvironmentService);
+    trace(message: string, ...args: any[]): void;
+    debug(message: string, ...args: any[]): void;
+    info(message: string, ...args: any[]): void;
+    warn(message: string, ...args: any[]): void;
+    error(message: string | Error, ...args: any[]): void;
+    flush(): void;
+}

package/vscode/src/vs/workbench/contrib/editSessions/common/editSessionsLogService.js

@@ -1,4 +1,5 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 import { joinPath } from 'vscode/vscode/vs/base/common/resources';
 import { localize } from 'vscode/vscode/vs/nls';
 import { IEnvironmentService } from 'vscode/vscode/vs/platform/environment/common/environment.service';
@@ -9,7 +10,7 @@ import { editSessionsLogId } from './editSessions.js';
 let EditSessionsLogService = class EditSessionsLogService extends AbstractLogger {
     constructor(loggerService, environmentService) {
         super();
-        this.logger = this._register(loggerService.createLogger(joinPath(environmentService.logsHome, `${editSessionsLogId}.log`), { id: editSessionsLogId, name: ( localize(2397, "Cloud Changes")) }));
+        this.logger = this._register(loggerService.createLogger(joinPath(environmentService.logsHome, `${editSessionsLogId}.log`), { id: editSessionsLogId, name: ( localize(5717, "Cloud Changes")) }));
     }
     trace(message, ...args) {
         this.logger.trace(message, ...args);
@@ -30,9 +31,9 @@ let EditSessionsLogService = class EditSessionsLogService extends AbstractLogger
         this.logger.flush();
     }
 };
-EditSessionsLogService = ( (__decorate([
-    ( (__param(0, ILoggerService))),
-    ( (__param(1, IEnvironmentService)))
-], EditSessionsLogService)));
+EditSessionsLogService = ( __decorate([
+    ( __param(0, ILoggerService)),
+    ( __param(1, IEnvironmentService))
+], EditSessionsLogService));
 
 export { EditSessionsLogService };

package/vscode/src/vs/workbench/contrib/editSessions/common/editSessionsStorageClient.d.ts

@@ -0,0 +1,4 @@
+import { UserDataSyncStoreClient } from "@codingame/monaco-vscode-a2719803-af40-5ae9-a29f-8a2231c33056-common/vscode/vs/platform/userDataSync/common/userDataSyncStoreService";
+export declare class EditSessionsStoreClient extends UserDataSyncStoreClient {
+    _serviceBrand: any;
+}

package/vscode/src/vs/workbench/contrib/editSessions/common/editSessionsStorageClient.js

@@ -1,4 +1,5 @@
-import { UserDataSyncStoreClient } from 'vscode/vscode/vs/platform/userDataSync/common/userDataSyncStoreService';
+
+import { UserDataSyncStoreClient } from '@codingame/monaco-vscode-a2719803-af40-5ae9-a29f-8a2231c33056-common/vscode/vs/platform/userDataSync/common/userDataSyncStoreService';
 
 class EditSessionsStoreClient extends UserDataSyncStoreClient {
 }

package/vscode/src/vs/workbench/contrib/editSessions/common/workspaceStateSync.d.ts

@@ -0,0 +1,33 @@
+import { CancellationToken } from "vscode/vscode/vs/base/common/cancellation";
+import { URI } from "vscode/vscode/vs/base/common/uri";
+import { IConfigurationService } from "vscode/vscode/vs/platform/configuration/common/configuration.service";
+import { IEnvironmentService } from "vscode/vscode/vs/platform/environment/common/environment.service";
+import { IFileService } from "vscode/vscode/vs/platform/files/common/files.service";
+import { IStorageService } from "vscode/vscode/vs/platform/storage/common/storage.service";
+import { ITelemetryService } from "vscode/vscode/vs/platform/telemetry/common/telemetry.service";
+import { IUriIdentityService } from "vscode/vscode/vs/platform/uriIdentity/common/uriIdentity.service";
+import { IUserDataProfile } from "vscode/vscode/vs/platform/userDataProfile/common/userDataProfile";
+import { AbstractSynchroniser, IAcceptResult, IMergeResult, IResourcePreview, ISyncResourcePreview } from "@codingame/monaco-vscode-a2719803-af40-5ae9-a29f-8a2231c33056-common/vscode/vs/platform/userDataSync/common/abstractSynchronizer";
+import { IRemoteUserData, IUserDataSyncConfiguration, IUserDataSynchroniser } from "vscode/vscode/vs/platform/userDataSync/common/userDataSync";
+import { IUserDataSyncLogService } from "vscode/vscode/vs/platform/userDataSync/common/userDataSync.service";
+import { IUserDataSyncStoreService } from "vscode/vscode/vs/platform/userDataSync/common/userDataSync.service";
+import { IEditSessionsStorageService } from "vscode/vscode/vs/workbench/contrib/editSessions/common/editSessions.service";
+import { IWorkspaceIdentityService } from "vscode/vscode/vs/workbench/services/workspaces/common/workspaceIdentityService.service";
+export declare class WorkspaceStateSynchroniser extends AbstractSynchroniser implements IUserDataSynchroniser {
+    private readonly workspaceIdentityService;
+    private readonly editSessionsStorageService;
+    protected version: number;
+    constructor(profile: IUserDataProfile, collection: string | undefined, userDataSyncStoreService: IUserDataSyncStoreService, logService: IUserDataSyncLogService, fileService: IFileService, environmentService: IEnvironmentService, telemetryService: ITelemetryService, configurationService: IConfigurationService, storageService: IStorageService, uriIdentityService: IUriIdentityService, workspaceIdentityService: IWorkspaceIdentityService, editSessionsStorageService: IEditSessionsStorageService);
+    sync(): Promise<void>;
+    apply(): Promise<ISyncResourcePreview | null>;
+    protected applyResult(remoteUserData: IRemoteUserData, lastSyncUserData: IRemoteUserData | null, result: [
+        IResourcePreview,
+        IAcceptResult
+    ][], force: boolean): Promise<void>;
+    protected generateSyncPreview(remoteUserData: IRemoteUserData, lastSyncUserData: IRemoteUserData | null, isRemoteDataFromCurrentMachine: boolean, userDataSyncConfiguration: IUserDataSyncConfiguration, token: CancellationToken): Promise<IResourcePreview[]>;
+    protected getMergeResult(resourcePreview: IResourcePreview, token: CancellationToken): Promise<IMergeResult>;
+    protected getAcceptResult(resourcePreview: IResourcePreview, resource: URI, content: string | null | undefined, token: CancellationToken): Promise<IAcceptResult>;
+    protected hasRemoteChanged(lastSyncUserData: IRemoteUserData): Promise<boolean>;
+    hasLocalData(): Promise<boolean>;
+    resolveContent(uri: URI): Promise<string | null>;
+}

package/vscode/src/vs/workbench/contrib/editSessions/common/workspaceStateSync.js

@@ -1,14 +1,17 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 import { CancellationTokenSource } from 'vscode/vscode/vs/base/common/cancellation';
 import { Emitter } from 'vscode/vscode/vs/base/common/event';
 import { stringify, parse } from 'vscode/vscode/vs/base/common/marshalling';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { IEnvironmentService } from 'vscode/vscode/vs/platform/environment/common/environment.service';
 import { IFileService } from 'vscode/vscode/vs/platform/files/common/files.service';
+import { StorageScope, StorageTarget } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
 import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry.service';
 import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
-import { AbstractSynchroniser } from 'vscode/vscode/vs/platform/userDataSync/common/abstractSynchronizer';
+import { AbstractSynchroniser } from '@codingame/monaco-vscode-a2719803-af40-5ae9-a29f-8a2231c33056-common/vscode/vs/platform/userDataSync/common/abstractSynchronizer';
+import { SyncResource } from 'vscode/vscode/vs/platform/userDataSync/common/userDataSync';
 import { IEditSessionsStorageService } from 'vscode/vscode/vs/workbench/contrib/editSessions/common/editSessions.service';
 import { IWorkspaceIdentityService } from 'vscode/vscode/vs/workbench/services/workspaces/common/workspaceIdentityService.service';
 
@@ -41,7 +44,7 @@ let WorkspaceStateSynchroniser = class WorkspaceStateSynchroniser extends Abstra
     constructor(profile, collection, userDataSyncStoreService, logService, fileService, environmentService, telemetryService, configurationService, storageService, uriIdentityService, workspaceIdentityService, editSessionsStorageService) {
         const userDataSyncLocalStoreService = ( new NullBackupStoreService());
         const userDataSyncEnablementService = ( new NullEnablementService());
-        super({ syncResource: "workspaceState" , profile }, collection, fileService, environmentService, storageService, userDataSyncStoreService, userDataSyncLocalStoreService, userDataSyncEnablementService, telemetryService, logService, configurationService, uriIdentityService);
+        super({ syncResource: SyncResource.WorkspaceState, profile }, collection, fileService, environmentService, storageService, userDataSyncStoreService, userDataSyncLocalStoreService, userDataSyncEnablementService, telemetryService, logService, configurationService, uriIdentityService);
         this.workspaceIdentityService = workspaceIdentityService;
         this.editSessionsStorageService = editSessionsStorageService;
         this.version = 1;
@@ -53,13 +56,13 @@ let WorkspaceStateSynchroniser = class WorkspaceStateSynchroniser extends Abstra
             return;
         }
         await this.storageService.flush();
-        const keys = ( this.storageService.keys(1, 0 ));
+        const keys = ( this.storageService.keys(StorageScope.WORKSPACE, StorageTarget.USER));
         if (!keys.length) {
             return;
         }
         const contributedData = {};
         keys.forEach((key) => {
-            const data = this.storageService.get(key, 1 );
+            const data = this.storageService.get(key, StorageScope.WORKSPACE);
             if (data) {
                 contributedData[key] = data;
             }
@@ -95,10 +98,10 @@ let WorkspaceStateSynchroniser = class WorkspaceStateSynchroniser extends Abstra
                 try {
                     const value = parse(storage[key]);
                     replaceUris(value);
-                    storageEntries.push({ key, value, scope: 1 , target: 0  });
+                    storageEntries.push({ key, value, scope: StorageScope.WORKSPACE, target: StorageTarget.USER });
                 }
                 catch {
-                    storageEntries.push({ key, value: storage[key], scope: 1 , target: 0  });
+                    storageEntries.push({ key, value: storage[key], scope: StorageScope.WORKSPACE, target: StorageTarget.USER });
                 }
             }
             this.storageService.storeAll(storageEntries, true);

package/vscode/src/vs/workbench/services/workspaces/common/editSessionIdentityService.d.ts

@@ -0,0 +1,21 @@
+import { CancellationToken } from "vscode/vscode/vs/base/common/cancellation";
+import { IDisposable } from "vscode/vscode/vs/base/common/lifecycle";
+import { ILogService } from "vscode/vscode/vs/platform/log/common/log.service";
+import { EditSessionIdentityMatch, IEditSessionIdentityCreateParticipant, IEditSessionIdentityProvider } from "vscode/vscode/vs/platform/workspace/common/editSessions";
+import { IEditSessionIdentityService } from "vscode/vscode/vs/platform/workspace/common/editSessions.service";
+import { IWorkspaceFolder } from "vscode/vscode/vs/platform/workspace/common/workspace";
+import { IExtensionService } from "vscode/vscode/vs/workbench/services/extensions/common/extensions.service";
+export declare class EditSessionIdentityService implements IEditSessionIdentityService {
+    private readonly _extensionService;
+    private readonly _logService;
+    readonly _serviceBrand: undefined;
+    private _editSessionIdentifierProviders;
+    constructor(_extensionService: IExtensionService, _logService: ILogService);
+    registerEditSessionIdentityProvider(provider: IEditSessionIdentityProvider): IDisposable;
+    getEditSessionIdentifier(workspaceFolder: IWorkspaceFolder, token: CancellationToken): Promise<string | undefined>;
+    provideEditSessionIdentityMatch(workspaceFolder: IWorkspaceFolder, identity1: string, identity2: string, cancellationToken: CancellationToken): Promise<EditSessionIdentityMatch | undefined>;
+    onWillCreateEditSessionIdentity(workspaceFolder: IWorkspaceFolder, cancellationToken: CancellationToken): Promise<void>;
+    private _participants;
+    addEditSessionIdentityCreateParticipant(participant: IEditSessionIdentityCreateParticipant): IDisposable;
+    private activateProvider;
+}

package/vscode/src/vs/workbench/services/workspaces/common/editSessionIdentityService.js

@@ -1,6 +1,8 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 import { insert } from 'vscode/vscode/vs/base/common/arrays';
 import { toDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
+import 'vscode/vscode/vs/platform/instantiation/common/extensions';
 import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
 import 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions.service';

package/vscode/src/vs/workbench/services/workspaces/common/workspaceIdentityService.d.ts

@@ -0,0 +1,13 @@
+import { CancellationToken } from "vscode/vscode/vs/base/common/cancellation";
+import { IWorkspaceStateFolder } from "vscode/vscode/vs/platform/userDataSync/common/userDataSync";
+import { IEditSessionIdentityService } from "vscode/vscode/vs/platform/workspace/common/editSessions.service";
+import { IWorkspaceContextService } from "vscode/vscode/vs/platform/workspace/common/workspace.service";
+import { IWorkspaceIdentityService } from "vscode/vscode/vs/workbench/services/workspaces/common/workspaceIdentityService.service";
+export declare class WorkspaceIdentityService implements IWorkspaceIdentityService {
+    private readonly workspaceContextService;
+    private readonly editSessionIdentityService;
+    _serviceBrand: undefined;
+    constructor(workspaceContextService: IWorkspaceContextService, editSessionIdentityService: IEditSessionIdentityService);
+    getWorkspaceStateFolders(cancellationToken: CancellationToken): Promise<IWorkspaceStateFolder[]>;
+    matches(incomingWorkspaceFolders: IWorkspaceStateFolder[], cancellationToken: CancellationToken): Promise<((value: any) => unknown) | false>;
+}

package/vscode/src/vs/workbench/services/workspaces/common/workspaceIdentityService.js

@@ -1,7 +1,9 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 import { VSBuffer } from 'vscode/vscode/vs/base/common/buffer';
 import { isEqualOrParent, relativePath, joinPath } from 'vscode/vscode/vs/base/common/resources';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
+import 'vscode/vscode/vs/platform/instantiation/common/extensions';
 import { EditSessionIdentityMatch } from 'vscode/vscode/vs/platform/workspace/common/editSessions';
 import { IEditSessionIdentityService } from 'vscode/vscode/vs/platform/workspace/common/editSessions.service';
 import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace.service';