@codingame/monaco-vscode-edit-sessions-service-override 7.1.0 → 7.1.1

package/package.json

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

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

@@ -5,7 +5,7 @@ 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 { localize2WithPath, localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize2, localize } from 'vscode/vscode/vs/nls';
 import { EDIT_SESSION_SYNC_CATEGORY, EDIT_SESSIONS_SHOW_VIEW, EDIT_SESSIONS_PENDING, EDIT_SESSIONS_CONTAINER_ID, EDIT_SESSIONS_TITLE, EDIT_SESSIONS_VIEW_ICON, editSessionsLogId, EDIT_SESSIONS_DATA_VIEW_ID, hashedEditSessionId, EditSessionSchemaVersion, ChangeType, decodeEditSessionFileContent, FileType } from '../common/editSessions.js';
 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';
@@ -77,27 +77,26 @@ import { IWorkspaceIdentityService } from 'vscode/vscode/vs/workbench/services/w
 import Severity$1 from 'vscode/vscode/vs/base/common/severity';
 
 var EditSessionsContribution_1;
-const _moduleId = "vs/workbench/contrib/editSessions/browser/editSessions.contribution";
 const continueWorkingOnCommand = {
     id: '_workbench.editSessions.actions.continueEditSession',
-    title: ( localize2WithPath(_moduleId, 0, 'Continue Working On...')),
+    title: ( localize2(2386, 'Continue Working On...')),
     precondition: ( (WorkspaceFolderCountContext.notEqualsTo('0'))),
     f1: true
 };
 const openLocalFolderCommand = {
     id: '_workbench.editSessions.actions.continueEditSession.openLocalFolder',
-    title: ( localize2WithPath(_moduleId, 1, 'Open In Local Folder')),
+    title: ( localize2(2387, 'Open In Local Folder')),
     category: EDIT_SESSION_SYNC_CATEGORY,
     precondition: ( (ContextKeyExpr.and( (IsWebContext.toNegated()), VirtualWorkspaceContext)))
 };
 const showOutputChannelCommand = {
     id: 'workbench.editSessions.actions.showOutputChannel',
-    title: ( localize2WithPath(_moduleId, 2, "Show Log")),
+    title: ( localize2(2388, "Show Log")),
     category: EDIT_SESSION_SYNC_CATEGORY
 };
 const installAdditionalContinueOnOptionsCommand = {
     id: 'workbench.action.continueOn.extensions',
-    title: ( localizeWithPath(_moduleId, 3, 'Install additional development environment options')),
+    title: ( localize(2389, 'Install additional development environment options')),
 };
 registerAction2(class extends Action2 {
     constructor() {
@@ -110,7 +109,7 @@ registerAction2(class extends Action2 {
         view?.search('@tag:continueOn');
     }
 });
-const resumeProgressOptionsTitle = `[${( localizeWithPath(_moduleId, 4, 'Resuming working changes...'))}](command:${showOutputChannelCommand.id})`;
+const resumeProgressOptionsTitle = `[${( localize(2390, 'Resuming working changes...'))}](command:${showOutputChannelCommand.id})`;
 const resumeProgressOptions = {
     location: ProgressLocation.Window,
     type: 'syncing',
@@ -191,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: ( localizeWithPath(_moduleId, 5, 'Storing current working changes...')) });
+                e.join(this.autoStoreEditSession(), { id: 'autoStoreWorkingChanges', label: ( localize(2391, 'Storing current working changes...')) });
             }
         });
         this._register(this.editSessionsStorageService.onDidSignIn(() => this.updateAccountsMenuBadge()));
@@ -249,7 +248,7 @@ let EditSessionsContribution = class EditSessionsContribution extends Disposable
         if (this.editSessionsStorageService.isSignedIn) {
             return this.accountsMenuBadgeDisposable.clear();
         }
-        const badge = ( (new NumberBadge(1, () => ( localizeWithPath(_moduleId, 6, 'Check for pending cloud changes')))));
+        const badge = ( (new NumberBadge(1, () => ( localize(2392, 'Check for pending cloud changes')))));
         this.accountsMenuBadgeDisposable.value = this.activityService.showAccountsActivity({ badge });
     }
     async autoStoreEditSession() {
@@ -257,7 +256,7 @@ let EditSessionsContribution = class EditSessionsContribution extends Disposable
         await this.progressService.withProgress({
             location: ProgressLocation.Window,
             type: 'syncing',
-            title: ( localizeWithPath(_moduleId, 7, 'Storing working changes...'))
+            title: ( localize(2393, 'Storing working changes...'))
         }, async () => this.storeEditSession(false, cancellationTokenSource.token), () => {
             cancellationTokenSource.cancel();
             cancellationTokenSource.dispose();
@@ -301,7 +300,7 @@ let EditSessionsContribution = class EditSessionsContribution extends Disposable
             constructor() {
                 super({
                     id: 'workbench.editSessions.actions.showEditSessions',
-                    title: ( localize2WithPath(_moduleId, 8, 'Show Cloud Changes')),
+                    title: ( localize2(2394, 'Show Cloud Changes')),
                     category: EDIT_SESSION_SYNC_CATEGORY,
                     f1: true
                 });
@@ -338,7 +337,7 @@ let EditSessionsContribution = class EditSessionsContribution extends Disposable
                             location: ProgressLocation.Notification,
                             cancellable: true,
                             type: 'syncing',
-                            title: ( localizeWithPath(_moduleId, 9, 'Storing your working changes...'))
+                            title: ( localize(2395, 'Storing your working changes...'))
                         }, async () => {
                             const ref = await that.storeEditSession(false, cancellationTokenSource.token);
                             if (ref !== undefined) {
@@ -387,7 +386,7 @@ let EditSessionsContribution = class EditSessionsContribution extends Disposable
             constructor() {
                 super({
                     id: 'workbench.editSessions.actions.resumeLatest',
-                    title: ( localize2WithPath(_moduleId, 10, 'Resume Latest Changes from Cloud')),
+                    title: ( localize2(2396, 'Resume Latest Changes from Cloud')),
                     category: EDIT_SESSION_SYNC_CATEGORY,
                     f1: true,
                 });
@@ -400,7 +399,7 @@ let EditSessionsContribution = class EditSessionsContribution extends Disposable
             constructor() {
                 super({
                     id: 'workbench.editSessions.actions.resumeFromSerializedPayload',
-                    title: ( localize2WithPath(_moduleId, 11, 'Resume Changes from Serialized Data')),
+                    title: ( localize2(2397, 'Resume Changes from Serialized Data')),
                     category: 'Developer',
                     f1: true,
                 });
@@ -420,7 +419,7 @@ let EditSessionsContribution = class EditSessionsContribution extends Disposable
             constructor() {
                 super({
                     id: 'workbench.editSessions.actions.storeCurrent',
-                    title: ( localize2WithPath(_moduleId, 12, 'Store Working Changes in Cloud')),
+                    title: ( localize2(2398, 'Store Working Changes in Cloud')),
                     category: EDIT_SESSION_SYNC_CATEGORY,
                     f1: true,
                 });
@@ -429,7 +428,7 @@ let EditSessionsContribution = class EditSessionsContribution extends Disposable
                 const cancellationTokenSource = ( (new CancellationTokenSource()));
                 await that.progressService.withProgress({
                     location: ProgressLocation.Notification,
-                    title: ( localizeWithPath(_moduleId, 13, 'Storing working changes...'))
+                    title: ( localize(2399, 'Storing working changes...'))
                 }, async () => {
                     that.telemetryService.publicLog2('editSessions.store');
                     await that.storeEditSession(true, cancellationTokenSource.token);
@@ -451,14 +450,14 @@ let EditSessionsContribution = class EditSessionsContribution extends Disposable
         }
         this.telemetryService.publicLog2('editSessions.resume');
         performance.mark('code/willResumeEditSessionFromIdentifier');
-        progress?.report({ message: ( localizeWithPath(_moduleId, 14, 'Checking for pending cloud changes...')) });
+        progress?.report({ message: ( localize(2400, '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(( localizeWithPath(_moduleId, 15, 'There are no changes to resume from the cloud.')));
+                this.notificationService.info(( localize(2401, 'There are no changes to resume from the cloud.')));
             }
             else if (ref !== undefined) {
-                this.notificationService.warn(( localizeWithPath(_moduleId, 16, 'Could not resume changes from the cloud for ID {0}.', ref)));
+                this.notificationService.warn(( localize(2402, '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,9 +466,8 @@ let EditSessionsContribution = class EditSessionsContribution extends Disposable
         const editSession = JSON.parse(data.content);
         ref = data.ref;
         if (editSession.version > EditSessionSchemaVersion) {
-            this.notificationService.error(( localizeWithPath(
-                _moduleId,
-                17,
+            this.notificationService.error(( localize(
+                2403,
                 "Please upgrade to a newer version of {0} to resume your working changes from the cloud.",
                 this.productService.nameLong
             )));
@@ -485,15 +483,13 @@ let EditSessionsContribution = class EditSessionsContribution extends Disposable
                 const { confirmed } = await this.dialogService.confirm({
                     type: Severity$1.Warning,
                     message: conflictingChanges.length > 1 ?
-                        ( localizeWithPath(
-                            _moduleId,
-                            18,
+                        ( localize(
+                            2404,
                             'Resuming your working changes from the cloud will overwrite the following {0} files. Do you want to proceed?',
                             conflictingChanges.length
                         )) :
-                        ( localizeWithPath(
-                            _moduleId,
-                            19,
+                        ( localize(
+                            2405,
                             'Resuming your working changes from the cloud will overwrite {0}. Do you want to proceed?',
                             basename(conflictingChanges[0].uri)
                         )),
@@ -519,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(( localizeWithPath(_moduleId, 20, "Failed to resume your working changes from the cloud.")));
+            this.notificationService.error(( localize(2406, "Failed to resume your working changes from the cloud.")));
         }
         performance.mark('code/didResumeEditSessionFromIdentifier');
     }
@@ -547,11 +543,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, ( localizeWithPath(
-                                    _moduleId,
-                                    21,
+                                this.notificationService.prompt(Severity$1.Info, ( localize(
+                                    2407,
                                     'You have pending working changes in the cloud for this workspace. Would you like to resume them?'
-                                )), [{ label: ( localizeWithPath(_moduleId, 22, 'Resume')), run: () => this.resumeEditSession(ref, false, undefined, true) }]);
+                                )), [{ label: ( localize(2408, 'Resume')), run: () => this.resumeEditSession(ref, false, undefined, true) }]);
                             }
                             else {
                                 folderRoot = f;
@@ -634,11 +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(( localizeWithPath(
-                            _moduleId,
-                            23,
-                            'Your working changes exceed the size limit and cannot be stored.'
-                        )));
+                        this.notificationService.error(( localize(2409, '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 });
@@ -657,9 +648,8 @@ let EditSessionsContribution = class EditSessionsContribution extends Disposable
         if (!hasEdits) {
             this.logService.info('Skipped storing working changes in the cloud as there are no edits to store.');
             if (fromStoreCommand) {
-                this.notificationService.info(( localizeWithPath(
-                    _moduleId,
-                    24,
+                this.notificationService.info(( localize(
+                    2410,
                     'Skipped storing working changes in the cloud as there are no edits to store.'
                 )));
             }
@@ -678,15 +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(( localizeWithPath(
-                            _moduleId,
-                            23,
-                            'Your working changes exceed the size limit and cannot be stored.'
-                        )));
+                        this.notificationService.error(( localize(2410, 'Your working changes exceed the size limit and cannot be stored.')));
                         break;
                     default:
                         this.telemetryService.publicLog2('editSessions.upload.failed', { reason: 'unknown' });
-                        this.notificationService.error(( localizeWithPath(_moduleId, 25, 'Your working changes cannot be stored.')));
+                        this.notificationService.error(( localize(2411, 'Your working changes cannot be stored.')));
                         break;
                 }
             }
@@ -717,11 +703,11 @@ let EditSessionsContribution = class EditSessionsContribution extends Disposable
         }
         if (this.hasEditSession()) {
             const quickpick = this.quickInputService.createQuickPick();
-            quickpick.placeholder = ( localizeWithPath(_moduleId, 26, "Select whether to bring your working changes with you"));
+            quickpick.placeholder = ( localize(2412, "Select whether to bring your working changes with you"));
             quickpick.ok = false;
             quickpick.ignoreFocusOut = true;
-            const withCloudChanges = { label: ( localizeWithPath(_moduleId, 27, "Yes, continue with my working changes")) };
-            const withoutCloudChanges = { label: ( localizeWithPath(_moduleId, 28, "No, continue without my working changes")) };
+            const withCloudChanges = { label: ( localize(2413, "Yes, continue with my working changes")) };
+            const withoutCloudChanges = { label: ( localize(2414, "No, continue without my working changes")) };
             quickpick.items = [withCloudChanges, withoutCloudChanges];
             const continueWithCloudChanges = await ( (new Promise((resolve, reject) => {
                 quickpick.onDidAccept(() => {
@@ -814,7 +800,7 @@ let EditSessionsContribution = class EditSessionsContribution extends Disposable
             }
             async run(accessor) {
                 const selection = await that.fileDialogService.showOpenDialog({
-                    title: ( localizeWithPath(_moduleId, 29, 'Select a local folder to continue working in')),
+                    title: ( localize(2415, 'Select a local folder to continue working in')),
                     canSelectFolders: true,
                     canSelectMany: false,
                     canSelectFiles: false,
@@ -828,7 +814,7 @@ let EditSessionsContribution = class EditSessionsContribution extends Disposable
             }
         }));
         if (getVirtualWorkspaceLocation(this.contextService.getWorkspace()) !== undefined && isNative) {
-            this.generateStandaloneOptionCommand(openLocalFolderCommand.id, ( localizeWithPath(_moduleId, 30, 'Continue Working in Existing Local Folder')), undefined, openLocalFolderCommand.precondition, undefined);
+            this.generateStandaloneOptionCommand(openLocalFolderCommand.id, ( localize(2416, 'Continue Working in Existing Local Folder')), undefined, openLocalFolderCommand.precondition, undefined);
         }
     }
     async pickContinueEditSessionDestination() {
@@ -836,9 +822,8 @@ let EditSessionsContribution = class EditSessionsContribution extends Disposable
         const workspaceContext = this.contextService.getWorkbenchState() === WorkbenchState.FOLDER
             ? this.contextService.getWorkspace().folders[0].name
             : ( (this.contextService.getWorkspace().folders.map((folder) => folder.name))).join(', ');
-        quickPick.placeholder = ( localizeWithPath(
-            _moduleId,
-            31,
+        quickPick.placeholder = ( localize(
+            2417,
             "Select a development environment to continue working on {0} in",
             `'${workspaceContext}'`
         ));
@@ -896,7 +881,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) ' + ( localizeWithPath(_moduleId, 32, 'Open in Local Folder')), openLocalFolderCommand.id, ( localizeWithPath(_moduleId, 33, 'Built-in'))))));
+            items.push(( (new ContinueEditSessionItem('$(folder) ' + ( localize(2418, 'Open in Local Folder')), openLocalFolderCommand.id, ( localize(2419, 'Built-in'))))));
         }
         const sortedItems = items.sort((item1, item2) => item1.label.localeCompare(item2.label));
         return sortedItems.concat({ type: 'separator' }, ( (new ContinueEditSessionItem(
@@ -947,7 +932,7 @@ class ContinueEditSessionItem {
         if (documentation !== undefined) {
             this.buttons = [{
                     iconClass: infoButtonClass,
-                    tooltip: ( localizeWithPath(_moduleId, 34, 'Learn More')),
+                    tooltip: ( localize(2420, 'Learn More')),
                 }];
         }
     }
@@ -955,9 +940,8 @@ class ContinueEditSessionItem {
 const continueEditSessionExtPoint = ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: 'continueEditSession',
     jsonSchema: {
-        description: ( localizeWithPath(
-            _moduleId,
-            35,
+        description: ( localize(
+            2421,
             'Contributes options for continuing the current edit session in a different environment'
         )),
         type: 'array',
@@ -965,43 +949,36 @@ const continueEditSessionExtPoint = ExtensionsRegistry.registerExtensionPoint({
             type: 'object',
             properties: {
                 command: {
-                    description: ( localizeWithPath(
-                        _moduleId,
-                        36,
+                    description: ( localize(
+                        2422,
                         '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: ( localizeWithPath(_moduleId, 37, 'Group into which this item belongs.')),
+                    description: ( localize(2423, 'Group into which this item belongs.')),
                     type: 'string'
                 },
                 qualifiedName: {
-                    description: ( localizeWithPath(
-                        _moduleId,
-                        38,
+                    description: ( localize(
+                        2424,
                         'A fully qualified name for this item which is used for display in menus.'
                     )),
                     type: 'string'
                 },
                 description: {
-                    description: ( localizeWithPath(
-                        _moduleId,
-                        39,
+                    description: ( localize(
+                        2425,
                         "The url, or a command that returns the url, to the option's documentation page."
                     )),
                     type: 'string'
                 },
                 remoteGroup: {
-                    description: ( localizeWithPath(
-                        _moduleId,
-                        40,
-                        'Group into which this item belongs in the remote indicator.'
-                    )),
+                    description: ( localize(2426, 'Group into which this item belongs in the remote indicator.')),
                     type: 'string'
                 },
                 when: {
-                    description: ( localizeWithPath(_moduleId, 41, 'Condition which must be true to show this item.')),
+                    description: ( localize(2427, 'Condition which must be true to show this item.')),
                     type: 'string'
                 }
             },
@@ -1017,65 +994,54 @@ workbenchRegistry.registerWorkbenchContribution(EditSessionsContribution, Lifecy
         'workbench.experimental.cloudChanges.autoStore': {
             enum: ['onShutdown', 'off'],
             enumDescriptions: [
-                ( localizeWithPath(
-                    _moduleId,
-                    42,
+                ( localize(
+                    2428,
                     "Automatically store current working changes in the cloud on window close."
                 )),
-                ( localizeWithPath(
-                    _moduleId,
-                    43,
-                    "Never attempt to automatically store working changes in the cloud."
-                ))
+                ( localize(2429, "Never attempt to automatically store working changes in the cloud."))
             ],
             'type': 'string',
             'tags': ['experimental', 'usesOnlineServices'],
             'default': 'off',
-            'markdownDescription': ( localizeWithPath(
-                _moduleId,
-                44,
+            'markdownDescription': ( localize(
+                2430,
                 "Controls whether to automatically store available working changes in the cloud for the current workspace. This setting has no effect in the web."
             )),
         },
         'workbench.cloudChanges.autoResume': {
             enum: ['onReload', 'off'],
             enumDescriptions: [
-                ( localizeWithPath(
-                    _moduleId,
-                    45,
+                ( localize(
+                    2431,
                     "Automatically resume available working changes from the cloud on window reload."
                 )),
-                ( localizeWithPath(_moduleId, 46, "Never attempt to resume working changes from the cloud."))
+                ( localize(2432, "Never attempt to resume working changes from the cloud."))
             ],
             'type': 'string',
             'tags': ['usesOnlineServices'],
             'default': 'onReload',
-            'markdownDescription': ( localizeWithPath(
-                _moduleId,
-                47,
+            'markdownDescription': ( localize(
+                2433,
                 "Controls whether to automatically resume available working changes stored in the cloud for the current workspace."
             )),
         },
         'workbench.cloudChanges.continueOn': {
             enum: ['prompt', 'off'],
             enumDescriptions: [
-                ( localizeWithPath(
-                    _moduleId,
-                    48,
+                ( localize(
+                    2434,
                     'Prompt the user to sign in to store working changes in the cloud with Continue Working On.'
                 )),
-                ( localizeWithPath(
-                    _moduleId,
-                    49,
+                ( localize(
+                    2435,
                     '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: ( localizeWithPath(
-                _moduleId,
-                50,
+            markdownDescription: ( localize(
+                2436,
                 'Controls whether to prompt the user to store working changes in the cloud when using Continue Working On.'
             ))
         },
@@ -1083,9 +1049,8 @@ workbenchRegistry.registerWorkbenchContribution(EditSessionsContribution, Lifecy
             'type': 'boolean',
             'tags': ['experimental', 'usesOnlineServices'],
             'default': false,
-            'markdownDescription': ( localizeWithPath(
-                _moduleId,
-                51,
+            'markdownDescription': ( localize(
+                2437,
                 "Controls whether to surface cloud changes which partially match the current session."
             ))
         }

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

@@ -1,6 +1,6 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { Disposable, DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize } from 'vscode/vscode/vs/nls';
 import { registerAction2, Action2, MenuId, MenuRegistry } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
@@ -25,7 +25,6 @@ import { CancellationError } from 'vscode/vscode/vs/base/common/errors';
 import { ISecretStorageService } from 'vscode/vscode/vs/platform/secrets/common/secrets.service';
 
 var EditSessionsWorkbenchService_1;
-const _moduleId = "vs/workbench/contrib/editSessions/browser/editSessionsStorageService";
 let EditSessionsWorkbenchService = class EditSessionsWorkbenchService extends Disposable {
     static { EditSessionsWorkbenchService_1 = this; }
     static { this.CACHED_SESSION_STORAGE_KEY = 'editSessionAccountPreference'; }
@@ -233,15 +232,7 @@ let EditSessionsWorkbenchService = class EditSessionsWorkbenchService extends Di
     async getAccountPreference(reason) {
         const quickpick = this.quickInputService.createQuickPick();
         quickpick.ok = false;
-        quickpick.placeholder = reason === 'read' ? ( localizeWithPath(
-            _moduleId,
-            0,
-            "Select an account to restore your working changes from the cloud"
-        )) : ( localizeWithPath(
-            _moduleId,
-            1,
-            "Select an account to store your working changes in the cloud"
-        ));
+        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.ignoreFocusOut = true;
         quickpick.items = await this.createQuickpickItems();
         return (
@@ -262,15 +253,15 @@ let EditSessionsWorkbenchService = class EditSessionsWorkbenchService extends Di
     }
     async createQuickpickItems() {
         const options = [];
-        options.push({ type: 'separator', label: ( localizeWithPath(_moduleId, 2, "Signed In")) });
+        options.push({ type: 'separator', label: ( localize(2377, "Signed In")) });
         const sessions = await this.getAllSessions();
         options.push(...sessions);
-        options.push({ type: 'separator', label: ( localizeWithPath(_moduleId, 3, "Others")) });
+        options.push({ type: 'separator', label: ( localize(2378, "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: ( localizeWithPath(_moduleId, 4, "Sign in with {0}", providerName)), provider: authenticationProvider });
+                options.push({ label: ( localize(2379, "Sign in with {0}", providerName)), provider: authenticationProvider });
             }
         }
         return options;
@@ -359,7 +350,7 @@ let EditSessionsWorkbenchService = class EditSessionsWorkbenchService extends Di
             constructor() {
                 super({
                     id,
-                    title: ( localizeWithPath(_moduleId, 5, 'Turn on Cloud Changes...')),
+                    title: ( localize(2380, 'Turn on Cloud Changes...')),
                     category: EDIT_SESSION_SYNC_CATEGORY,
                     precondition: when,
                     menu: [{
@@ -380,7 +371,7 @@ let EditSessionsWorkbenchService = class EditSessionsWorkbenchService extends Di
             group: '2_editSessions',
             command: {
                 id,
-                title: ( localizeWithPath(_moduleId, 6, 'Turn on Cloud Changes... (1)')),
+                title: ( localize(2381, 'Turn on Cloud Changes... (1)')),
             },
             when: ( (ContextKeyExpr.and(
                  (ContextKeyExpr.equals(EDIT_SESSIONS_PENDING_KEY, true)),
@@ -394,7 +385,7 @@ let EditSessionsWorkbenchService = class EditSessionsWorkbenchService extends Di
             constructor() {
                 super({
                     id: 'workbench.editSessions.actions.resetAuth',
-                    title: ( localizeWithPath(_moduleId, 7, 'Turn off Cloud Changes...')),
+                    title: ( localize(2382, 'Turn off Cloud Changes...')),
                     category: EDIT_SESSION_SYNC_CATEGORY,
                     precondition: ( (ContextKeyExpr.equals(EDIT_SESSIONS_SIGNED_IN_KEY, true))),
                     menu: [{
@@ -409,12 +400,8 @@ let EditSessionsWorkbenchService = class EditSessionsWorkbenchService extends Di
             }
             async run() {
                 const result = await that.dialogService.confirm({
-                    message: ( localizeWithPath(
-                        _moduleId,
-                        8,
-                        'Do you want to disable storing working changes in the cloud?'
-                    )),
-                    checkbox: { label: ( localizeWithPath(_moduleId, 9, 'Delete all stored data from the cloud.')) }
+                    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.')) }
                 });
                 if (result.confirmed) {
                     if (result.checkboxChecked) {

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

@@ -1,6 +1,6 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize } from 'vscode/vscode/vs/nls';
 import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
@@ -22,7 +22,6 @@ import { joinPath } from 'vscode/vscode/vs/base/common/resources';
 import { IFileService } from 'vscode/vscode/vs/platform/files/common/files.service';
 import { basename } from 'vscode/vscode/vs/base/common/path';
 
-const _moduleId = "vs/workbench/contrib/editSessions/browser/editSessionsViews";
 const EDIT_SESSIONS_COUNT_KEY = 'editSessionsCount';
 const EDIT_SESSIONS_COUNT_CONTEXT_KEY = ( (new RawContextKey(EDIT_SESSIONS_COUNT_KEY, 0)));
 let EditSessionsDataViews = class EditSessionsDataViews extends Disposable {
@@ -51,11 +50,10 @@ let EditSessionsDataViews = class EditSessionsDataViews extends Disposable {
                 hideByDefault: true,
             }], container);
         viewsRegistry.registerViewWelcomeContent(viewId, {
-            content: ( localizeWithPath(
-                _moduleId,
-                0,
+            content: ( localize(
+                5692,
                 'You have no stored changes in the cloud to display.\n{0}',
-                `[${( localizeWithPath(_moduleId, 1, 'Store Working Changes'))}](command:workbench.editSessions.actions.store)`
+                `[${( localize(5693, 'Store Working Changes'))}](command:workbench.editSessions.actions.store)`
             )),
             when: ( (ContextKeyExpr.equals(EDIT_SESSIONS_COUNT_KEY, 0))),
             order: 1
@@ -64,7 +62,7 @@ let EditSessionsDataViews = class EditSessionsDataViews extends Disposable {
             constructor() {
                 super({
                     id: 'workbench.editSessions.actions.resume',
-                    title: ( localizeWithPath(_moduleId, 2, "Resume Working Changes")),
+                    title: ( localize(5694, "Resume Working Changes")),
                     icon: Codicon.desktopDownload,
                     menu: {
                         id: MenuId.ViewItemContext,
@@ -87,7 +85,7 @@ let EditSessionsDataViews = class EditSessionsDataViews extends Disposable {
             constructor() {
                 super({
                     id: 'workbench.editSessions.actions.store',
-                    title: ( localizeWithPath(_moduleId, 3, "Store Working Changes")),
+                    title: ( localize(5695, "Store Working Changes")),
                     icon: Codicon.cloudUpload,
                 });
             }
@@ -101,7 +99,7 @@ let EditSessionsDataViews = class EditSessionsDataViews extends Disposable {
             constructor() {
                 super({
                     id: 'workbench.editSessions.actions.delete',
-                    title: ( localizeWithPath(_moduleId, 4, "Delete Working Changes")),
+                    title: ( localize(5696, "Delete Working Changes")),
                     icon: Codicon.trash,
                     menu: {
                         id: MenuId.ViewItemContext,
@@ -118,13 +116,12 @@ let EditSessionsDataViews = class EditSessionsDataViews extends Disposable {
                 const dialogService = accessor.get(IDialogService);
                 const editSessionStorageService = accessor.get(IEditSessionsStorageService);
                 const result = await dialogService.confirm({
-                    message: ( localizeWithPath(
-                        _moduleId,
-                        5,
+                    message: ( localize(
+                        5697,
                         'Are you sure you want to permanently delete your working changes with ref {0}?',
                         editSessionId
                     )),
-                    detail: ( localizeWithPath(_moduleId, 6, ' You cannot undo this action.')),
+                    detail: ( localize(5698, ' You cannot undo this action.')),
                     type: 'warning',
                     title: EDIT_SESSIONS_TITLE.value
                 });
@@ -138,7 +135,7 @@ let EditSessionsDataViews = class EditSessionsDataViews extends Disposable {
             constructor() {
                 super({
                     id: 'workbench.editSessions.actions.deleteAll',
-                    title: ( localizeWithPath(_moduleId, 7, "Delete All Working Changes from Cloud")),
+                    title: ( localize(5699, "Delete All Working Changes from Cloud")),
                     icon: Codicon.trash,
                     menu: {
                         id: MenuId.ViewTitle,
@@ -153,12 +150,11 @@ let EditSessionsDataViews = class EditSessionsDataViews extends Disposable {
                 const dialogService = accessor.get(IDialogService);
                 const editSessionStorageService = accessor.get(IEditSessionsStorageService);
                 const result = await dialogService.confirm({
-                    message: ( localizeWithPath(
-                        _moduleId,
-                        8,
+                    message: ( localize(
+                        5700,
                         'Are you sure you want to permanently delete all stored changes from the cloud?'
                     )),
-                    detail: ( localizeWithPath(_moduleId, 9, ' You cannot undo this action.')),
+                    detail: ( localize(5701, ' You cannot undo this action.')),
                     type: 'warning',
                     title: EDIT_SESSIONS_TITLE.value
                 });
@@ -272,11 +268,11 @@ let EditSessionDataViewDataProvider = class EditSessionDataViewDataProvider {
                         themeIcon: Codicon.file,
                         command: {
                             id: 'vscode.diff',
-                            title: ( localizeWithPath(_moduleId, 10, 'Compare Changes')),
+                            title: ( localize(5702, 'Compare Changes')),
                             arguments: [
                                 localCopy,
                                 cloudChangeUri,
-                                `${basename(change.relativeFilePath)} (${( localizeWithPath(_moduleId, 11, 'Local Copy'))} \u2194 ${( localizeWithPath(_moduleId, 12, 'Cloud Changes'))})`,
+                                `${basename(change.relativeFilePath)} (${( localize(5703, 'Local Copy'))} \u2194 ${( localize(5704, 'Cloud Changes'))})`,
                                 undefined
                             ]
                         }
@@ -291,7 +287,7 @@ let EditSessionDataViewDataProvider = class EditSessionDataViewDataProvider {
                 themeIcon: Codicon.file,
                 command: {
                     id: API_OPEN_EDITOR_COMMAND_ID,
-                    title: ( localizeWithPath(_moduleId, 13, 'Open File')),
+                    title: ( localize(5705, 'Open File')),
                     arguments: [cloudChangeUri, undefined, undefined]
                 }
             };

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

@@ -1,12 +1,11 @@
 import { decodeBase64, VSBuffer } from 'vscode/vscode/vs/base/common/buffer';
 import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
-import { localize2WithPath, localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize2, localize } from 'vscode/vscode/vs/nls';
 import { RawContextKey } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { registerIcon } from 'vscode/vscode/vs/platform/theme/common/iconRegistry';
 import { StringSHA1 } from 'vscode/vscode/vs/base/common/hash';
 
-const _moduleId = "vs/workbench/contrib/editSessions/common/editSessions";
-const EDIT_SESSION_SYNC_CATEGORY = ( localize2WithPath(_moduleId, 0, 'Cloud Changes'));
+const EDIT_SESSION_SYNC_CATEGORY = ( localize2(5680, 'Cloud Changes'));
 var ChangeType;
 ( ((function(ChangeType) {
     ChangeType[ChangeType["Addition"] = 1] = "Addition";
@@ -23,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 = ( localize2WithPath(_moduleId, 0, 'Cloud Changes'));
-const EDIT_SESSIONS_VIEW_ICON = registerIcon('edit-sessions-view-icon', Codicon.cloudDownload, ( localizeWithPath(_moduleId, 1, 'View icon of the cloud changes view.')));
+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_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

@@ -1,16 +1,15 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { joinPath } from 'vscode/vscode/vs/base/common/resources';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize } from 'vscode/vscode/vs/nls';
 import { IEnvironmentService } from 'vscode/vscode/vs/platform/environment/common/environment.service';
 import { AbstractLogger } from 'vscode/vscode/vs/platform/log/common/log';
 import { ILoggerService } from 'vscode/vscode/vs/platform/log/common/log.service';
 import { editSessionsLogId } from './editSessions.js';
 
-const _moduleId = "vs/workbench/contrib/editSessions/common/editSessionsLogService";
 let EditSessionsLogService = class EditSessionsLogService extends AbstractLogger {
     constructor(loggerService, environmentService) {
         super();
-        this.logger = this._register(loggerService.createLogger(joinPath(environmentService.logsHome, `${editSessionsLogId}.log`), { id: editSessionsLogId, name: ( localizeWithPath(_moduleId, 0, "Cloud Changes")) }));
+        this.logger = this._register(loggerService.createLogger(joinPath(environmentService.logsHome, `${editSessionsLogId}.log`), { id: editSessionsLogId, name: ( localize(2374, "Cloud Changes")) }));
     }
     trace(message, ...args) {
         this.logger.trace(message, ...args);