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

package/vscode/src/vs/workbench/contrib/editSessions/browser/editSessions.contribution.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 { 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';
@@ -9,19 +11,21 @@ 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 { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
-import { UserDataSyncStoreError } from 'vscode/vscode/vs/platform/userDataSync/common/userDataSync';
+import 'vscode/vscode/vs/platform/instantiation/common/extensions';
+import { UserDataSyncStoreError, UserDataSyncErrorCode } 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';
-import { getFileNamesMessage } from 'vscode/vscode/vs/platform/dialogs/common/dialogs';
+import { getFileNamesMessage } from '@codingame/monaco-vscode-d6e33d82-c101-549d-a885-0807ab3e0cfb-common/vscode/vs/platform/dialogs/common/dialogs';
 import { IDialogService, IFileDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs.service';
 import { IProductService } from 'vscode/vscode/vs/platform/product/common/productService.service';
 import { IOpenerService } from 'vscode/vscode/vs/platform/opener/common/opener.service';
@@ -33,15 +37,16 @@ import { ExtensionsRegistry } from 'vscode/vscode/vs/workbench/services/extensio
 import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
 import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands.service';
-import { getVirtualWorkspaceLocation } from 'vscode/vscode/vs/platform/workspace/common/virtualWorkspace';
+import { getVirtualWorkspaceLocation } from '@codingame/monaco-vscode-d6e33d82-c101-549d-a885-0807ab3e0cfb-common/vscode/vs/platform/workspace/common/virtualWorkspace';
 import { Schemas } from 'vscode/vscode/vs/base/common/network';
 import { IsWebContext } from 'vscode/vscode/vs/platform/contextkey/common/contextkeys';
 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 { Extensions } from 'vscode/vscode/vs/workbench/common/views';
+import { Extensions, ViewContainerLocation } from 'vscode/vscode/vs/workbench/common/views';
 import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService.service';
-import { ViewPaneContainer } from 'vscode/vscode/vs/workbench/browser/parts/views/viewPaneContainer';
+import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
+import { ViewPaneContainer } from '@codingame/monaco-vscode-9e888134-1a6f-58d9-b0e6-0fc047448366-common/vscode/vs/workbench/browser/parts/views/viewPaneContainer';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { EditSessionsDataViews } from './editSessionsViews.js';
 import { EditSessionsFileSystemProvider } from './editSessionsFileSystemProvider.js';
@@ -53,8 +58,9 @@ import { EditSessionIdentityMatch } from 'vscode/vscode/vs/platform/workspace/co
 import { IEditSessionIdentityService } from 'vscode/vscode/vs/platform/workspace/common/editSessions.service';
 import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
 import { IOutputService } from 'vscode/vscode/vs/workbench/services/output/common/output.service';
+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 { NumberBadge } from '@codingame/monaco-vscode-a7c9ae3c-16d2-5d17-86b2-981be7094566-common/vscode/vs/workbench/services/activity/common/activity';
 import { IActivityService } from 'vscode/vscode/vs/workbench/services/activity/common/activity.service';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
 import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
@@ -68,29 +74,29 @@ import { EditSessionsStoreClient } from '../common/editSessionsStorageClient.js'
 import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
 import { IWorkspaceIdentityService } from 'vscode/vscode/vs/workbench/services/workspaces/common/workspaceIdentityService.service';
 import { hashAsync } from 'vscode/vscode/vs/base/common/hash';
-import Severity$1 from 'vscode/vscode/vs/base/common/severity';
+import Severity from 'vscode/vscode/vs/base/common/severity';
 
 var EditSessionsContribution_1;
 const continueWorkingOnCommand = {
     id: '_workbench.editSessions.actions.continueEditSession',
-    title: ( localize2(2408, 'Continue Working On...')),
-    precondition: ( (WorkspaceFolderCountContext.notEqualsTo('0'))),
+    title: ( localize2(5639, 'Continue Working On...')),
+    precondition: ( WorkspaceFolderCountContext.notEqualsTo('0')),
     f1: true
 };
 const openLocalFolderCommand = {
     id: '_workbench.editSessions.actions.continueEditSession.openLocalFolder',
-    title: ( localize2(2409, 'Open In Local Folder')),
+    title: ( localize2(5640, 'Open In Local Folder')),
     category: EDIT_SESSION_SYNC_CATEGORY,
-    precondition: ( (ContextKeyExpr.and( (IsWebContext.toNegated()), VirtualWorkspaceContext)))
+    precondition: ( ContextKeyExpr.and(( IsWebContext.toNegated()), VirtualWorkspaceContext))
 };
 const showOutputChannelCommand = {
     id: 'workbench.editSessions.actions.showOutputChannel',
-    title: ( localize2(2410, "Show Log")),
+    title: ( localize2(5641, "Show Log")),
     category: EDIT_SESSION_SYNC_CATEGORY
 };
 const installAdditionalContinueOnOptionsCommand = {
     id: 'workbench.action.continueOn.extensions',
-    title: ( localize(2411, 'Install additional development environment options')),
+    title: ( localize(5642, 'Install additional development environment options')),
 };
 registerAction2(class extends Action2 {
     constructor() {
@@ -100,9 +106,9 @@ registerAction2(class extends Action2 {
         return accessor.get(IExtensionsWorkbenchService).openSearch('@tag:continueOn');
     }
 });
-const resumeProgressOptionsTitle = `[${( localize(2412, 'Resuming working changes...'))}](command:${showOutputChannelCommand.id})`;
+const resumeProgressOptionsTitle = `[${( localize(5643, 'Resuming working changes...'))}](command:${showOutputChannelCommand.id})`;
 const resumeProgressOptions = {
-    location: 10 ,
+    location: ProgressLocation.Window,
     type: 'syncing',
 };
 const queryParamName = 'editSessionId';
@@ -142,25 +148,17 @@ let EditSessionsContribution = class EditSessionsContribution extends Disposable
         this.uriIdentityService = uriIdentityService;
         this.workspaceIdentityService = workspaceIdentityService;
         this.continueEditSessionOptions = [];
-        this.accountsMenuBadgeDisposable = this._register(( (new MutableDisposable())));
-        this.registeredCommands = ( (new Set()));
+        this.accountsMenuBadgeDisposable = this._register(( new MutableDisposable()));
+        this.registeredCommands = ( new Set());
         this.shouldShowViewsContext = EDIT_SESSIONS_SHOW_VIEW.bindTo(this.contextKeyService);
         this.pendingEditSessionsContext = EDIT_SESSIONS_PENDING.bindTo(this.contextKeyService);
         this.pendingEditSessionsContext.set(false);
         if (!this.productService['editSessions.store']?.url) {
             return;
         }
-        this.editSessionsStorageClient = ( (new EditSessionsStoreClient(
-             (URI.parse(this.productService['editSessions.store'].url)),
-            this.productService,
-            this.requestService,
-            this.logService,
-            this.environmentService,
-            this.fileService,
-            this.storageService
-        )));
+        this.editSessionsStorageClient = ( new EditSessionsStoreClient(( URI.parse(this.productService['editSessions.store'].url)), this.productService, this.requestService, this.logService, this.environmentService, this.fileService, this.storageService));
         this.editSessionsStorageService.storeClient = this.editSessionsStorageClient;
-        this.workspaceStateSynchronizer = ( (new WorkspaceStateSynchroniser(
+        this.workspaceStateSynchronizer = ( new WorkspaceStateSynchroniser(
             this.userDataProfilesService.defaultProfile,
             undefined,
             this.editSessionsStorageClient,
@@ -173,15 +171,15 @@ let EditSessionsContribution = class EditSessionsContribution extends Disposable
             this.uriIdentityService,
             this.workspaceIdentityService,
             this.editSessionsStorageService
-        )));
+        ));
         this.autoResumeEditSession();
         this.registerActions();
         this.registerViews();
         this.registerContributedEditSessionOptions();
-        this._register(this.fileService.registerProvider(EditSessionsFileSystemProvider.SCHEMA, ( (new EditSessionsFileSystemProvider(this.editSessionsStorageService)))));
+        this._register(this.fileService.registerProvider(EditSessionsFileSystemProvider.SCHEMA, ( new EditSessionsFileSystemProvider(this.editSessionsStorageService))));
         this.lifecycleService.onWillShutdown((e) => {
-            if (e.reason !== 3  && this.editSessionsStorageService.isSignedIn && this.configurationService.getValue('workbench.experimental.cloudChanges.autoStore') === 'onShutdown' && !isWeb) {
-                e.join(this.autoStoreEditSession(), { id: 'autoStoreWorkingChanges', label: ( localize(2413, 'Storing current working changes...')) });
+            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(5644, 'Storing current working changes...')) });
             }
         });
         this._register(this.editSessionsStorageService.onDidSignIn(() => this.updateAccountsMenuBadge()));
@@ -198,7 +196,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, -1 , false);
+            const hasApplicationLaunchedFromContinueOnFlow = this.storageService.getBoolean(EditSessionsContribution_1.APPLICATION_LAUNCHED_VIA_CONTINUE_ON_STORAGE_KEY, StorageScope.APPLICATION, 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...');
@@ -208,14 +206,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, -1 );
+                    this.storageService.remove(EditSessionsContribution_1.APPLICATION_LAUNCHED_VIA_CONTINUE_ON_STORAGE_KEY, StorageScope.APPLICATION);
                     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, -1 , 1 );
+                this.storageService.store(EditSessionsContribution_1.APPLICATION_LAUNCHED_VIA_CONTINUE_ON_STORAGE_KEY, true, StorageScope.APPLICATION, StorageTarget.MACHINE);
                 this.logService.info('Prompting to enable cloud changes...');
                 await this.editSessionsStorageService.initialize('read');
                 if (this.editSessionsStorageService.isSignedIn) {
@@ -239,31 +237,31 @@ let EditSessionsContribution = class EditSessionsContribution extends Disposable
         if (this.editSessionsStorageService.isSignedIn) {
             return this.accountsMenuBadgeDisposable.clear();
         }
-        const badge = ( (new NumberBadge(1, () => ( localize(2414, 'Check for pending cloud changes')))));
+        const badge = ( new NumberBadge(1, () => ( localize(5645, 'Check for pending cloud changes'))));
         this.accountsMenuBadgeDisposable.value = this.activityService.showAccountsActivity({ badge });
     }
     async autoStoreEditSession() {
-        const cancellationTokenSource = ( (new CancellationTokenSource()));
+        const cancellationTokenSource = ( new CancellationTokenSource());
         await this.progressService.withProgress({
-            location: 10 ,
+            location: ProgressLocation.Window,
             type: 'syncing',
-            title: ( localize(2415, 'Storing working changes...'))
+            title: ( localize(5646, 'Storing working changes...'))
         }, async () => this.storeEditSession(false, cancellationTokenSource.token), () => {
             cancellationTokenSource.cancel();
             cancellationTokenSource.dispose();
         });
     }
     registerViews() {
-        const container = ( (Registry.as(Extensions.ViewContainersRegistry))).registerViewContainer({
+        const container = ( Registry.as(Extensions.ViewContainersRegistry)).registerViewContainer({
             id: EDIT_SESSIONS_CONTAINER_ID,
             title: EDIT_SESSIONS_TITLE,
-            ctorDescriptor: ( (new SyncDescriptor(
+            ctorDescriptor: ( new SyncDescriptor(
                 ViewPaneContainer,
                 [EDIT_SESSIONS_CONTAINER_ID, { mergeViewWithContainerWhenSingleView: true }]
-            ))),
+            )),
             icon: EDIT_SESSIONS_VIEW_ICON,
             hideIfEmpty: true
-        }, 0 , { doNotRegisterOpenCommand: true });
+        }, ViewContainerLocation.Sidebar, { doNotRegisterOpenCommand: true });
         this._register(this.instantiationService.createInstance(EditSessionsDataViews, container));
     }
     registerActions() {
@@ -291,7 +289,7 @@ let EditSessionsContribution = class EditSessionsContribution extends Disposable
             constructor() {
                 super({
                     id: 'workbench.editSessions.actions.showEditSessions',
-                    title: ( localize2(2416, 'Show Cloud Changes')),
+                    title: ( localize2(5647, 'Show Cloud Changes')),
                     category: EDIT_SESSION_SYNC_CATEGORY,
                     f1: true
                 });
@@ -322,13 +320,13 @@ let EditSessionsContribution = class EditSessionsContribution extends Disposable
                 let ref;
                 if (shouldStoreEditSession) {
                     that.telemetryService.publicLog2('continueOn.editSessions.store');
-                    const cancellationTokenSource = ( (new CancellationTokenSource()));
+                    const cancellationTokenSource = ( new CancellationTokenSource());
                     try {
                         ref = await that.progressService.withProgress({
-                            location: 15 ,
+                            location: ProgressLocation.Notification,
                             cancellable: true,
                             type: 'syncing',
-                            title: ( localize(2417, 'Storing your working changes...'))
+                            title: ( localize(5648, 'Storing your working changes...'))
                         }, async () => {
                             const ref = await that.storeEditSession(false, cancellationTokenSource.token);
                             if (ref !== undefined) {
@@ -358,11 +356,11 @@ let EditSessionsContribution = class EditSessionsContribution extends Disposable
                     uri = uri.with({
                         query: uri.query.length > 0 ? (uri.query + `&${queryParamName}=${encodedRef}&continueOn=1`) : `${queryParamName}=${encodedRef}&continueOn=1`
                     });
-                    that.logService.info(`Opening ${( (uri.toString()))}`);
+                    that.logService.info(`Opening ${( uri.toString())}`);
                     await that.openerService.open(uri, { openExternal: true });
                 }
                 else if (!shouldStoreEditSession && uri !== 'noDestinationUri') {
-                    that.logService.info(`Opening ${( (uri.toString()))}`);
+                    that.logService.info(`Opening ${( uri.toString())}`);
                     await that.openerService.open(uri, { openExternal: true });
                 }
                 else if (ref === undefined && shouldStoreEditSession) {
@@ -377,7 +375,7 @@ let EditSessionsContribution = class EditSessionsContribution extends Disposable
             constructor() {
                 super({
                     id: 'workbench.editSessions.actions.resumeLatest',
-                    title: ( localize2(2418, 'Resume Latest Changes from Cloud')),
+                    title: ( localize2(5649, 'Resume Latest Changes from Cloud')),
                     category: EDIT_SESSION_SYNC_CATEGORY,
                     f1: true,
                 });
@@ -390,7 +388,7 @@ let EditSessionsContribution = class EditSessionsContribution extends Disposable
             constructor() {
                 super({
                     id: 'workbench.editSessions.actions.resumeFromSerializedPayload',
-                    title: ( localize2(2419, 'Resume Changes from Serialized Data')),
+                    title: ( localize2(5650, 'Resume Changes from Serialized Data')),
                     category: 'Developer',
                     f1: true,
                 });
@@ -410,16 +408,16 @@ let EditSessionsContribution = class EditSessionsContribution extends Disposable
             constructor() {
                 super({
                     id: 'workbench.editSessions.actions.storeCurrent',
-                    title: ( localize2(2420, 'Store Working Changes in Cloud')),
+                    title: ( localize2(5651, 'Store Working Changes in Cloud')),
                     category: EDIT_SESSION_SYNC_CATEGORY,
                     f1: true,
                 });
             }
             async run(accessor) {
-                const cancellationTokenSource = ( (new CancellationTokenSource()));
+                const cancellationTokenSource = ( new CancellationTokenSource());
                 await that.progressService.withProgress({
-                    location: 15 ,
-                    title: ( localize(2421, 'Storing working changes...'))
+                    location: ProgressLocation.Notification,
+                    title: ( localize(5652, 'Storing working changes...'))
                 }, async () => {
                     that.telemetryService.publicLog2('editSessions.store');
                     await that.storeEditSession(true, cancellationTokenSource.token);
@@ -432,7 +430,7 @@ let EditSessionsContribution = class EditSessionsContribution extends Disposable
     }
     async resumeEditSession(ref, silent, forceApplyUnrelatedChange, applyPartialMatch, progress, serializedData) {
         await this.remoteAgentService.getEnvironment();
-        if (this.contextService.getWorkbenchState() === 1 ) {
+        if (this.contextService.getWorkbenchState() === WorkbenchState.EMPTY) {
             return;
         }
         this.logService.info(ref !== undefined ? `Resuming changes from cloud with ref ${ref}...` : 'Checking for pending cloud changes...');
@@ -441,14 +439,14 @@ let EditSessionsContribution = class EditSessionsContribution extends Disposable
         }
         this.telemetryService.publicLog2('editSessions.resume');
         performance.mark('code/willResumeEditSessionFromIdentifier');
-        progress?.report({ message: ( localize(2422, 'Checking for pending cloud changes...')) });
+        progress?.report({ message: ( localize(5653, '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(2423, 'There are no changes to resume from the cloud.')));
+                this.notificationService.info(( localize(5654, 'There are no changes to resume from the cloud.')));
             }
             else if (ref !== undefined) {
-                this.notificationService.warn(( localize(2424, 'Could not resume changes from the cloud for ID {0}.', ref)));
+                this.notificationService.warn(( localize(5655, '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;
@@ -458,7 +456,7 @@ let EditSessionsContribution = class EditSessionsContribution extends Disposable
         ref = data.ref;
         if (editSession.version > EditSessionSchemaVersion) {
             this.notificationService.error(( localize(
-                2425,
+                5656,
                 "Please upgrade to a newer version of {0} to resume your working changes from the cloud.",
                 this.productService.nameLong
             )));
@@ -472,19 +470,19 @@ let EditSessionsContribution = class EditSessionsContribution extends Disposable
             }
             if (conflictingChanges.length > 0) {
                 const { confirmed } = await this.dialogService.confirm({
-                    type: Severity$1.Warning,
+                    type: Severity.Warning,
                     message: conflictingChanges.length > 1 ?
                         ( localize(
-                            2426,
-                            'Resuming your working changes from the cloud will overwrite the following {0} files. Do you want to proceed?',
-                            conflictingChanges.length
-                        )) :
+                        5657,
+                        'Resuming your working changes from the cloud will overwrite the following {0} files. Do you want to proceed?',
+                        conflictingChanges.length
+                    )) :
                         ( localize(
-                            2427,
-                            'Resuming your working changes from the cloud will overwrite {0}. Do you want to proceed?',
-                            basename(conflictingChanges[0].uri)
-                        )),
-                    detail: conflictingChanges.length > 1 ? getFileNamesMessage(( (conflictingChanges.map((c) => c.uri)))) : undefined
+                        5658,
+                        'Resuming your working changes from the cloud will overwrite {0}. Do you want to proceed?',
+                        basename(conflictingChanges[0].uri)
+                    )),
+                    detail: conflictingChanges.length > 1 ? getFileNamesMessage(( conflictingChanges.map((c) => c.uri))) : undefined
                 });
                 if (!confirmed) {
                     return;
@@ -505,8 +503,8 @@ let EditSessionsContribution = class EditSessionsContribution extends Disposable
             this.telemetryService.publicLog2('editSessions.resume.outcome', { hashedId: hashedEditSessionId(ref), outcome: 'resumeSucceeded' });
         }
         catch (ex) {
-            this.logService.error('Failed to resume edit session, reason: ', ( (ex.toString())));
-            this.notificationService.error(( localize(2428, "Failed to resume your working changes from the cloud.")));
+            this.logService.error('Failed to resume edit session, reason: ', ( ex.toString()));
+            this.notificationService.error(( localize(5659, "Failed to resume your working changes from the cloud.")));
         }
         performance.mark('code/didResumeEditSessionFromIdentifier');
     }
@@ -514,7 +512,7 @@ let EditSessionsContribution = class EditSessionsContribution extends Disposable
         const changes = [];
         const conflictingChanges = [];
         const workspaceFolders = this.contextService.getWorkspace().folders;
-        const cancellationTokenSource = ( (new CancellationTokenSource()));
+        const cancellationTokenSource = ( new CancellationTokenSource());
         for (const folder of editSession.folders) {
             let folderRoot;
             if (folder.canonicalIdentity) {
@@ -534,10 +532,10 @@ let EditSessionsContribution = class EditSessionsContribution extends Disposable
                         else if (match === EditSessionIdentityMatch.Partial &&
                             this.configurationService.getValue('workbench.experimental.cloudChanges.partialMatches.enabled') === true) {
                             if (!applyPartialMatch) {
-                                this.notificationService.prompt(Severity$1.Info, ( localize(
-                                    2429,
+                                this.notificationService.prompt(Severity.Info, ( localize(
+                                    5660,
                                     'You have pending working changes in the cloud for this workspace. Would you like to resume them?'
-                                )), [{ label: ( localize(2430, 'Resume')), run: () => this.resumeEditSession(ref, false, undefined, true) }]);
+                                )), [{ label: ( localize(5661, 'Resume')), run: () => this.resumeEditSession(ref, false, undefined, true) }]);
                             }
                             else {
                                 folderRoot = f;
@@ -554,12 +552,12 @@ let EditSessionsContribution = class EditSessionsContribution extends Disposable
                 this.logService.info(`Skipping applying ${folder.workingChanges.length} changes from edit session with ref ${ref} as no matching workspace folder was found.`);
                 return { changes: [], conflictingChanges: [], contributedStateHandlers: [] };
             }
-            const localChanges = ( (new Set()));
+            const localChanges = ( new Set());
             for (const repository of this.scmService.repositories) {
                 if (repository.provider.rootUri !== undefined &&
                     this.contextService.getWorkspaceFolder(repository.provider.rootUri)?.name === folder.name) {
                     const repositoryChanges = this.getChangedResources(repository);
-                    repositoryChanges.forEach((change) => localChanges.add(( (change.toString()))));
+                    repositoryChanges.forEach((change) => localChanges.add(( change.toString())));
                 }
             }
             for (const change of folder.workingChanges) {
@@ -573,7 +571,7 @@ let EditSessionsContribution = class EditSessionsContribution extends Disposable
         return { changes, conflictingChanges };
     }
     async willChangeLocalContents(localChanges, uriWithIncomingChanges, incomingChange) {
-        if (!( (localChanges.has( (uriWithIncomingChanges.toString()))))) {
+        if (!( localChanges.has(( uriWithIncomingChanges.toString())))) {
             return false;
         }
         const { contents, type } = incomingChange;
@@ -589,7 +587,7 @@ let EditSessionsContribution = class EditSessionsContribution extends Disposable
                 return await this.fileService.exists(uriWithIncomingChanges);
             }
             default:
-                throw ( (new Error('Unhandled change type.')));
+                throw ( new Error('Unhandled change type.'));
         }
     }
     async storeEditSession(fromStoreCommand, cancellationToken) {
@@ -606,7 +604,7 @@ let EditSessionsContribution = class EditSessionsContribution extends Disposable
             for (const uri of trackedUris) {
                 const workspaceFolder = this.contextService.getWorkspaceFolder(uri);
                 if (!workspaceFolder) {
-                    this.logService.info(`Skipping working change ${( (uri.toString()))} as no associated workspace folder was found.`);
+                    this.logService.info(`Skipping working change ${( uri.toString())} as no associated workspace folder was found.`);
                     continue;
                 }
                 await this.editSessionIdentityService.onWillCreateEditSessionIdentity(workspaceFolder, cancellationToken);
@@ -623,7 +621,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(2431, 'Your working changes exceed the size limit and cannot be stored.')));
+                        this.notificationService.error(( localize(5662, '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 });
@@ -643,7 +641,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(
-                    2432,
+                    5663,
                     'Skipped storing working changes in the cloud as there are no edits to store.'
                 )));
             }
@@ -657,16 +655,16 @@ let EditSessionsContribution = class EditSessionsContribution extends Disposable
             return ref;
         }
         catch (ex) {
-            this.logService.error(`Failed to store edit session, reason: `, ( (ex.toString())));
+            this.logService.error(`Failed to store edit session, reason: `, ( ex.toString()));
             if (ex instanceof UserDataSyncStoreError) {
                 switch (ex.code) {
-                    case "TooLarge" :
+                    case UserDataSyncErrorCode.TooLarge:
                         this.telemetryService.publicLog2('editSessions.upload.failed', { reason: 'TooLarge' });
-                        this.notificationService.error(( localize(2431, 'Your working changes exceed the size limit and cannot be stored.')));
+                        this.notificationService.error(( localize(5662, '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(2433, 'Your working changes cannot be stored.')));
+                        this.notificationService.error(( localize(5664, 'Your working changes cannot be stored.')));
                         break;
                 }
             }
@@ -677,7 +675,7 @@ let EditSessionsContribution = class EditSessionsContribution extends Disposable
         return repository.provider.groups.reduce((resources, resourceGroups) => {
             resourceGroups.resources.forEach((resource) => resources.add(resource.sourceUri));
             return resources;
-        }, ( (new Set())));
+        }, ( new Set()));
     }
     hasEditSession() {
         for (const repository of this.scmService.repositories) {
@@ -696,25 +694,25 @@ let EditSessionsContribution = class EditSessionsContribution extends Disposable
             return false;
         }
         if (this.hasEditSession()) {
-            const disposables = ( (new DisposableStore()));
+            const disposables = ( new DisposableStore());
             const quickpick = disposables.add(this.quickInputService.createQuickPick());
-            quickpick.placeholder = ( localize(2434, "Select whether to bring your working changes with you"));
+            quickpick.placeholder = ( localize(5665, "Select whether to bring your working changes with you"));
             quickpick.ok = false;
             quickpick.ignoreFocusOut = true;
-            const withCloudChanges = { label: ( localize(2435, "Yes, continue with my working changes")) };
-            const withoutCloudChanges = { label: ( localize(2436, "No, continue without my working changes")) };
+            const withCloudChanges = { label: ( localize(5666, "Yes, continue with my working changes")) };
+            const withoutCloudChanges = { label: ( localize(5667, "No, continue without my working changes")) };
             quickpick.items = [withCloudChanges, withoutCloudChanges];
-            const continueWithCloudChanges = await ( (new Promise((resolve, reject) => {
+            const continueWithCloudChanges = await ( new Promise((resolve, reject) => {
                 disposables.add(quickpick.onDidAccept(() => {
                     resolve(quickpick.selectedItems[0] === withCloudChanges);
                     disposables.dispose();
                 }));
                 disposables.add(quickpick.onDidHide(() => {
-                    reject(( (new CancellationError())));
+                    reject(( new CancellationError()));
                     disposables.dispose();
                 }));
                 quickpick.show();
-            })));
+            }));
             if (!continueWithCloudChanges) {
                 this.telemetryService.publicLog2('continueOn.editSessions.canStore.outcome', { outcome: 'didNotEnableEditSessionsWhenPrompted' });
                 return continueWithCloudChanges;
@@ -745,13 +743,13 @@ let EditSessionsContribution = class EditSessionsContribution extends Disposable
                     const icon = command.icon;
                     const title = typeof command.title === 'string' ? command.title : command.title.value;
                     const when = ContextKeyExpr.deserialize(contribution.when);
-                    continueEditSessionOptions.push(( (new ContinueEditSessionItem(
+                    continueEditSessionOptions.push(( new ContinueEditSessionItem(
                         ThemeIcon.isThemeIcon(icon) ? `$(${icon.id}) ${title}` : title,
                         command.id,
                         command.source?.title,
                         when,
                         contribution.documentation
-                    ))));
+                    )));
                     if (contribution.qualifiedName) {
                         this.generateStandaloneOptionCommand(command.id, contribution.qualifiedName, contribution.category ?? command.category, when, contribution.remoteGroup);
                     }
@@ -768,7 +766,7 @@ let EditSessionsContribution = class EditSessionsContribution extends Disposable
             precondition: when,
             f1: true
         };
-        if (!( (this.registeredCommands.has(command.id)))) {
+        if (!( this.registeredCommands.has(command.id))) {
             this.registeredCommands.add(command.id);
             this._register(registerAction2(class StandaloneContinueOnOption extends Action2 {
                 constructor() {
@@ -795,31 +793,31 @@ let EditSessionsContribution = class EditSessionsContribution extends Disposable
             }
             async run(accessor) {
                 const selection = await that.fileDialogService.showOpenDialog({
-                    title: ( localize(2437, 'Select a local folder to continue working in')),
+                    title: ( localize(5668, 'Select a local folder to continue working in')),
                     canSelectFolders: true,
                     canSelectMany: false,
                     canSelectFiles: false,
                     availableFileSystems: [Schemas.file]
                 });
-                return selection?.length !== 1 ? undefined : ( (URI.from({
+                return selection?.length !== 1 ? undefined : ( URI.from({
                     scheme: that.productService.urlProtocol,
                     authority: Schemas.file,
                     path: selection[0].path
-                })));
+                }));
             }
         }));
         if (getVirtualWorkspaceLocation(this.contextService.getWorkspace()) !== undefined && isNative) {
-            this.generateStandaloneOptionCommand(openLocalFolderCommand.id, ( localize(2438, 'Continue Working in Existing Local Folder')), undefined, openLocalFolderCommand.precondition, undefined);
+            this.generateStandaloneOptionCommand(openLocalFolderCommand.id, ( localize(5669, 'Continue Working in Existing Local Folder')), undefined, openLocalFolderCommand.precondition, undefined);
         }
     }
     async pickContinueEditSessionDestination() {
-        const disposables = ( (new DisposableStore()));
+        const disposables = ( new DisposableStore());
         const quickPick = disposables.add(this.quickInputService.createQuickPick({ useSeparators: true }));
-        const workspaceContext = this.contextService.getWorkbenchState() === 2
+        const workspaceContext = this.contextService.getWorkbenchState() === WorkbenchState.FOLDER
             ? this.contextService.getWorkspace().folders[0].name
-            : ( (this.contextService.getWorkspace().folders.map((folder) => folder.name))).join(', ');
+            : ( this.contextService.getWorkspace().folders.map((folder) => folder.name)).join(', ');
         quickPick.placeholder = ( localize(
-            2439,
+            5670,
             "Select a development environment to continue working on {0} in",
             `'${workspaceContext}'`
         ));
@@ -827,7 +825,7 @@ let EditSessionsContribution = class EditSessionsContribution extends Disposable
         this.extensionService.onDidChangeExtensions(() => {
             quickPick.items = this.createPickItems();
         });
-        const command = await ( (new Promise((resolve, reject) => {
+        const command = await ( new Promise((resolve, reject) => {
             disposables.add(quickPick.onDidHide(() => {
                 disposables.dispose();
                 resolve(undefined);
@@ -845,11 +843,11 @@ let EditSessionsContribution = class EditSessionsContribution extends Disposable
             quickPick.show();
             disposables.add(quickPick.onDidTriggerItemButton(async (e) => {
                 if (e.item.documentation !== undefined) {
-                    const uri = URI.isUri(e.item.documentation) ? ( (URI.parse(e.item.documentation))) : await this.commandService.executeCommand(e.item.documentation);
+                    const uri = URI.isUri(e.item.documentation) ? ( URI.parse(e.item.documentation)) : await this.commandService.executeCommand(e.item.documentation);
                     void this.openerService.open(uri, { openExternal: true });
                 }
             }));
-        })));
+        }));
         quickPick.dispose();
         return command;
     }
@@ -880,46 +878,46 @@ 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(2440, 'Open in Local Folder')), openLocalFolderCommand.id, ( localize(2441, 'Built-in'))))));
+            items.push(( new ContinueEditSessionItem('$(folder) ' + ( localize(5671, 'Open in Local Folder')), openLocalFolderCommand.id, ( localize(5672, 'Built-in')))));
         }
         const sortedItems = items.sort((item1, item2) => item1.label.localeCompare(item2.label));
-        return sortedItems.concat({ type: 'separator' }, ( (new ContinueEditSessionItem(
+        return sortedItems.concat({ type: 'separator' }, ( new ContinueEditSessionItem(
             installAdditionalContinueOnOptionsCommand.title,
             installAdditionalContinueOnOptionsCommand.id
-        ))));
+        )));
     }
 };
-EditSessionsContribution = EditSessionsContribution_1 = ( (__decorate([
-    ( (__param(0, IEditSessionsStorageService))),
-    ( (__param(1, IFileService))),
-    ( (__param(2, IProgressService))),
-    ( (__param(3, IOpenerService))),
-    ( (__param(4, ITelemetryService))),
-    ( (__param(5, ISCMService))),
-    ( (__param(6, INotificationService))),
-    ( (__param(7, IDialogService))),
-    ( (__param(8, IEditSessionsLogService))),
-    ( (__param(9, IEnvironmentService))),
-    ( (__param(10, IInstantiationService))),
-    ( (__param(11, IProductService))),
-    ( (__param(12, IConfigurationService))),
-    ( (__param(13, IWorkspaceContextService))),
-    ( (__param(14, IEditSessionIdentityService))),
-    ( (__param(15, IQuickInputService))),
-    ( (__param(16, ICommandService))),
-    ( (__param(17, IContextKeyService))),
-    ( (__param(18, IFileDialogService))),
-    ( (__param(19, ILifecycleService))),
-    ( (__param(20, IStorageService))),
-    ( (__param(21, IActivityService))),
-    ( (__param(22, IEditorService))),
-    ( (__param(23, IRemoteAgentService))),
-    ( (__param(24, IExtensionService))),
-    ( (__param(25, IRequestService))),
-    ( (__param(26, IUserDataProfilesService))),
-    ( (__param(27, IUriIdentityService))),
-    ( (__param(28, IWorkspaceIdentityService)))
-], EditSessionsContribution)));
+EditSessionsContribution = EditSessionsContribution_1 = ( __decorate([
+    ( __param(0, IEditSessionsStorageService)),
+    ( __param(1, IFileService)),
+    ( __param(2, IProgressService)),
+    ( __param(3, IOpenerService)),
+    ( __param(4, ITelemetryService)),
+    ( __param(5, ISCMService)),
+    ( __param(6, INotificationService)),
+    ( __param(7, IDialogService)),
+    ( __param(8, IEditSessionsLogService)),
+    ( __param(9, IEnvironmentService)),
+    ( __param(10, IInstantiationService)),
+    ( __param(11, IProductService)),
+    ( __param(12, IConfigurationService)),
+    ( __param(13, IWorkspaceContextService)),
+    ( __param(14, IEditSessionIdentityService)),
+    ( __param(15, IQuickInputService)),
+    ( __param(16, ICommandService)),
+    ( __param(17, IContextKeyService)),
+    ( __param(18, IFileDialogService)),
+    ( __param(19, ILifecycleService)),
+    ( __param(20, IStorageService)),
+    ( __param(21, IActivityService)),
+    ( __param(22, IEditorService)),
+    ( __param(23, IRemoteAgentService)),
+    ( __param(24, IExtensionService)),
+    ( __param(25, IRequestService)),
+    ( __param(26, IUserDataProfilesService)),
+    ( __param(27, IUriIdentityService)),
+    ( __param(28, IWorkspaceIdentityService))
+], EditSessionsContribution));
 const infoButtonClass = ThemeIcon.asClassName(Codicon.info);
 class ContinueEditSessionItem {
     constructor(label, command, description, when, documentation) {
@@ -931,7 +929,7 @@ class ContinueEditSessionItem {
         if (documentation !== undefined) {
             this.buttons = [{
                     iconClass: infoButtonClass,
-                    tooltip: ( localize(2442, 'Learn More')),
+                    tooltip: ( localize(5673, 'Learn More')),
                 }];
         }
     }
@@ -940,7 +938,7 @@ const continueEditSessionExtPoint = ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: 'continueEditSession',
     jsonSchema: {
         description: ( localize(
-            2443,
+            5674,
             'Contributes options for continuing the current edit session in a different environment'
         )),
         type: 'array',
@@ -949,35 +947,35 @@ const continueEditSessionExtPoint = ExtensionsRegistry.registerExtensionPoint({
             properties: {
                 command: {
                     description: ( localize(
-                        2444,
+                        5675,
                         '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(2445, 'Group into which this item belongs.')),
+                    description: ( localize(5676, 'Group into which this item belongs.')),
                     type: 'string'
                 },
                 qualifiedName: {
                     description: ( localize(
-                        2446,
+                        5677,
                         'A fully qualified name for this item which is used for display in menus.'
                     )),
                     type: 'string'
                 },
                 description: {
                     description: ( localize(
-                        2447,
+                        5678,
                         "The url, or a command that returns the url, to the option's documentation page."
                     )),
                     type: 'string'
                 },
                 remoteGroup: {
-                    description: ( localize(2448, 'Group into which this item belongs in the remote indicator.')),
+                    description: ( localize(5679, 'Group into which this item belongs in the remote indicator.')),
                     type: 'string'
                 },
                 when: {
-                    description: ( localize(2449, 'Condition which must be true to show this item.')),
+                    description: ( localize(5680, 'Condition which must be true to show this item.')),
                     type: 'string'
                 }
             },
@@ -985,25 +983,25 @@ const continueEditSessionExtPoint = ExtensionsRegistry.registerExtensionPoint({
         }
     }
 });
-const workbenchRegistry = ( (Registry.as(Extensions$1.Workbench)));
-workbenchRegistry.registerWorkbenchContribution(EditSessionsContribution, 3 );
-( (Registry.as(Extensions$2.Configuration))).registerConfiguration({
+const workbenchRegistry = ( Registry.as(Extensions$1.Workbench));
+workbenchRegistry.registerWorkbenchContribution(EditSessionsContribution, LifecyclePhase.Restored);
+( Registry.as(Extensions$2.Configuration)).registerConfiguration({
     ...workbenchConfigurationNodeBase,
     'properties': {
         'workbench.experimental.cloudChanges.autoStore': {
             enum: ['onShutdown', 'off'],
             enumDescriptions: [
                 ( localize(
-                    2450,
-                    "Automatically store current working changes in the cloud on window close."
-                )),
-                ( localize(2451, "Never attempt to automatically store working changes in the cloud."))
+                5681,
+                "Automatically store current working changes in the cloud on window close."
+            )),
+                ( localize(5682, "Never attempt to automatically store working changes in the cloud."))
             ],
             'type': 'string',
             'tags': ['experimental', 'usesOnlineServices'],
             'default': 'off',
             'markdownDescription': ( localize(
-                2452,
+                5683,
                 "Controls whether to automatically store available working changes in the cloud for the current workspace. This setting has no effect in the web."
             )),
         },
@@ -1011,16 +1009,16 @@ workbenchRegistry.registerWorkbenchContribution(EditSessionsContribution, 3 );
             enum: ['onReload', 'off'],
             enumDescriptions: [
                 ( localize(
-                    2453,
-                    "Automatically resume available working changes from the cloud on window reload."
-                )),
-                ( localize(2454, "Never attempt to resume working changes from the cloud."))
+                5684,
+                "Automatically resume available working changes from the cloud on window reload."
+            )),
+                ( localize(5685, "Never attempt to resume working changes from the cloud."))
             ],
             'type': 'string',
             'tags': ['usesOnlineServices'],
             'default': 'onReload',
             'markdownDescription': ( localize(
-                2455,
+                5686,
                 "Controls whether to automatically resume available working changes stored in the cloud for the current workspace."
             )),
         },
@@ -1028,19 +1026,19 @@ workbenchRegistry.registerWorkbenchContribution(EditSessionsContribution, 3 );
             enum: ['prompt', 'off'],
             enumDescriptions: [
                 ( localize(
-                    2456,
-                    'Prompt the user to sign in to store working changes in the cloud with Continue Working On.'
-                )),
+                5687,
+                'Prompt the user to sign in to store working changes in the cloud with Continue Working On.'
+            )),
                 ( localize(
-                    2457,
-                    'Do not store working changes in the cloud with Continue Working On unless the user has already turned on Cloud Changes.'
-                ))
+                5688,
+                'Do not store working changes in the cloud with Continue Working On unless the user has already turned on Cloud Changes.'
+            ))
             ],
             type: 'string',
             tags: ['usesOnlineServices'],
             default: 'prompt',
             markdownDescription: ( localize(
-                2458,
+                5689,
                 'Controls whether to prompt the user to store working changes in the cloud when using Continue Working On.'
             ))
         },
@@ -1049,7 +1047,7 @@ workbenchRegistry.registerWorkbenchContribution(EditSessionsContribution, 3 );
             'tags': ['experimental', 'usesOnlineServices'],
             'default': false,
             'markdownDescription': ( localize(
-                2459,
+                5690,
                 "Controls whether to surface cloud changes which partially match the current session."
             ))
         }