@codingame/monaco-vscode-edit-sessions-service-override 9.0.2 → 10.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-edit-sessions-service-override",
-  "version": "9.0.2",
+  "version": "10.0.0",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -26,6 +26,6 @@
     }
   },
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@9.0.2"
+    "vscode": "npm:@codingame/monaco-vscode-api@10.0.0"
   }
 }

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

@@ -2,7 +2,6 @@ import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { Disposable, MutableDisposable, DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
 import { Extensions as Extensions$1 } from 'vscode/vscode/vs/workbench/common/contributions';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
-import { ShutdownReason, LifecyclePhase } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
 import { ILifecycleService } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle.service';
 import { registerAction2, Action2, MenuRegistry, MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { localize2, localize } from 'vscode/vscode/vs/nls';
@@ -10,17 +9,15 @@ import { EDIT_SESSION_SYNC_CATEGORY, EDIT_SESSIONS_SHOW_VIEW, EDIT_SESSIONS_PEND
 import { IEditSessionsStorageService, IEditSessionsLogService } from 'vscode/vscode/vs/workbench/contrib/editSessions/common/editSessions.service';
 import { ISCMService } from 'vscode/vscode/vs/workbench/contrib/scm/common/scm.service';
 import { IFileService } from 'vscode/vscode/vs/platform/files/common/files.service';
-import { WorkbenchState } from 'vscode/vscode/vs/platform/workspace/common/workspace';
 import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace.service';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
 import { basename, joinPath, relativePath } from 'vscode/vscode/vs/base/common/resources';
 import { encodeBase64 } from 'vscode/vscode/vs/base/common/buffer';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
-import { ProgressLocation } from 'vscode/vscode/vs/platform/progress/common/progress';
 import { IProgressService } from 'vscode/vscode/vs/platform/progress/common/progress.service';
 import './editSessionsStorageService.js';
-import 'vscode/vscode/vs/platform/instantiation/common/extensions';
-import { UserDataSyncStoreError, UserDataSyncErrorCode } from 'vscode/vscode/vs/platform/userDataSync/common/userDataSync';
+import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
+import { UserDataSyncStoreError } from 'vscode/vscode/vs/platform/userDataSync/common/userDataSync';
 import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry.service';
 import 'vscode/vscode/vs/platform/notification/common/notification';
 import { INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification.service';
@@ -42,9 +39,8 @@ import { IsWebContext } from 'vscode/vscode/vs/platform/contextkey/common/contex
 import { isProposedApiEnabled } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions';
 import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions.service';
 import '../common/editSessionsLogService.js';
-import { ViewContainerLocation, Extensions } from 'vscode/vscode/vs/workbench/common/views';
+import { Extensions } from 'vscode/vscode/vs/workbench/common/views';
 import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService.service';
-import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
 import { ViewPaneContainer } from 'vscode/vscode/vs/workbench/browser/parts/views/viewPaneContainer';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { EditSessionsDataViews } from './editSessionsViews.js';
@@ -58,7 +54,6 @@ import { IEditSessionIdentityService } from 'vscode/vscode/vs/platform/workspace
 import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
 import { IOutputService } from 'vscode/vscode/vs/workbench/services/output/common/output.service';
 import { sha1Hex } from '../../../../base/browser/hash.js';
-import { StorageScope, StorageTarget } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
 import { NumberBadge } from 'vscode/vscode/vs/workbench/services/activity/common/activity';
 import { IActivityService } from 'vscode/vscode/vs/workbench/services/activity/common/activity.service';
@@ -66,8 +61,7 @@ import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/commo
 import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
 import { CancellationError } from 'vscode/vscode/vs/base/common/errors';
 import { IRemoteAgentService } from 'vscode/vscode/vs/workbench/services/remote/common/remoteAgentService.service';
-import { VIEWLET_ID } from 'vscode/vscode/vs/workbench/contrib/extensions/common/extensions';
-import { IPaneCompositePartService } from 'vscode/vscode/vs/workbench/services/panecomposite/browser/panecomposite.service';
+import { IExtensionsWorkbenchService } from 'vscode/vscode/vs/workbench/contrib/extensions/common/extensions.service';
 import { WorkspaceStateSynchroniser } from '../common/workspaceStateSync.js';
 import { IUserDataProfilesService } from 'vscode/vscode/vs/platform/userDataProfile/common/userDataProfile.service';
 import { IRequestService } from 'vscode/vscode/vs/platform/request/common/request.service';
@@ -79,39 +73,36 @@ import Severity$1 from 'vscode/vscode/vs/base/common/severity';
 var EditSessionsContribution_1;
 const continueWorkingOnCommand = {
     id: '_workbench.editSessions.actions.continueEditSession',
-    title: ( localize2(2398, 'Continue Working On...')),
+    title: ( localize2(2405, 'Continue Working On...')),
     precondition: ( (WorkspaceFolderCountContext.notEqualsTo('0'))),
     f1: true
 };
 const openLocalFolderCommand = {
     id: '_workbench.editSessions.actions.continueEditSession.openLocalFolder',
-    title: ( localize2(2399, 'Open In Local Folder')),
+    title: ( localize2(2406, 'Open In Local Folder')),
     category: EDIT_SESSION_SYNC_CATEGORY,
     precondition: ( (ContextKeyExpr.and( (IsWebContext.toNegated()), VirtualWorkspaceContext)))
 };
 const showOutputChannelCommand = {
     id: 'workbench.editSessions.actions.showOutputChannel',
-    title: ( localize2(2400, "Show Log")),
+    title: ( localize2(2407, "Show Log")),
     category: EDIT_SESSION_SYNC_CATEGORY
 };
 const installAdditionalContinueOnOptionsCommand = {
     id: 'workbench.action.continueOn.extensions',
-    title: ( localize(2401, 'Install additional development environment options')),
+    title: ( localize(2408, 'Install additional development environment options')),
 };
 registerAction2(class extends Action2 {
     constructor() {
         super({ ...installAdditionalContinueOnOptionsCommand, f1: false });
     }
     async run(accessor) {
-        const paneCompositePartService = accessor.get(IPaneCompositePartService);
-        const viewlet = await paneCompositePartService.openPaneComposite(VIEWLET_ID, ViewContainerLocation.Sidebar, true);
-        const view = viewlet?.getViewPaneContainer();
-        view?.search('@tag:continueOn');
+        return accessor.get(IExtensionsWorkbenchService).openSearch('@tag:continueOn');
     }
 });
-const resumeProgressOptionsTitle = `[${( localize(2402, 'Resuming working changes...'))}](command:${showOutputChannelCommand.id})`;
+const resumeProgressOptionsTitle = `[${( localize(2409, 'Resuming working changes...'))}](command:${showOutputChannelCommand.id})`;
 const resumeProgressOptions = {
-    location: ProgressLocation.Window,
+    location: 10 ,
     type: 'syncing',
 };
 const queryParamName = 'editSessionId';
@@ -189,8 +180,8 @@ let EditSessionsContribution = class EditSessionsContribution extends Disposable
         this.registerContributedEditSessionOptions();
         this._register(this.fileService.registerProvider(EditSessionsFileSystemProvider.SCHEMA, ( (new EditSessionsFileSystemProvider(this.editSessionsStorageService)))));
         this.lifecycleService.onWillShutdown((e) => {
-            if (e.reason !== ShutdownReason.RELOAD && this.editSessionsStorageService.isSignedIn && this.configurationService.getValue('workbench.experimental.cloudChanges.autoStore') === 'onShutdown' && !isWeb) {
-                e.join(this.autoStoreEditSession(), { id: 'autoStoreWorkingChanges', label: ( localize(2403, 'Storing current working changes...')) });
+            if (e.reason !== 3  && this.editSessionsStorageService.isSignedIn && this.configurationService.getValue('workbench.experimental.cloudChanges.autoStore') === 'onShutdown' && !isWeb) {
+                e.join(this.autoStoreEditSession(), { id: 'autoStoreWorkingChanges', label: ( localize(2410, 'Storing current working changes...')) });
             }
         });
         this._register(this.editSessionsStorageService.onDidSignIn(() => this.updateAccountsMenuBadge()));
@@ -207,7 +198,7 @@ let EditSessionsContribution = class EditSessionsContribution extends Disposable
             await this.progressService.withProgress(resumeProgressOptions, async (progress) => await this.resumeEditSession(undefined, true, undefined, undefined, progress));
         }
         else if (shouldAutoResumeOnReload) {
-            const hasApplicationLaunchedFromContinueOnFlow = this.storageService.getBoolean(EditSessionsContribution_1.APPLICATION_LAUNCHED_VIA_CONTINUE_ON_STORAGE_KEY, StorageScope.APPLICATION, false);
+            const hasApplicationLaunchedFromContinueOnFlow = this.storageService.getBoolean(EditSessionsContribution_1.APPLICATION_LAUNCHED_VIA_CONTINUE_ON_STORAGE_KEY, -1 , false);
             this.logService.info(`Prompting to enable cloud changes, has application previously launched from Continue On flow: ${hasApplicationLaunchedFromContinueOnFlow}`);
             const handlePendingEditSessions = () => {
                 this.logService.info('Showing badge to enable cloud changes in accounts menu...');
@@ -217,14 +208,14 @@ let EditSessionsContribution = class EditSessionsContribution extends Disposable
                     disposable.dispose();
                     this.logService.info('Showing badge to enable cloud changes in accounts menu succeeded, resuming cloud changes...');
                     await this.progressService.withProgress(resumeProgressOptions, async (progress) => await this.resumeEditSession(undefined, true, undefined, undefined, progress));
-                    this.storageService.remove(EditSessionsContribution_1.APPLICATION_LAUNCHED_VIA_CONTINUE_ON_STORAGE_KEY, StorageScope.APPLICATION);
+                    this.storageService.remove(EditSessionsContribution_1.APPLICATION_LAUNCHED_VIA_CONTINUE_ON_STORAGE_KEY, -1 );
                     this.environmentService.continueOn = undefined;
                 });
             };
             if ((this.environmentService.continueOn !== undefined) &&
                 !this.editSessionsStorageService.isSignedIn &&
                 hasApplicationLaunchedFromContinueOnFlow === false) {
-                this.storageService.store(EditSessionsContribution_1.APPLICATION_LAUNCHED_VIA_CONTINUE_ON_STORAGE_KEY, true, StorageScope.APPLICATION, StorageTarget.MACHINE);
+                this.storageService.store(EditSessionsContribution_1.APPLICATION_LAUNCHED_VIA_CONTINUE_ON_STORAGE_KEY, true, -1 , 1 );
                 this.logService.info('Prompting to enable cloud changes...');
                 await this.editSessionsStorageService.initialize('read');
                 if (this.editSessionsStorageService.isSignedIn) {
@@ -248,15 +239,15 @@ let EditSessionsContribution = class EditSessionsContribution extends Disposable
         if (this.editSessionsStorageService.isSignedIn) {
             return this.accountsMenuBadgeDisposable.clear();
         }
-        const badge = ( (new NumberBadge(1, () => ( localize(2404, 'Check for pending cloud changes')))));
+        const badge = ( (new NumberBadge(1, () => ( localize(2411, 'Check for pending cloud changes')))));
         this.accountsMenuBadgeDisposable.value = this.activityService.showAccountsActivity({ badge });
     }
     async autoStoreEditSession() {
         const cancellationTokenSource = ( (new CancellationTokenSource()));
         await this.progressService.withProgress({
-            location: ProgressLocation.Window,
+            location: 10 ,
             type: 'syncing',
-            title: ( localize(2405, 'Storing working changes...'))
+            title: ( localize(2412, 'Storing working changes...'))
         }, async () => this.storeEditSession(false, cancellationTokenSource.token), () => {
             cancellationTokenSource.cancel();
             cancellationTokenSource.dispose();
@@ -272,7 +263,7 @@ let EditSessionsContribution = class EditSessionsContribution extends Disposable
             ))),
             icon: EDIT_SESSIONS_VIEW_ICON,
             hideIfEmpty: true
-        }, ViewContainerLocation.Sidebar, { doNotRegisterOpenCommand: true });
+        }, 0 , { doNotRegisterOpenCommand: true });
         this._register(this.instantiationService.createInstance(EditSessionsDataViews, container));
     }
     registerActions() {
@@ -300,7 +291,7 @@ let EditSessionsContribution = class EditSessionsContribution extends Disposable
             constructor() {
                 super({
                     id: 'workbench.editSessions.actions.showEditSessions',
-                    title: ( localize2(2406, 'Show Cloud Changes')),
+                    title: ( localize2(2413, 'Show Cloud Changes')),
                     category: EDIT_SESSION_SYNC_CATEGORY,
                     f1: true
                 });
@@ -334,10 +325,10 @@ let EditSessionsContribution = class EditSessionsContribution extends Disposable
                     const cancellationTokenSource = ( (new CancellationTokenSource()));
                     try {
                         ref = await that.progressService.withProgress({
-                            location: ProgressLocation.Notification,
+                            location: 15 ,
                             cancellable: true,
                             type: 'syncing',
-                            title: ( localize(2407, 'Storing your working changes...'))
+                            title: ( localize(2414, 'Storing your working changes...'))
                         }, async () => {
                             const ref = await that.storeEditSession(false, cancellationTokenSource.token);
                             if (ref !== undefined) {
@@ -386,7 +377,7 @@ let EditSessionsContribution = class EditSessionsContribution extends Disposable
             constructor() {
                 super({
                     id: 'workbench.editSessions.actions.resumeLatest',
-                    title: ( localize2(2408, 'Resume Latest Changes from Cloud')),
+                    title: ( localize2(2415, 'Resume Latest Changes from Cloud')),
                     category: EDIT_SESSION_SYNC_CATEGORY,
                     f1: true,
                 });
@@ -399,7 +390,7 @@ let EditSessionsContribution = class EditSessionsContribution extends Disposable
             constructor() {
                 super({
                     id: 'workbench.editSessions.actions.resumeFromSerializedPayload',
-                    title: ( localize2(2409, 'Resume Changes from Serialized Data')),
+                    title: ( localize2(2416, 'Resume Changes from Serialized Data')),
                     category: 'Developer',
                     f1: true,
                 });
@@ -419,7 +410,7 @@ let EditSessionsContribution = class EditSessionsContribution extends Disposable
             constructor() {
                 super({
                     id: 'workbench.editSessions.actions.storeCurrent',
-                    title: ( localize2(2410, 'Store Working Changes in Cloud')),
+                    title: ( localize2(2417, 'Store Working Changes in Cloud')),
                     category: EDIT_SESSION_SYNC_CATEGORY,
                     f1: true,
                 });
@@ -427,8 +418,8 @@ let EditSessionsContribution = class EditSessionsContribution extends Disposable
             async run(accessor) {
                 const cancellationTokenSource = ( (new CancellationTokenSource()));
                 await that.progressService.withProgress({
-                    location: ProgressLocation.Notification,
-                    title: ( localize(2411, 'Storing working changes...'))
+                    location: 15 ,
+                    title: ( localize(2418, 'Storing working changes...'))
                 }, async () => {
                     that.telemetryService.publicLog2('editSessions.store');
                     await that.storeEditSession(true, cancellationTokenSource.token);
@@ -441,7 +432,7 @@ let EditSessionsContribution = class EditSessionsContribution extends Disposable
     }
     async resumeEditSession(ref, silent, forceApplyUnrelatedChange, applyPartialMatch, progress, serializedData) {
         await this.remoteAgentService.getEnvironment();
-        if (this.contextService.getWorkbenchState() === WorkbenchState.EMPTY) {
+        if (this.contextService.getWorkbenchState() === 1 ) {
             return;
         }
         this.logService.info(ref !== undefined ? `Resuming changes from cloud with ref ${ref}...` : 'Checking for pending cloud changes...');
@@ -450,14 +441,14 @@ let EditSessionsContribution = class EditSessionsContribution extends Disposable
         }
         this.telemetryService.publicLog2('editSessions.resume');
         performance.mark('code/willResumeEditSessionFromIdentifier');
-        progress?.report({ message: ( localize(2412, 'Checking for pending cloud changes...')) });
+        progress?.report({ message: ( localize(2419, 'Checking for pending cloud changes...')) });
         const data = serializedData ? { content: serializedData, ref: '' } : await this.editSessionsStorageService.read('editSessions', ref);
         if (!data) {
             if (ref === undefined && !silent) {
-                this.notificationService.info(( localize(2413, 'There are no changes to resume from the cloud.')));
+                this.notificationService.info(( localize(2420, 'There are no changes to resume from the cloud.')));
             }
             else if (ref !== undefined) {
-                this.notificationService.warn(( localize(2414, 'Could not resume changes from the cloud for ID {0}.', ref)));
+                this.notificationService.warn(( localize(2421, 'Could not resume changes from the cloud for ID {0}.', ref)));
             }
             this.logService.info(ref !== undefined ? `Aborting resuming changes from cloud as no edit session content is available to be applied from ref ${ref}.` : `Aborting resuming edit session as no edit session content is available to be applied`);
             return;
@@ -467,7 +458,7 @@ let EditSessionsContribution = class EditSessionsContribution extends Disposable
         ref = data.ref;
         if (editSession.version > EditSessionSchemaVersion) {
             this.notificationService.error(( localize(
-                2415,
+                2422,
                 "Please upgrade to a newer version of {0} to resume your working changes from the cloud.",
                 this.productService.nameLong
             )));
@@ -484,12 +475,12 @@ let EditSessionsContribution = class EditSessionsContribution extends Disposable
                     type: Severity$1.Warning,
                     message: conflictingChanges.length > 1 ?
                         ( localize(
-                            2416,
+                            2423,
                             'Resuming your working changes from the cloud will overwrite the following {0} files. Do you want to proceed?',
                             conflictingChanges.length
                         )) :
                         ( localize(
-                            2417,
+                            2424,
                             'Resuming your working changes from the cloud will overwrite {0}. Do you want to proceed?',
                             basename(conflictingChanges[0].uri)
                         )),
@@ -515,7 +506,7 @@ let EditSessionsContribution = class EditSessionsContribution extends Disposable
         }
         catch (ex) {
             this.logService.error('Failed to resume edit session, reason: ', ( (ex.toString())));
-            this.notificationService.error(( localize(2418, "Failed to resume your working changes from the cloud.")));
+            this.notificationService.error(( localize(2425, "Failed to resume your working changes from the cloud.")));
         }
         performance.mark('code/didResumeEditSessionFromIdentifier');
     }
@@ -544,9 +535,9 @@ let EditSessionsContribution = class EditSessionsContribution extends Disposable
                             this.configurationService.getValue('workbench.experimental.cloudChanges.partialMatches.enabled') === true) {
                             if (!applyPartialMatch) {
                                 this.notificationService.prompt(Severity$1.Info, ( localize(
-                                    2419,
+                                    2426,
                                     'You have pending working changes in the cloud for this workspace. Would you like to resume them?'
-                                )), [{ label: ( localize(2420, 'Resume')), run: () => this.resumeEditSession(ref, false, undefined, true) }]);
+                                )), [{ label: ( localize(2427, 'Resume')), run: () => this.resumeEditSession(ref, false, undefined, true) }]);
                             }
                             else {
                                 folderRoot = f;
@@ -629,7 +620,7 @@ let EditSessionsContribution = class EditSessionsContribution extends Disposable
                     const contents = encodeBase64((await this.fileService.readFile(uri)).value);
                     editSessionSize += contents.length;
                     if (editSessionSize > this.editSessionsStorageService.SIZE_LIMIT) {
-                        this.notificationService.error(( localize(2421, 'Your working changes exceed the size limit and cannot be stored.')));
+                        this.notificationService.error(( localize(2428, 'Your working changes exceed the size limit and cannot be stored.')));
                         return undefined;
                     }
                     workingChanges.push({ type: ChangeType.Addition, fileType: FileType.File, contents: contents, relativeFilePath: relativeFilePath });
@@ -649,7 +640,7 @@ let EditSessionsContribution = class EditSessionsContribution extends Disposable
             this.logService.info('Skipped storing working changes in the cloud as there are no edits to store.');
             if (fromStoreCommand) {
                 this.notificationService.info(( localize(
-                    2422,
+                    2429,
                     'Skipped storing working changes in the cloud as there are no edits to store.'
                 )));
             }
@@ -666,13 +657,13 @@ let EditSessionsContribution = class EditSessionsContribution extends Disposable
             this.logService.error(`Failed to store edit session, reason: `, ( (ex.toString())));
             if (ex instanceof UserDataSyncStoreError) {
                 switch (ex.code) {
-                    case UserDataSyncErrorCode.TooLarge:
+                    case "TooLarge" :
                         this.telemetryService.publicLog2('editSessions.upload.failed', { reason: 'TooLarge' });
-                        this.notificationService.error(( localize(2421, 'Your working changes exceed the size limit and cannot be stored.')));
+                        this.notificationService.error(( localize(2428, 'Your working changes exceed the size limit and cannot be stored.')));
                         break;
                     default:
                         this.telemetryService.publicLog2('editSessions.upload.failed', { reason: 'unknown' });
-                        this.notificationService.error(( localize(2423, 'Your working changes cannot be stored.')));
+                        this.notificationService.error(( localize(2430, 'Your working changes cannot be stored.')));
                         break;
                 }
             }
@@ -704,11 +695,11 @@ let EditSessionsContribution = class EditSessionsContribution extends Disposable
         if (this.hasEditSession()) {
             const disposables = ( (new DisposableStore()));
             const quickpick = disposables.add(this.quickInputService.createQuickPick());
-            quickpick.placeholder = ( localize(2424, "Select whether to bring your working changes with you"));
+            quickpick.placeholder = ( localize(2431, "Select whether to bring your working changes with you"));
             quickpick.ok = false;
             quickpick.ignoreFocusOut = true;
-            const withCloudChanges = { label: ( localize(2425, "Yes, continue with my working changes")) };
-            const withoutCloudChanges = { label: ( localize(2426, "No, continue without my working changes")) };
+            const withCloudChanges = { label: ( localize(2432, "Yes, continue with my working changes")) };
+            const withoutCloudChanges = { label: ( localize(2433, "No, continue without my working changes")) };
             quickpick.items = [withCloudChanges, withoutCloudChanges];
             const continueWithCloudChanges = await ( (new Promise((resolve, reject) => {
                 disposables.add(quickpick.onDidAccept(() => {
@@ -801,7 +792,7 @@ let EditSessionsContribution = class EditSessionsContribution extends Disposable
             }
             async run(accessor) {
                 const selection = await that.fileDialogService.showOpenDialog({
-                    title: ( localize(2427, 'Select a local folder to continue working in')),
+                    title: ( localize(2434, 'Select a local folder to continue working in')),
                     canSelectFolders: true,
                     canSelectMany: false,
                     canSelectFiles: false,
@@ -815,17 +806,17 @@ let EditSessionsContribution = class EditSessionsContribution extends Disposable
             }
         }));
         if (getVirtualWorkspaceLocation(this.contextService.getWorkspace()) !== undefined && isNative) {
-            this.generateStandaloneOptionCommand(openLocalFolderCommand.id, ( localize(2428, 'Continue Working in Existing Local Folder')), undefined, openLocalFolderCommand.precondition, undefined);
+            this.generateStandaloneOptionCommand(openLocalFolderCommand.id, ( localize(2435, 'Continue Working in Existing Local Folder')), undefined, openLocalFolderCommand.precondition, undefined);
         }
     }
     async pickContinueEditSessionDestination() {
         const disposables = ( (new DisposableStore()));
         const quickPick = disposables.add(this.quickInputService.createQuickPick({ useSeparators: true }));
-        const workspaceContext = this.contextService.getWorkbenchState() === WorkbenchState.FOLDER
+        const workspaceContext = this.contextService.getWorkbenchState() === 2
             ? this.contextService.getWorkspace().folders[0].name
             : ( (this.contextService.getWorkspace().folders.map((folder) => folder.name))).join(', ');
         quickPick.placeholder = ( localize(
-            2429,
+            2436,
             "Select a development environment to continue working on {0} in",
             `'${workspaceContext}'`
         ));
@@ -886,7 +877,7 @@ let EditSessionsContribution = class EditSessionsContribution extends Disposable
     createPickItems() {
         const items = [...this.continueEditSessionOptions].filter((option) => option.when === undefined || this.contextKeyService.contextMatchesRules(option.when));
         if (getVirtualWorkspaceLocation(this.contextService.getWorkspace()) !== undefined && isNative) {
-            items.push(( (new ContinueEditSessionItem('$(folder) ' + ( localize(2430, 'Open in Local Folder')), openLocalFolderCommand.id, ( localize(2431, 'Built-in'))))));
+            items.push(( (new ContinueEditSessionItem('$(folder) ' + ( localize(2437, 'Open in Local Folder')), openLocalFolderCommand.id, ( localize(2438, 'Built-in'))))));
         }
         const sortedItems = items.sort((item1, item2) => item1.label.localeCompare(item2.label));
         return sortedItems.concat({ type: 'separator' }, ( (new ContinueEditSessionItem(
@@ -937,7 +928,7 @@ class ContinueEditSessionItem {
         if (documentation !== undefined) {
             this.buttons = [{
                     iconClass: infoButtonClass,
-                    tooltip: ( localize(2432, 'Learn More')),
+                    tooltip: ( localize(2439, 'Learn More')),
                 }];
         }
     }
@@ -946,7 +937,7 @@ const continueEditSessionExtPoint = ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: 'continueEditSession',
     jsonSchema: {
         description: ( localize(
-            2433,
+            2440,
             'Contributes options for continuing the current edit session in a different environment'
         )),
         type: 'array',
@@ -955,35 +946,35 @@ const continueEditSessionExtPoint = ExtensionsRegistry.registerExtensionPoint({
             properties: {
                 command: {
                     description: ( localize(
-                        2434,
+                        2441,
                         'Identifier of the command to execute. The command must be declared in the \'commands\'-section and return a URI representing a different environment where the current edit session can be continued.'
                     )),
                     type: 'string'
                 },
                 group: {
-                    description: ( localize(2435, 'Group into which this item belongs.')),
+                    description: ( localize(2442, 'Group into which this item belongs.')),
                     type: 'string'
                 },
                 qualifiedName: {
                     description: ( localize(
-                        2436,
+                        2443,
                         'A fully qualified name for this item which is used for display in menus.'
                     )),
                     type: 'string'
                 },
                 description: {
                     description: ( localize(
-                        2437,
+                        2444,
                         "The url, or a command that returns the url, to the option's documentation page."
                     )),
                     type: 'string'
                 },
                 remoteGroup: {
-                    description: ( localize(2438, 'Group into which this item belongs in the remote indicator.')),
+                    description: ( localize(2445, 'Group into which this item belongs in the remote indicator.')),
                     type: 'string'
                 },
                 when: {
-                    description: ( localize(2439, 'Condition which must be true to show this item.')),
+                    description: ( localize(2446, 'Condition which must be true to show this item.')),
                     type: 'string'
                 }
             },
@@ -992,7 +983,7 @@ const continueEditSessionExtPoint = ExtensionsRegistry.registerExtensionPoint({
     }
 });
 const workbenchRegistry = ( (Registry.as(Extensions$1.Workbench)));
-workbenchRegistry.registerWorkbenchContribution(EditSessionsContribution, LifecyclePhase.Restored);
+workbenchRegistry.registerWorkbenchContribution(EditSessionsContribution, 3 );
 ( (Registry.as(Extensions$2.Configuration))).registerConfiguration({
     ...workbenchConfigurationNodeBase,
     'properties': {
@@ -1000,16 +991,16 @@ workbenchRegistry.registerWorkbenchContribution(EditSessionsContribution, Lifecy
             enum: ['onShutdown', 'off'],
             enumDescriptions: [
                 ( localize(
-                    2440,
+                    2447,
                     "Automatically store current working changes in the cloud on window close."
                 )),
-                ( localize(2441, "Never attempt to automatically store working changes in the cloud."))
+                ( localize(2448, "Never attempt to automatically store working changes in the cloud."))
             ],
             'type': 'string',
             'tags': ['experimental', 'usesOnlineServices'],
             'default': 'off',
             'markdownDescription': ( localize(
-                2442,
+                2449,
                 "Controls whether to automatically store available working changes in the cloud for the current workspace. This setting has no effect in the web."
             )),
         },
@@ -1017,16 +1008,16 @@ workbenchRegistry.registerWorkbenchContribution(EditSessionsContribution, Lifecy
             enum: ['onReload', 'off'],
             enumDescriptions: [
                 ( localize(
-                    2443,
+                    2450,
                     "Automatically resume available working changes from the cloud on window reload."
                 )),
-                ( localize(2444, "Never attempt to resume working changes from the cloud."))
+                ( localize(2451, "Never attempt to resume working changes from the cloud."))
             ],
             'type': 'string',
             'tags': ['usesOnlineServices'],
             'default': 'onReload',
             'markdownDescription': ( localize(
-                2445,
+                2452,
                 "Controls whether to automatically resume available working changes stored in the cloud for the current workspace."
             )),
         },
@@ -1034,11 +1025,11 @@ workbenchRegistry.registerWorkbenchContribution(EditSessionsContribution, Lifecy
             enum: ['prompt', 'off'],
             enumDescriptions: [
                 ( localize(
-                    2446,
+                    2453,
                     'Prompt the user to sign in to store working changes in the cloud with Continue Working On.'
                 )),
                 ( localize(
-                    2447,
+                    2454,
                     'Do not store working changes in the cloud with Continue Working On unless the user has already turned on Cloud Changes.'
                 ))
             ],
@@ -1046,7 +1037,7 @@ workbenchRegistry.registerWorkbenchContribution(EditSessionsContribution, Lifecy
             tags: ['usesOnlineServices'],
             default: 'prompt',
             markdownDescription: ( localize(
-                2448,
+                2455,
                 'Controls whether to prompt the user to store working changes in the cloud when using Continue Working On.'
             ))
         },
@@ -1055,7 +1046,7 @@ workbenchRegistry.registerWorkbenchContribution(EditSessionsContribution, Lifecy
             'tags': ['experimental', 'usesOnlineServices'],
             'default': false,
             'markdownDescription': ( localize(
-                2449,
+                2456,
                 "Controls whether to surface cloud changes which partially match the current session."
             ))
         }

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

@@ -1,7 +1,7 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { Event } from 'vscode/vscode/vs/base/common/event';
-import { FileSystemProviderCapabilities, FileSystemProviderErrorCode, FileType, FilePermission } from 'vscode/vscode/vs/platform/files/common/files';
+import { FileSystemProviderErrorCode, FileType, FilePermission } from 'vscode/vscode/vs/platform/files/common/files';
 import { EDIT_SESSIONS_SCHEME, ChangeType, decodeEditSessionFileContent } from '../common/editSessions.js';
 import { IEditSessionsStorageService } from 'vscode/vscode/vs/workbench/contrib/editSessions/common/editSessions.service';
 import { NotSupportedError } from 'vscode/vscode/vs/base/common/errors';
@@ -10,7 +10,7 @@ let EditSessionsFileSystemProvider = class EditSessionsFileSystemProvider {
     static { this.SCHEMA = EDIT_SESSIONS_SCHEME; }
     constructor(editSessionsStorageService) {
         this.editSessionsStorageService = editSessionsStorageService;
-        this.capabilities = FileSystemProviderCapabilities.Readonly + FileSystemProviderCapabilities.FileReadWrite;
+        this.capabilities = 2048  + 2 ;
         this.onDidChangeCapabilities = Event.None;
         this.onDidChangeFile = Event.None;
     }

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

@@ -8,7 +8,6 @@ import { IEnvironmentService } from 'vscode/vscode/vs/platform/environment/commo
 import { IFileService } from 'vscode/vscode/vs/platform/files/common/files.service';
 import { IProductService } from 'vscode/vscode/vs/platform/product/common/productService.service';
 import { IQuickInputService } from 'vscode/vscode/vs/platform/quickinput/common/quickInput.service';
-import { StorageScope, StorageTarget } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
 import { createSyncHeaders } from 'vscode/vscode/vs/platform/userDataSync/common/userDataSync';
 import { IAuthenticationService } from 'vscode/vscode/vs/workbench/services/authentication/common/authentication.service';
@@ -64,7 +63,7 @@ let EditSessionsWorkbenchService = class EditSessionsWorkbenchService extends Di
         this._lastWrittenResources = ( (new Map()));
         this._lastReadResources = ( (new Map()));
         this._register(this.authenticationService.onDidChangeSessions((e) => this.onDidChangeSessions(e.event)));
-        this._register(this.storageService.onDidChangeValue(StorageScope.APPLICATION, EditSessionsWorkbenchService_1.CACHED_SESSION_STORAGE_KEY, this._register(( (new DisposableStore()))))(() => this.onDidChangeStorage()));
+        this._register(this.storageService.onDidChangeValue(-1 , EditSessionsWorkbenchService_1.CACHED_SESSION_STORAGE_KEY, this._register(( (new DisposableStore()))))(() => this.onDidChangeStorage()));
         this.registerSignInAction();
         this.registerResetAuthenticationAction();
         this.signedInContext = EDIT_SESSIONS_SIGNED_IN.bindTo(this.contextKeyService);
@@ -227,13 +226,13 @@ let EditSessionsWorkbenchService = class EditSessionsWorkbenchService extends Di
         return undefined;
     }
     shouldAttemptEditSessionInit() {
-        return isWeb && this.storageService.isNew(StorageScope.APPLICATION) && this.storageService.isNew(StorageScope.WORKSPACE);
+        return isWeb && this.storageService.isNew(-1 ) && this.storageService.isNew(1 );
     }
     async getAccountPreference(reason) {
         const disposables = ( (new DisposableStore()));
         const quickpick = disposables.add(this.quickInputService.createQuickPick({ useSeparators: true }));
         quickpick.ok = false;
-        quickpick.placeholder = reason === 'read' ? ( localize(2388, "Select an account to restore your working changes from the cloud")) : ( localize(2389, "Select an account to store your working changes in the cloud"));
+        quickpick.placeholder = reason === 'read' ? ( localize(2394, "Select an account to restore your working changes from the cloud")) : ( localize(2395, "Select an account to store your working changes in the cloud"));
         quickpick.ignoreFocusOut = true;
         quickpick.items = await this.createQuickpickItems();
         return (
@@ -254,15 +253,15 @@ let EditSessionsWorkbenchService = class EditSessionsWorkbenchService extends Di
     }
     async createQuickpickItems() {
         const options = [];
-        options.push({ type: 'separator', label: ( localize(2390, "Signed In")) });
+        options.push({ type: 'separator', label: ( localize(2396, "Signed In")) });
         const sessions = await this.getAllSessions();
         options.push(...sessions);
-        options.push({ type: 'separator', label: ( localize(2391, "Others")) });
+        options.push({ type: 'separator', label: ( localize(2397, "Others")) });
         for (const authenticationProvider of (await this.getAuthenticationProviders())) {
             const signedInForProvider = ( (sessions.some(account => account.session.providerId === authenticationProvider.id)));
             if (!signedInForProvider || this.authenticationService.getProvider(authenticationProvider.id).supportsMultipleAccounts) {
                 const providerName = this.authenticationService.getProvider(authenticationProvider.id).label;
-                options.push({ label: ( localize(2392, "Sign in with {0}", providerName)), provider: authenticationProvider });
+                options.push({ label: ( localize(2398, "Sign in with {0}", providerName)), provider: authenticationProvider });
             }
         }
         return options;
@@ -305,15 +304,15 @@ let EditSessionsWorkbenchService = class EditSessionsWorkbenchService extends Di
         return configuredAuthenticationProviders.filter(({ id }) => ( (availableAuthenticationProviders.some(provider => provider.id === id))));
     }
     get existingSessionId() {
-        return this.storageService.get(EditSessionsWorkbenchService_1.CACHED_SESSION_STORAGE_KEY, StorageScope.APPLICATION);
+        return this.storageService.get(EditSessionsWorkbenchService_1.CACHED_SESSION_STORAGE_KEY, -1 );
     }
     set existingSessionId(sessionId) {
         this.logService.trace(`Saving authentication session preference for ID ${sessionId}.`);
         if (sessionId === undefined) {
-            this.storageService.remove(EditSessionsWorkbenchService_1.CACHED_SESSION_STORAGE_KEY, StorageScope.APPLICATION);
+            this.storageService.remove(EditSessionsWorkbenchService_1.CACHED_SESSION_STORAGE_KEY, -1 );
         }
         else {
-            this.storageService.store(EditSessionsWorkbenchService_1.CACHED_SESSION_STORAGE_KEY, sessionId, StorageScope.APPLICATION, StorageTarget.MACHINE);
+            this.storageService.store(EditSessionsWorkbenchService_1.CACHED_SESSION_STORAGE_KEY, sessionId, -1 , 1 );
         }
     }
     async getExistingSession() {
@@ -351,7 +350,7 @@ let EditSessionsWorkbenchService = class EditSessionsWorkbenchService extends Di
             constructor() {
                 super({
                     id,
-                    title: ( localize(2393, 'Turn on Cloud Changes...')),
+                    title: ( localize(2399, 'Turn on Cloud Changes...')),
                     category: EDIT_SESSION_SYNC_CATEGORY,
                     precondition: when,
                     menu: [{
@@ -372,7 +371,7 @@ let EditSessionsWorkbenchService = class EditSessionsWorkbenchService extends Di
             group: '2_editSessions',
             command: {
                 id,
-                title: ( localize(2394, 'Turn on Cloud Changes... (1)')),
+                title: ( localize(2400, 'Turn on Cloud Changes... (1)')),
             },
             when: ( (ContextKeyExpr.and(
                  (ContextKeyExpr.equals(EDIT_SESSIONS_PENDING_KEY, true)),
@@ -386,7 +385,7 @@ let EditSessionsWorkbenchService = class EditSessionsWorkbenchService extends Di
             constructor() {
                 super({
                     id: 'workbench.editSessions.actions.resetAuth',
-                    title: ( localize(2395, 'Turn off Cloud Changes...')),
+                    title: ( localize(2401, 'Turn off Cloud Changes...')),
                     category: EDIT_SESSION_SYNC_CATEGORY,
                     precondition: ( (ContextKeyExpr.equals(EDIT_SESSIONS_SIGNED_IN_KEY, true))),
                     menu: [{
@@ -401,8 +400,8 @@ let EditSessionsWorkbenchService = class EditSessionsWorkbenchService extends Di
             }
             async run() {
                 const result = await that.dialogService.confirm({
-                    message: ( localize(2396, 'Do you want to disable storing working changes in the cloud?')),
-                    checkbox: { label: ( localize(2397, 'Delete all stored data from the cloud.')) }
+                    message: ( localize(2402, 'Do you want to disable storing working changes in the cloud?')),
+                    checkbox: { label: ( localize(2403, 'Delete all stored data from the cloud.')) }
                 });
                 if (result.confirmed) {
                     if (result.checkboxChecked) {

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

@@ -51,9 +51,9 @@ let EditSessionsDataViews = class EditSessionsDataViews extends Disposable {
             }], container);
         viewsRegistry.registerViewWelcomeContent(viewId, {
             content: ( localize(
-                5669,
+                5722,
                 'You have no stored changes in the cloud to display.\n{0}',
-                `[${( localize(5670, 'Store Working Changes'))}](command:workbench.editSessions.actions.store)`
+                `[${( localize(5723, 'Store Working Changes'))}](command:workbench.editSessions.actions.store)`
             )),
             when: ( (ContextKeyExpr.equals(EDIT_SESSIONS_COUNT_KEY, 0))),
             order: 1
@@ -62,7 +62,7 @@ let EditSessionsDataViews = class EditSessionsDataViews extends Disposable {
             constructor() {
                 super({
                     id: 'workbench.editSessions.actions.resume',
-                    title: ( localize(5671, "Resume Working Changes")),
+                    title: ( localize(5724, "Resume Working Changes")),
                     icon: Codicon.desktopDownload,
                     menu: {
                         id: MenuId.ViewItemContext,
@@ -85,7 +85,7 @@ let EditSessionsDataViews = class EditSessionsDataViews extends Disposable {
             constructor() {
                 super({
                     id: 'workbench.editSessions.actions.store',
-                    title: ( localize(5672, "Store Working Changes")),
+                    title: ( localize(5725, "Store Working Changes")),
                     icon: Codicon.cloudUpload,
                 });
             }
@@ -99,7 +99,7 @@ let EditSessionsDataViews = class EditSessionsDataViews extends Disposable {
             constructor() {
                 super({
                     id: 'workbench.editSessions.actions.delete',
-                    title: ( localize(5673, "Delete Working Changes")),
+                    title: ( localize(5726, "Delete Working Changes")),
                     icon: Codicon.trash,
                     menu: {
                         id: MenuId.ViewItemContext,
@@ -117,11 +117,11 @@ let EditSessionsDataViews = class EditSessionsDataViews extends Disposable {
                 const editSessionStorageService = accessor.get(IEditSessionsStorageService);
                 const result = await dialogService.confirm({
                     message: ( localize(
-                        5674,
+                        5727,
                         'Are you sure you want to permanently delete your working changes with ref {0}?',
                         editSessionId
                     )),
-                    detail: ( localize(5675, ' You cannot undo this action.')),
+                    detail: ( localize(5728, ' You cannot undo this action.')),
                     type: 'warning',
                     title: EDIT_SESSIONS_TITLE.value
                 });
@@ -135,7 +135,7 @@ let EditSessionsDataViews = class EditSessionsDataViews extends Disposable {
             constructor() {
                 super({
                     id: 'workbench.editSessions.actions.deleteAll',
-                    title: ( localize(5676, "Delete All Working Changes from Cloud")),
+                    title: ( localize(5729, "Delete All Working Changes from Cloud")),
                     icon: Codicon.trash,
                     menu: {
                         id: MenuId.ViewTitle,
@@ -151,10 +151,10 @@ let EditSessionsDataViews = class EditSessionsDataViews extends Disposable {
                 const editSessionStorageService = accessor.get(IEditSessionsStorageService);
                 const result = await dialogService.confirm({
                     message: ( localize(
-                        5677,
+                        5730,
                         'Are you sure you want to permanently delete all stored changes from the cloud?'
                     )),
-                    detail: ( localize(5678, ' You cannot undo this action.')),
+                    detail: ( localize(5731, ' You cannot undo this action.')),
                     type: 'warning',
                     title: EDIT_SESSIONS_TITLE.value
                 });
@@ -268,11 +268,11 @@ let EditSessionDataViewDataProvider = class EditSessionDataViewDataProvider {
                         themeIcon: Codicon.file,
                         command: {
                             id: 'vscode.diff',
-                            title: ( localize(5679, 'Compare Changes')),
+                            title: ( localize(5732, 'Compare Changes')),
                             arguments: [
                                 localCopy,
                                 cloudChangeUri,
-                                `${basename(change.relativeFilePath)} (${( localize(5680, 'Local Copy'))} \u2194 ${( localize(5681, 'Cloud Changes'))})`,
+                                `${basename(change.relativeFilePath)} (${( localize(5733, 'Local Copy'))} \u2194 ${( localize(5734, 'Cloud Changes'))})`,
                                 undefined
                             ]
                         }
@@ -287,7 +287,7 @@ let EditSessionDataViewDataProvider = class EditSessionDataViewDataProvider {
                 themeIcon: Codicon.file,
                 command: {
                     id: API_OPEN_EDITOR_COMMAND_ID,
-                    title: ( localize(5682, 'Open File')),
+                    title: ( localize(5735, 'Open File')),
                     arguments: [cloudChangeUri, undefined, undefined]
                 }
             };

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

@@ -5,7 +5,7 @@ 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(5657, 'Cloud Changes'));
+const EDIT_SESSION_SYNC_CATEGORY = ( localize2(5710, 'Cloud Changes'));
 var ChangeType;
 ( ((function(ChangeType) {
     ChangeType[ChangeType["Addition"] = 1] = "Addition";
@@ -22,8 +22,8 @@ const EDIT_SESSIONS_PENDING_KEY = 'editSessionsPending';
 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(5657, 'Cloud Changes'));
-const EDIT_SESSIONS_VIEW_ICON = registerIcon('edit-sessions-view-icon', Codicon.cloudDownload, ( localize(5658, 'View icon of the cloud changes view.')));
+const EDIT_SESSIONS_TITLE = ( localize2(5710, 'Cloud Changes'));
+const EDIT_SESSIONS_VIEW_ICON = registerIcon('edit-sessions-view-icon', Codicon.cloudDownload, ( localize(5711, '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) {

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

@@ -9,7 +9,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(2387, "Cloud Changes")) }));
+        this.logger = this._register(loggerService.createLogger(joinPath(environmentService.logsHome, `${editSessionsLogId}.log`), { id: editSessionsLogId, name: ( localize(2393, "Cloud Changes")) }));
     }
     trace(message, ...args) {
         this.logger.trace(message, ...args);

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

@@ -5,12 +5,10 @@ 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 { 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';
 
@@ -43,7 +41,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: SyncResource.WorkspaceState, profile }, collection, fileService, environmentService, storageService, userDataSyncStoreService, userDataSyncLocalStoreService, userDataSyncEnablementService, telemetryService, logService, configurationService, uriIdentityService);
+        super({ syncResource: "workspaceState" , profile }, collection, fileService, environmentService, storageService, userDataSyncStoreService, userDataSyncLocalStoreService, userDataSyncEnablementService, telemetryService, logService, configurationService, uriIdentityService);
         this.workspaceIdentityService = workspaceIdentityService;
         this.editSessionsStorageService = editSessionsStorageService;
         this.version = 1;
@@ -55,13 +53,13 @@ let WorkspaceStateSynchroniser = class WorkspaceStateSynchroniser extends Abstra
             return;
         }
         await this.storageService.flush();
-        const keys = ( this.storageService.keys(StorageScope.WORKSPACE, StorageTarget.USER));
+        const keys = ( this.storageService.keys(1, 0 ));
         if (!keys.length) {
             return;
         }
         const contributedData = {};
         keys.forEach((key) => {
-            const data = this.storageService.get(key, StorageScope.WORKSPACE);
+            const data = this.storageService.get(key, 1 );
             if (data) {
                 contributedData[key] = data;
             }
@@ -97,10 +95,10 @@ let WorkspaceStateSynchroniser = class WorkspaceStateSynchroniser extends Abstra
                 try {
                     const value = parse(storage[key]);
                     replaceUris(value);
-                    storageEntries.push({ key, value, scope: StorageScope.WORKSPACE, target: StorageTarget.USER });
+                    storageEntries.push({ key, value, scope: 1 , target: 0  });
                 }
                 catch {
-                    storageEntries.push({ key, value: storage[key], scope: StorageScope.WORKSPACE, target: StorageTarget.USER });
+                    storageEntries.push({ key, value: storage[key], scope: 1 , target: 0  });
                 }
             }
             this.storageService.storeAll(storageEntries, true);

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

@@ -1,7 +1,6 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 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.js

@@ -2,7 +2,6 @@ import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 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';