@codingame/monaco-vscode-edit-sessions-service-override 8.0.3 → 9.0.0

package/package.json

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

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

@@ -1,5 +1,5 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
-import { Disposable, MutableDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
+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';
@@ -79,24 +79,24 @@ import Severity$1 from 'vscode/vscode/vs/base/common/severity';
 var EditSessionsContribution_1;
 const continueWorkingOnCommand = {
     id: '_workbench.editSessions.actions.continueEditSession',
-    title: ( localize2(2385, 'Continue Working On...')),
+    title: ( localize2(1916, 'Continue Working On...')),
     precondition: ( (WorkspaceFolderCountContext.notEqualsTo('0'))),
     f1: true
 };
 const openLocalFolderCommand = {
     id: '_workbench.editSessions.actions.continueEditSession.openLocalFolder',
-    title: ( localize2(2386, 'Open In Local Folder')),
+    title: ( localize2(1917, 'Open In Local Folder')),
     category: EDIT_SESSION_SYNC_CATEGORY,
     precondition: ( (ContextKeyExpr.and( (IsWebContext.toNegated()), VirtualWorkspaceContext)))
 };
 const showOutputChannelCommand = {
     id: 'workbench.editSessions.actions.showOutputChannel',
-    title: ( localize2(2387, "Show Log")),
+    title: ( localize2(1918, "Show Log")),
     category: EDIT_SESSION_SYNC_CATEGORY
 };
 const installAdditionalContinueOnOptionsCommand = {
     id: 'workbench.action.continueOn.extensions',
-    title: ( localize(2388, 'Install additional development environment options')),
+    title: ( localize(1919, 'Install additional development environment options')),
 };
 registerAction2(class extends Action2 {
     constructor() {
@@ -109,7 +109,7 @@ registerAction2(class extends Action2 {
         view?.search('@tag:continueOn');
     }
 });
-const resumeProgressOptionsTitle = `[${( localize(2389, 'Resuming working changes...'))}](command:${showOutputChannelCommand.id})`;
+const resumeProgressOptionsTitle = `[${( localize(1920, 'Resuming working changes...'))}](command:${showOutputChannelCommand.id})`;
 const resumeProgressOptions = {
     location: ProgressLocation.Window,
     type: 'syncing',
@@ -190,7 +190,7 @@ let EditSessionsContribution = class EditSessionsContribution extends Disposable
         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(2390, 'Storing current working changes...')) });
+                e.join(this.autoStoreEditSession(), { id: 'autoStoreWorkingChanges', label: ( localize(1921, 'Storing current working changes...')) });
             }
         });
         this._register(this.editSessionsStorageService.onDidSignIn(() => this.updateAccountsMenuBadge()));
@@ -248,7 +248,7 @@ let EditSessionsContribution = class EditSessionsContribution extends Disposable
         if (this.editSessionsStorageService.isSignedIn) {
             return this.accountsMenuBadgeDisposable.clear();
         }
-        const badge = ( (new NumberBadge(1, () => ( localize(2391, 'Check for pending cloud changes')))));
+        const badge = ( (new NumberBadge(1, () => ( localize(1922, 'Check for pending cloud changes')))));
         this.accountsMenuBadgeDisposable.value = this.activityService.showAccountsActivity({ badge });
     }
     async autoStoreEditSession() {
@@ -256,7 +256,7 @@ let EditSessionsContribution = class EditSessionsContribution extends Disposable
         await this.progressService.withProgress({
             location: ProgressLocation.Window,
             type: 'syncing',
-            title: ( localize(2392, 'Storing working changes...'))
+            title: ( localize(1923, 'Storing working changes...'))
         }, async () => this.storeEditSession(false, cancellationTokenSource.token), () => {
             cancellationTokenSource.cancel();
             cancellationTokenSource.dispose();
@@ -300,7 +300,7 @@ let EditSessionsContribution = class EditSessionsContribution extends Disposable
             constructor() {
                 super({
                     id: 'workbench.editSessions.actions.showEditSessions',
-                    title: ( localize2(2393, 'Show Cloud Changes')),
+                    title: ( localize2(1924, 'Show Cloud Changes')),
                     category: EDIT_SESSION_SYNC_CATEGORY,
                     f1: true
                 });
@@ -337,7 +337,7 @@ let EditSessionsContribution = class EditSessionsContribution extends Disposable
                             location: ProgressLocation.Notification,
                             cancellable: true,
                             type: 'syncing',
-                            title: ( localize(2394, 'Storing your working changes...'))
+                            title: ( localize(1925, 'Storing your working changes...'))
                         }, async () => {
                             const ref = await that.storeEditSession(false, cancellationTokenSource.token);
                             if (ref !== undefined) {
@@ -386,7 +386,7 @@ let EditSessionsContribution = class EditSessionsContribution extends Disposable
             constructor() {
                 super({
                     id: 'workbench.editSessions.actions.resumeLatest',
-                    title: ( localize2(2395, 'Resume Latest Changes from Cloud')),
+                    title: ( localize2(1926, 'Resume Latest Changes from Cloud')),
                     category: EDIT_SESSION_SYNC_CATEGORY,
                     f1: true,
                 });
@@ -399,7 +399,7 @@ let EditSessionsContribution = class EditSessionsContribution extends Disposable
             constructor() {
                 super({
                     id: 'workbench.editSessions.actions.resumeFromSerializedPayload',
-                    title: ( localize2(2396, 'Resume Changes from Serialized Data')),
+                    title: ( localize2(1927, 'Resume Changes from Serialized Data')),
                     category: 'Developer',
                     f1: true,
                 });
@@ -419,7 +419,7 @@ let EditSessionsContribution = class EditSessionsContribution extends Disposable
             constructor() {
                 super({
                     id: 'workbench.editSessions.actions.storeCurrent',
-                    title: ( localize2(2397, 'Store Working Changes in Cloud')),
+                    title: ( localize2(1928, 'Store Working Changes in Cloud')),
                     category: EDIT_SESSION_SYNC_CATEGORY,
                     f1: true,
                 });
@@ -428,7 +428,7 @@ let EditSessionsContribution = class EditSessionsContribution extends Disposable
                 const cancellationTokenSource = ( (new CancellationTokenSource()));
                 await that.progressService.withProgress({
                     location: ProgressLocation.Notification,
-                    title: ( localize(2398, 'Storing working changes...'))
+                    title: ( localize(1929, 'Storing working changes...'))
                 }, async () => {
                     that.telemetryService.publicLog2('editSessions.store');
                     await that.storeEditSession(true, cancellationTokenSource.token);
@@ -450,14 +450,14 @@ let EditSessionsContribution = class EditSessionsContribution extends Disposable
         }
         this.telemetryService.publicLog2('editSessions.resume');
         performance.mark('code/willResumeEditSessionFromIdentifier');
-        progress?.report({ message: ( localize(2399, 'Checking for pending cloud changes...')) });
+        progress?.report({ message: ( localize(1930, '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(2400, 'There are no changes to resume from the cloud.')));
+                this.notificationService.info(( localize(1931, 'There are no changes to resume from the cloud.')));
             }
             else if (ref !== undefined) {
-                this.notificationService.warn(( localize(2401, 'Could not resume changes from the cloud for ID {0}.', ref)));
+                this.notificationService.warn(( localize(1932, '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 +467,7 @@ let EditSessionsContribution = class EditSessionsContribution extends Disposable
         ref = data.ref;
         if (editSession.version > EditSessionSchemaVersion) {
             this.notificationService.error(( localize(
-                2402,
+                1933,
                 "Please upgrade to a newer version of {0} to resume your working changes from the cloud.",
                 this.productService.nameLong
             )));
@@ -484,12 +484,12 @@ let EditSessionsContribution = class EditSessionsContribution extends Disposable
                     type: Severity$1.Warning,
                     message: conflictingChanges.length > 1 ?
                         ( localize(
-                            2403,
+                            1934,
                             'Resuming your working changes from the cloud will overwrite the following {0} files. Do you want to proceed?',
                             conflictingChanges.length
                         )) :
                         ( localize(
-                            2404,
+                            1935,
                             'Resuming your working changes from the cloud will overwrite {0}. Do you want to proceed?',
                             basename(conflictingChanges[0].uri)
                         )),
@@ -515,7 +515,7 @@ let EditSessionsContribution = class EditSessionsContribution extends Disposable
         }
         catch (ex) {
             this.logService.error('Failed to resume edit session, reason: ', ( (ex.toString())));
-            this.notificationService.error(( localize(2405, "Failed to resume your working changes from the cloud.")));
+            this.notificationService.error(( localize(1936, "Failed to resume your working changes from the cloud.")));
         }
         performance.mark('code/didResumeEditSessionFromIdentifier');
     }
@@ -544,9 +544,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(
-                                    2406,
+                                    1937,
                                     'You have pending working changes in the cloud for this workspace. Would you like to resume them?'
-                                )), [{ label: ( localize(2407, 'Resume')), run: () => this.resumeEditSession(ref, false, undefined, true) }]);
+                                )), [{ label: ( localize(1938, 'Resume')), run: () => this.resumeEditSession(ref, false, undefined, true) }]);
                             }
                             else {
                                 folderRoot = f;
@@ -629,7 +629,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(2408, 'Your working changes exceed the size limit and cannot be stored.')));
+                        this.notificationService.error(( localize(1939, '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 +649,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(
-                    2409,
+                    1940,
                     'Skipped storing working changes in the cloud as there are no edits to store.'
                 )));
             }
@@ -668,11 +668,11 @@ let EditSessionsContribution = class EditSessionsContribution extends Disposable
                 switch (ex.code) {
                     case UserDataSyncErrorCode.TooLarge:
                         this.telemetryService.publicLog2('editSessions.upload.failed', { reason: 'TooLarge' });
-                        this.notificationService.error(( localize(2408, 'Your working changes exceed the size limit and cannot be stored.')));
+                        this.notificationService.error(( localize(1939, '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(2410, 'Your working changes cannot be stored.')));
+                        this.notificationService.error(( localize(1941, 'Your working changes cannot be stored.')));
                         break;
                 }
             }
@@ -702,22 +702,23 @@ let EditSessionsContribution = class EditSessionsContribution extends Disposable
             return false;
         }
         if (this.hasEditSession()) {
-            const quickpick = this.quickInputService.createQuickPick();
-            quickpick.placeholder = ( localize(2411, "Select whether to bring your working changes with you"));
+            const disposables = ( (new DisposableStore()));
+            const quickpick = disposables.add(this.quickInputService.createQuickPick());
+            quickpick.placeholder = ( localize(1942, "Select whether to bring your working changes with you"));
             quickpick.ok = false;
             quickpick.ignoreFocusOut = true;
-            const withCloudChanges = { label: ( localize(2412, "Yes, continue with my working changes")) };
-            const withoutCloudChanges = { label: ( localize(2413, "No, continue without my working changes")) };
+            const withCloudChanges = { label: ( localize(1943, "Yes, continue with my working changes")) };
+            const withoutCloudChanges = { label: ( localize(1944, "No, continue without my working changes")) };
             quickpick.items = [withCloudChanges, withoutCloudChanges];
             const continueWithCloudChanges = await ( (new Promise((resolve, reject) => {
-                quickpick.onDidAccept(() => {
+                disposables.add(quickpick.onDidAccept(() => {
                     resolve(quickpick.selectedItems[0] === withCloudChanges);
-                    quickpick.hide();
-                });
-                quickpick.onDidHide(() => {
+                    disposables.dispose();
+                }));
+                disposables.add(quickpick.onDidHide(() => {
                     reject(( (new CancellationError())));
-                    quickpick.hide();
-                });
+                    disposables.dispose();
+                }));
                 quickpick.show();
             })));
             if (!continueWithCloudChanges) {
@@ -800,7 +801,7 @@ let EditSessionsContribution = class EditSessionsContribution extends Disposable
             }
             async run(accessor) {
                 const selection = await that.fileDialogService.showOpenDialog({
-                    title: ( localize(2414, 'Select a local folder to continue working in')),
+                    title: ( localize(1945, 'Select a local folder to continue working in')),
                     canSelectFolders: true,
                     canSelectMany: false,
                     canSelectFiles: false,
@@ -814,16 +815,17 @@ let EditSessionsContribution = class EditSessionsContribution extends Disposable
             }
         }));
         if (getVirtualWorkspaceLocation(this.contextService.getWorkspace()) !== undefined && isNative) {
-            this.generateStandaloneOptionCommand(openLocalFolderCommand.id, ( localize(2415, 'Continue Working in Existing Local Folder')), undefined, openLocalFolderCommand.precondition, undefined);
+            this.generateStandaloneOptionCommand(openLocalFolderCommand.id, ( localize(1946, 'Continue Working in Existing Local Folder')), undefined, openLocalFolderCommand.precondition, undefined);
         }
     }
     async pickContinueEditSessionDestination() {
-        const quickPick = this.quickInputService.createQuickPick();
+        const disposables = ( (new DisposableStore()));
+        const quickPick = disposables.add(this.quickInputService.createQuickPick({ useSeparators: true }));
         const workspaceContext = this.contextService.getWorkbenchState() === WorkbenchState.FOLDER
             ? this.contextService.getWorkspace().folders[0].name
             : ( (this.contextService.getWorkspace().folders.map((folder) => folder.name))).join(', ');
         quickPick.placeholder = ( localize(
-            2416,
+            1947,
             "Select a development environment to continue working on {0} in",
             `'${workspaceContext}'`
         ));
@@ -832,8 +834,11 @@ let EditSessionsContribution = class EditSessionsContribution extends Disposable
             quickPick.items = this.createPickItems();
         });
         const command = await ( (new Promise((resolve, reject) => {
-            quickPick.onDidHide(() => resolve(undefined));
-            quickPick.onDidAccept((e) => {
+            disposables.add(quickPick.onDidHide(() => {
+                disposables.dispose();
+                resolve(undefined);
+            }));
+            disposables.add(quickPick.onDidAccept((e) => {
                 const selection = quickPick.activeItems[0].command;
                 if (selection === installAdditionalContinueOnOptionsCommand.id) {
                     void this.commandService.executeCommand(installAdditionalContinueOnOptionsCommand.id);
@@ -842,14 +847,14 @@ let EditSessionsContribution = class EditSessionsContribution extends Disposable
                     resolve(selection);
                     quickPick.hide();
                 }
-            });
+            }));
             quickPick.show();
-            quickPick.onDidTriggerItemButton(async (e) => {
+            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);
                     void this.openerService.open(uri, { openExternal: true });
                 }
-            });
+            }));
         })));
         quickPick.dispose();
         return command;
@@ -881,7 +886,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(2417, 'Open in Local Folder')), openLocalFolderCommand.id, ( localize(2418, 'Built-in'))))));
+            items.push(( (new ContinueEditSessionItem('$(folder) ' + ( localize(1948, 'Open in Local Folder')), openLocalFolderCommand.id, ( localize(1949, 'Built-in'))))));
         }
         const sortedItems = items.sort((item1, item2) => item1.label.localeCompare(item2.label));
         return sortedItems.concat({ type: 'separator' }, ( (new ContinueEditSessionItem(
@@ -932,7 +937,7 @@ class ContinueEditSessionItem {
         if (documentation !== undefined) {
             this.buttons = [{
                     iconClass: infoButtonClass,
-                    tooltip: ( localize(2419, 'Learn More')),
+                    tooltip: ( localize(1950, 'Learn More')),
                 }];
         }
     }
@@ -941,7 +946,7 @@ const continueEditSessionExtPoint = ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: 'continueEditSession',
     jsonSchema: {
         description: ( localize(
-            2420,
+            1951,
             'Contributes options for continuing the current edit session in a different environment'
         )),
         type: 'array',
@@ -950,35 +955,35 @@ const continueEditSessionExtPoint = ExtensionsRegistry.registerExtensionPoint({
             properties: {
                 command: {
                     description: ( localize(
-                        2421,
+                        1952,
                         '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(2422, 'Group into which this item belongs.')),
+                    description: ( localize(1953, 'Group into which this item belongs.')),
                     type: 'string'
                 },
                 qualifiedName: {
                     description: ( localize(
-                        2423,
+                        1954,
                         'A fully qualified name for this item which is used for display in menus.'
                     )),
                     type: 'string'
                 },
                 description: {
                     description: ( localize(
-                        2424,
+                        1955,
                         "The url, or a command that returns the url, to the option's documentation page."
                     )),
                     type: 'string'
                 },
                 remoteGroup: {
-                    description: ( localize(2425, 'Group into which this item belongs in the remote indicator.')),
+                    description: ( localize(1956, 'Group into which this item belongs in the remote indicator.')),
                     type: 'string'
                 },
                 when: {
-                    description: ( localize(2426, 'Condition which must be true to show this item.')),
+                    description: ( localize(1957, 'Condition which must be true to show this item.')),
                     type: 'string'
                 }
             },
@@ -995,16 +1000,16 @@ workbenchRegistry.registerWorkbenchContribution(EditSessionsContribution, Lifecy
             enum: ['onShutdown', 'off'],
             enumDescriptions: [
                 ( localize(
-                    2427,
+                    1958,
                     "Automatically store current working changes in the cloud on window close."
                 )),
-                ( localize(2428, "Never attempt to automatically store working changes in the cloud."))
+                ( localize(1959, "Never attempt to automatically store working changes in the cloud."))
             ],
             'type': 'string',
             'tags': ['experimental', 'usesOnlineServices'],
             'default': 'off',
             'markdownDescription': ( localize(
-                2429,
+                1960,
                 "Controls whether to automatically store available working changes in the cloud for the current workspace. This setting has no effect in the web."
             )),
         },
@@ -1012,16 +1017,16 @@ workbenchRegistry.registerWorkbenchContribution(EditSessionsContribution, Lifecy
             enum: ['onReload', 'off'],
             enumDescriptions: [
                 ( localize(
-                    2430,
+                    1961,
                     "Automatically resume available working changes from the cloud on window reload."
                 )),
-                ( localize(2431, "Never attempt to resume working changes from the cloud."))
+                ( localize(1962, "Never attempt to resume working changes from the cloud."))
             ],
             'type': 'string',
             'tags': ['usesOnlineServices'],
             'default': 'onReload',
             'markdownDescription': ( localize(
-                2432,
+                1963,
                 "Controls whether to automatically resume available working changes stored in the cloud for the current workspace."
             )),
         },
@@ -1029,11 +1034,11 @@ workbenchRegistry.registerWorkbenchContribution(EditSessionsContribution, Lifecy
             enum: ['prompt', 'off'],
             enumDescriptions: [
                 ( localize(
-                    2433,
+                    1964,
                     'Prompt the user to sign in to store working changes in the cloud with Continue Working On.'
                 )),
                 ( localize(
-                    2434,
+                    1965,
                     'Do not store working changes in the cloud with Continue Working On unless the user has already turned on Cloud Changes.'
                 ))
             ],
@@ -1041,7 +1046,7 @@ workbenchRegistry.registerWorkbenchContribution(EditSessionsContribution, Lifecy
             tags: ['usesOnlineServices'],
             default: 'prompt',
             markdownDescription: ( localize(
-                2435,
+                1966,
                 'Controls whether to prompt the user to store working changes in the cloud when using Continue Working On.'
             ))
         },
@@ -1050,7 +1055,7 @@ workbenchRegistry.registerWorkbenchContribution(EditSessionsContribution, Lifecy
             'tags': ['experimental', 'usesOnlineServices'],
             'default': false,
             'markdownDescription': ( localize(
-                2436,
+                1967,
                 "Controls whether to surface cloud changes which partially match the current session."
             ))
         }

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

@@ -230,38 +230,39 @@ let EditSessionsWorkbenchService = class EditSessionsWorkbenchService extends Di
         return isWeb && this.storageService.isNew(StorageScope.APPLICATION) && this.storageService.isNew(StorageScope.WORKSPACE);
     }
     async getAccountPreference(reason) {
-        const quickpick = this.quickInputService.createQuickPick();
+        const disposables = ( (new DisposableStore()));
+        const quickpick = disposables.add(this.quickInputService.createQuickPick({ useSeparators: true }));
         quickpick.ok = false;
-        quickpick.placeholder = reason === 'read' ? ( localize(2375, "Select an account to restore your working changes from the cloud")) : ( localize(2376, "Select an account to store your working changes in the cloud"));
+        quickpick.placeholder = reason === 'read' ? ( localize(1906, "Select an account to restore your working changes from the cloud")) : ( localize(1907, "Select an account to store your working changes in the cloud"));
         quickpick.ignoreFocusOut = true;
         quickpick.items = await this.createQuickpickItems();
         return (
              (new Promise((resolve, reject) => {
-                quickpick.onDidHide((e) => {
+                disposables.add(quickpick.onDidHide((e) => {
                     reject(( (new CancellationError())));
-                    quickpick.dispose();
-                });
-                quickpick.onDidAccept(async (e) => {
+                    disposables.dispose();
+                }));
+                disposables.add(quickpick.onDidAccept(async (e) => {
                     const selection = quickpick.selectedItems[0];
                     const session = 'provider' in selection ? { ...(await this.authenticationService.createSession(selection.provider.id, selection.provider.scopes)), providerId: selection.provider.id } : ('session' in selection ? selection.session : undefined);
                     resolve(session);
                     quickpick.hide();
-                });
+                }));
                 quickpick.show();
             }))
         );
     }
     async createQuickpickItems() {
         const options = [];
-        options.push({ type: 'separator', label: ( localize(2377, "Signed In")) });
+        options.push({ type: 'separator', label: ( localize(1908, "Signed In")) });
         const sessions = await this.getAllSessions();
         options.push(...sessions);
-        options.push({ type: 'separator', label: ( localize(2378, "Others")) });
+        options.push({ type: 'separator', label: ( localize(1909, "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(2379, "Sign in with {0}", providerName)), provider: authenticationProvider });
+                options.push({ label: ( localize(1910, "Sign in with {0}", providerName)), provider: authenticationProvider });
             }
         }
         return options;
@@ -350,7 +351,7 @@ let EditSessionsWorkbenchService = class EditSessionsWorkbenchService extends Di
             constructor() {
                 super({
                     id,
-                    title: ( localize(2380, 'Turn on Cloud Changes...')),
+                    title: ( localize(1911, 'Turn on Cloud Changes...')),
                     category: EDIT_SESSION_SYNC_CATEGORY,
                     precondition: when,
                     menu: [{
@@ -371,7 +372,7 @@ let EditSessionsWorkbenchService = class EditSessionsWorkbenchService extends Di
             group: '2_editSessions',
             command: {
                 id,
-                title: ( localize(2381, 'Turn on Cloud Changes... (1)')),
+                title: ( localize(1912, 'Turn on Cloud Changes... (1)')),
             },
             when: ( (ContextKeyExpr.and(
                  (ContextKeyExpr.equals(EDIT_SESSIONS_PENDING_KEY, true)),
@@ -385,7 +386,7 @@ let EditSessionsWorkbenchService = class EditSessionsWorkbenchService extends Di
             constructor() {
                 super({
                     id: 'workbench.editSessions.actions.resetAuth',
-                    title: ( localize(2382, 'Turn off Cloud Changes...')),
+                    title: ( localize(1913, 'Turn off Cloud Changes...')),
                     category: EDIT_SESSION_SYNC_CATEGORY,
                     precondition: ( (ContextKeyExpr.equals(EDIT_SESSIONS_SIGNED_IN_KEY, true))),
                     menu: [{
@@ -400,8 +401,8 @@ let EditSessionsWorkbenchService = class EditSessionsWorkbenchService extends Di
             }
             async run() {
                 const result = await that.dialogService.confirm({
-                    message: ( localize(2383, 'Do you want to disable storing working changes in the cloud?')),
-                    checkbox: { label: ( localize(2384, 'Delete all stored data from the cloud.')) }
+                    message: ( localize(1914, 'Do you want to disable storing working changes in the cloud?')),
+                    checkbox: { label: ( localize(1915, '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(
-                5692,
+                5633,
                 'You have no stored changes in the cloud to display.\n{0}',
-                `[${( localize(5693, 'Store Working Changes'))}](command:workbench.editSessions.actions.store)`
+                `[${( localize(5634, '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(5694, "Resume Working Changes")),
+                    title: ( localize(5635, "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(5695, "Store Working Changes")),
+                    title: ( localize(5636, "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(5696, "Delete Working Changes")),
+                    title: ( localize(5637, "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(
-                        5697,
+                        5638,
                         'Are you sure you want to permanently delete your working changes with ref {0}?',
                         editSessionId
                     )),
-                    detail: ( localize(5698, ' You cannot undo this action.')),
+                    detail: ( localize(5639, ' 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(5699, "Delete All Working Changes from Cloud")),
+                    title: ( localize(5640, "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(
-                        5700,
+                        5641,
                         'Are you sure you want to permanently delete all stored changes from the cloud?'
                     )),
-                    detail: ( localize(5701, ' You cannot undo this action.')),
+                    detail: ( localize(5642, ' 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(5702, 'Compare Changes')),
+                            title: ( localize(5643, 'Compare Changes')),
                             arguments: [
                                 localCopy,
                                 cloudChangeUri,
-                                `${basename(change.relativeFilePath)} (${( localize(5703, 'Local Copy'))} \u2194 ${( localize(5704, 'Cloud Changes'))})`,
+                                `${basename(change.relativeFilePath)} (${( localize(5644, 'Local Copy'))} \u2194 ${( localize(5645, 'Cloud Changes'))})`,
                                 undefined
                             ]
                         }
@@ -287,7 +287,7 @@ let EditSessionDataViewDataProvider = class EditSessionDataViewDataProvider {
                 themeIcon: Codicon.file,
                 command: {
                     id: API_OPEN_EDITOR_COMMAND_ID,
-                    title: ( localize(5705, 'Open File')),
+                    title: ( localize(5646, '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(5680, 'Cloud Changes'));
+const EDIT_SESSION_SYNC_CATEGORY = ( localize2(5621, '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(5680, 'Cloud Changes'));
-const EDIT_SESSIONS_VIEW_ICON = registerIcon('edit-sessions-view-icon', Codicon.cloudDownload, ( localize(5681, 'View icon of the cloud changes view.')));
+const EDIT_SESSIONS_TITLE = ( localize2(5621, 'Cloud Changes'));
+const EDIT_SESSIONS_VIEW_ICON = registerIcon('edit-sessions-view-icon', Codicon.cloudDownload, ( localize(5622, '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(2374, "Cloud Changes")) }));
+        this.logger = this._register(loggerService.createLogger(joinPath(environmentService.logsHome, `${editSessionsLogId}.log`), { id: editSessionsLogId, name: ( localize(1905, "Cloud Changes")) }));
     }
     trace(message, ...args) {
         this.logger.trace(message, ...args);