@codingame/monaco-vscode-user-data-profile-service-override 7.1.0 → 7.1.1

package/vscode/src/vs/workbench/contrib/userDataProfile/browser/userDataProfilesEditorModel.js

@@ -2,7 +2,7 @@ import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { Action, Separator } from 'vscode/vscode/vs/base/common/actions';
 import { Emitter } from 'vscode/vscode/vs/base/common/event';
 import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize } from 'vscode/vscode/vs/nls';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry.service';
 import { ProfileResourceType, isUserDataProfile, toUserDataProfile } from 'vscode/vscode/vs/platform/userDataProfile/common/userDataProfile';
@@ -30,9 +30,10 @@ import { SIDE_GROUP } from 'vscode/vscode/vs/workbench/services/editor/common/ed
 import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands.service';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { CONFIG_NEW_WINDOW_PROFILE } from 'vscode/vscode/vs/workbench/common/configuration';
+import { ResourceMap } from 'vscode/vscode/vs/base/common/map';
+import { getErrorMessage } from 'vscode/vscode/vs/base/common/errors';
 
 var UserDataProfilesEditorModel_1;
-const _moduleId = "vs/workbench/contrib/userDataProfile/browser/userDataProfilesEditorModel";
 function isProfileResourceTypeElement(element) {
     return element.resourceType !== undefined;
 }
@@ -121,15 +122,15 @@ let AbstractUserDataProfileElement = class AbstractUserDataProfileElement extend
     }
     validate() {
         if (!this.name) {
-            this.message = ( localizeWithPath(_moduleId, 0, "Profile name is required."));
+            this.message = ( localize(11407, "Profile name is required and must be a non-empty value."));
             return;
         }
-        if (this.name !== this.getInitialName() && ( (this.userDataProfilesService.profiles.some(p => p.name === this.name)))) {
-            this.message = ( localizeWithPath(_moduleId, 1, "Profile with name {0} already exists.", this.name));
+        if (this.shouldValidateName() && this.name !== this.getInitialName() && ( (this.userDataProfilesService.profiles.some(p => p.name === this.name)))) {
+            this.message = ( localize(11408, "Profile with name {0} already exists.", this.name));
             return;
         }
         if (this.flags && this.flags.settings && this.flags.keybindings && this.flags.tasks && this.flags.snippets && this.flags.extensions) {
-            this.message = ( localizeWithPath(_moduleId, 2, "The profile should contain at least one configuration."));
+            this.message = ( localize(11409, "The profile should contain at least one configuration."));
             return;
         }
         this.message = undefined;
@@ -152,7 +153,7 @@ let AbstractUserDataProfileElement = class AbstractUserDataProfileElement extend
                     checkbox: undefined,
                     resourceType: r,
                     action: children.length
-                        ? ( (new Action('_open', ( localizeWithPath(_moduleId, 3, "Open to the Side")), ThemeIcon.asClassName(Codicon.goToFile), true, () => children[0]?.action?.run())))
+                        ? ( (new Action('_open', ( localize(11410, "Open to the Side")), ThemeIcon.asClassName(Codicon.goToFile), true, () => children[0]?.action?.run())))
                         : undefined
                 };
             }))));
@@ -193,7 +194,7 @@ let AbstractUserDataProfileElement = class AbstractUserDataProfileElement extend
             label: child.label?.label ?? '',
             resource: URI.revive(child.resourceUri),
             icon: child.themeIcon,
-            action: ( (new Action('_openChild', ( localizeWithPath(_moduleId, 3, "Open to the Side")), ThemeIcon.asClassName(Codicon.goToFile), true, async () => {
+            action: ( (new Action('_openChild', ( localize(11410, "Open to the Side")), ThemeIcon.asClassName(Codicon.goToFile), true, async () => {
                 if (child.parent.type === ProfileResourceType.Extensions) {
                     await this.commandService.executeCommand('extension.open', child.handle, undefined, true, undefined, true);
                 }
@@ -206,6 +207,9 @@ let AbstractUserDataProfileElement = class AbstractUserDataProfileElement extend
     getInitialName() {
         return '';
     }
+    shouldValidateName() {
+        return true;
+    }
     save() {
         this.saveScheduler.schedule();
     }
@@ -247,11 +251,10 @@ AbstractUserDataProfileElement = ( (__decorate([
 ], AbstractUserDataProfileElement)));
 let UserDataProfileElement = class UserDataProfileElement extends AbstractUserDataProfileElement {
     get profile() { return this._profile; }
-    constructor(_profile, titleButtons, titleActions, actions, userDataProfileService, configurationService, userDataProfileManagementService, userDataProfilesService, commandService, instantiationService) {
+    constructor(_profile, titleButtons, actions, userDataProfileService, configurationService, userDataProfileManagementService, userDataProfilesService, commandService, instantiationService) {
         super(_profile.name, _profile.icon, _profile.useDefaultFlags, userDataProfileService.currentProfile.id === _profile.id, userDataProfileManagementService, userDataProfilesService, commandService, instantiationService);
         this._profile = _profile;
         this.titleButtons = titleButtons;
-        this.titleActions = titleActions;
         this.actions = actions;
         this.userDataProfileService = userDataProfileService;
         this.configurationService = configurationService;
@@ -299,23 +302,25 @@ let UserDataProfileElement = class UserDataProfileElement extends AbstractUserDa
     }
 };
 UserDataProfileElement = ( (__decorate([
-    ( (__param(4, IUserDataProfileService))),
-    ( (__param(5, IConfigurationService))),
-    ( (__param(6, IUserDataProfileManagementService))),
-    ( (__param(7, IUserDataProfilesService))),
-    ( (__param(8, ICommandService))),
-    ( (__param(9, IInstantiationService)))
+    ( (__param(3, IUserDataProfileService))),
+    ( (__param(4, IConfigurationService))),
+    ( (__param(5, IUserDataProfileManagementService))),
+    ( (__param(6, IUserDataProfilesService))),
+    ( (__param(7, ICommandService))),
+    ( (__param(8, IInstantiationService)))
 ], UserDataProfileElement)));
 const USER_DATA_PROFILE_TEMPLATE_PREVIEW_SCHEME = 'userdataprofiletemplatepreview';
 let NewProfileElement = class NewProfileElement extends AbstractUserDataProfileElement {
-    constructor(name, copyFrom, titleButtons, titleActions, actions, fileService, userDataProfileImportExportService, userDataProfileManagementService, userDataProfilesService, commandService, instantiationService) {
+    get copyFromTemplates() { return this._copyFromTemplates; }
+    constructor(name, copyFrom, titleButtons, actions, fileService, userDataProfileImportExportService, userDataProfileManagementService, userDataProfilesService, commandService, instantiationService) {
         super(name, undefined, undefined, false, userDataProfileManagementService, userDataProfilesService, commandService, instantiationService);
         this.titleButtons = titleButtons;
-        this.titleActions = titleActions;
         this.actions = actions;
         this.fileService = fileService;
         this.userDataProfileImportExportService = userDataProfileImportExportService;
+        this._copyFromTemplates = ( (new ResourceMap()));
         this.template = null;
+        this.defaultName = name;
         this._copyFrom = copyFrom;
         this._copyFlags = this.getCopyFlagsFrom(copyFrom);
         this.initialize();
@@ -364,33 +369,49 @@ let NewProfileElement = class NewProfileElement extends AbstractUserDataProfileE
             if (this.copyFrom instanceof URI) {
                 await this.resolveTemplate(this.copyFrom);
                 if (this.template) {
-                    this.name = this.template.name ?? '';
-                    this.icon = this.template.icon;
+                    this.copyFromTemplates.set(this.copyFrom, this.template.name);
+                    if (this.defaultName === this.name) {
+                        this.name = this.defaultName = this.template.name ?? '';
+                    }
+                    if (this.defaultIcon === this.icon) {
+                        this.icon = this.defaultIcon = this.template.icon;
+                    }
                     this.setCopyFlag(ProfileResourceType.Settings, !!this.template.settings);
                     this.setCopyFlag(ProfileResourceType.Keybindings, !!this.template.keybindings);
                     this.setCopyFlag(ProfileResourceType.Tasks, !!this.template.tasks);
                     this.setCopyFlag(ProfileResourceType.Snippets, !!this.template.snippets);
                     this.setCopyFlag(ProfileResourceType.Extensions, !!this.template.extensions);
+                    this._onDidChange.fire({ copyFromInfo: true });
                 }
                 return;
             }
             if (isUserDataProfile(this.copyFrom)) {
-                this.name = `${this.copyFrom.name} (Copy)`;
-                this.icon = this.copyFrom.icon;
+                if (this.defaultName === this.name) {
+                    this.name = this.defaultName = ( localize(11411, "{0} (Copy)", this.copyFrom.name));
+                }
+                if (this.defaultIcon === this.icon) {
+                    this.icon = this.defaultIcon = this.copyFrom.icon;
+                }
                 this.setCopyFlag(ProfileResourceType.Settings, true);
                 this.setCopyFlag(ProfileResourceType.Keybindings, true);
                 this.setCopyFlag(ProfileResourceType.Tasks, true);
                 this.setCopyFlag(ProfileResourceType.Snippets, true);
                 this.setCopyFlag(ProfileResourceType.Extensions, true);
+                this._onDidChange.fire({ copyFromInfo: true });
                 return;
             }
-            this.name = ( localizeWithPath(_moduleId, 4, "Untitled"));
-            this.icon = undefined;
+            if (this.defaultName === this.name) {
+                this.name = this.defaultName = ( localize(11412, "Untitled"));
+            }
+            if (this.defaultIcon === this.icon) {
+                this.icon = this.defaultIcon = undefined;
+            }
             this.setCopyFlag(ProfileResourceType.Settings, false);
             this.setCopyFlag(ProfileResourceType.Keybindings, false);
             this.setCopyFlag(ProfileResourceType.Tasks, false);
             this.setCopyFlag(ProfileResourceType.Snippets, false);
             this.setCopyFlag(ProfileResourceType.Extensions, false);
+            this._onDidChange.fire({ copyFromInfo: true });
         }
         finally {
             this.disabled = false;
@@ -437,8 +458,8 @@ let NewProfileElement = class NewProfileElement extends AbstractUserDataProfileE
         if (isUserDataProfile(this.copyFrom)) {
             return this.copyFrom.name;
         }
-        if (this.template) {
-            return this.template.name;
+        if (this.copyFrom instanceof URI) {
+            return this.copyFromTemplates.get(this.copyFrom);
         }
         return undefined;
     }
@@ -499,6 +520,9 @@ let NewProfileElement = class NewProfileElement extends AbstractUserDataProfileE
         }
         return [];
     }
+    shouldValidateName() {
+        return !this.copyFrom;
+    }
     getInitialName() {
         return this.previewProfile?.name ?? '';
     }
@@ -512,12 +536,12 @@ let NewProfileElement = class NewProfileElement extends AbstractUserDataProfileE
     }
 };
 NewProfileElement = ( (__decorate([
-    ( (__param(5, IFileService))),
-    ( (__param(6, IUserDataProfileImportExportService))),
-    ( (__param(7, IUserDataProfileManagementService))),
-    ( (__param(8, IUserDataProfilesService))),
-    ( (__param(9, ICommandService))),
-    ( (__param(10, IInstantiationService)))
+    ( (__param(4, IFileService))),
+    ( (__param(5, IUserDataProfileImportExportService))),
+    ( (__param(6, IUserDataProfileManagementService))),
+    ( (__param(7, IUserDataProfilesService))),
+    ( (__param(8, ICommandService))),
+    ( (__param(9, IInstantiationService)))
 ], NewProfileElement)));
 let UserDataProfilesEditorModel = class UserDataProfilesEditorModel extends EditorModel {
     static { UserDataProfilesEditorModel_1 = this; }
@@ -546,6 +570,7 @@ let UserDataProfilesEditorModel = class UserDataProfilesEditorModel extends Edit
             return a.name.localeCompare(b.name);
         });
     }
+    get templates() { return this._templates ?? []; }
     constructor(userDataProfileService, userDataProfilesService, userDataProfileManagementService, userDataProfileImportExportService, dialogService, telemetryService, hostService, instantiationService) {
         super();
         this.userDataProfileService = userDataProfileService;
@@ -588,36 +613,30 @@ let UserDataProfilesEditorModel = class UserDataProfilesEditorModel extends Edit
             this._onDidChange.fire(undefined);
         }
     }
+    async resolve() {
+        await super.resolve();
+        this._templates = await this.userDataProfileManagementService.getBuiltinProfileTemplates();
+    }
     createProfileElement(profile) {
         const disposables = ( (new DisposableStore()));
-        const activateAction = disposables.add(( (new Action('userDataProfile.activate', ( localizeWithPath(_moduleId, 5, "Use for Current Window")), ThemeIcon.asClassName(Codicon.check), true, () => this.userDataProfileManagementService.switchProfile(profileElement.profile)))));
-        const copyFromProfileAction = disposables.add(( (new Action('userDataProfile.copyFromProfile', ( localizeWithPath(_moduleId, 6, "Duplicate...")), ThemeIcon.asClassName(Codicon.copy), true, () => this.createNewProfile(profileElement.profile)))));
-        const exportAction = disposables.add(( (new Action('userDataProfile.export', ( localizeWithPath(_moduleId, 7, "Export...")), ThemeIcon.asClassName(Codicon.export), true, () => this.exportProfile(profileElement.profile)))));
-        const deleteAction = disposables.add(( (new Action('userDataProfile.delete', ( localizeWithPath(_moduleId, 8, "Delete")), ThemeIcon.asClassName(Codicon.trash), true, () => this.removeProfile(profileElement.profile)))));
-        const newWindowAction = disposables.add(( (new Action('userDataProfile.newWindow', ( localizeWithPath(_moduleId, 9, "Open New Window with this Profile")), ThemeIcon.asClassName(Codicon.emptyWindow), true, () => this.openWindow(profileElement.profile)))));
-        const useAsNewWindowProfileAction = disposables.add(( (new Action('userDataProfile.useAsNewWindowProfile', ( localizeWithPath(_moduleId, 10, "Use for New Windows")), undefined, true, () => profileElement.toggleNewWindowProfile()))));
-        const titlePrimaryActions = [];
-        titlePrimaryActions.push(newWindowAction);
-        const titleSecondaryActions = [];
-        titleSecondaryActions.push(copyFromProfileAction);
-        titleSecondaryActions.push(exportAction);
-        if (!profile.isDefault) {
-            titleSecondaryActions.push(( (new Separator())));
-            titleSecondaryActions.push(deleteAction);
-        }
+        const activateAction = disposables.add(( (new Action('userDataProfile.activate', ( localize(11413, "Use for Current Window")), ThemeIcon.asClassName(Codicon.check), true, () => this.userDataProfileManagementService.switchProfile(profileElement.profile)))));
+        const copyFromProfileAction = disposables.add(( (new Action('userDataProfile.copyFromProfile', ( localize(11414, "Duplicate...")), ThemeIcon.asClassName(Codicon.copy), true, () => this.createNewProfile(profileElement.profile)))));
+        const exportAction = disposables.add(( (new Action('userDataProfile.export', ( localize(11415, "Export...")), ThemeIcon.asClassName(Codicon.export), true, () => this.exportProfile(profileElement.profile)))));
+        const deleteAction = disposables.add(( (new Action('userDataProfile.delete', ( localize(11416, "Delete")), ThemeIcon.asClassName(Codicon.trash), true, () => this.removeProfile(profileElement.profile)))));
+        const newWindowAction = disposables.add(( (new Action('userDataProfile.newWindow', ( localize(11417, "Open New Window with this Profile")), ThemeIcon.asClassName(Codicon.emptyWindow), true, () => this.openWindow(profileElement.profile)))));
+        const useAsNewWindowProfileAction = disposables.add(( (new Action('userDataProfile.useAsNewWindowProfile', ( localize(11418, "Use for New Windows")), undefined, true, () => profileElement.toggleNewWindowProfile()))));
         const primaryActions = [];
         primaryActions.push(newWindowAction);
+        if (!profile.isDefault) {
+            primaryActions.push(deleteAction);
+        }
         const secondaryActions = [];
         secondaryActions.push(activateAction);
         secondaryActions.push(useAsNewWindowProfileAction);
         secondaryActions.push(( (new Separator())));
         secondaryActions.push(copyFromProfileAction);
         secondaryActions.push(exportAction);
-        if (!profile.isDefault) {
-            secondaryActions.push(( (new Separator())));
-            secondaryActions.push(deleteAction);
-        }
-        const profileElement = disposables.add(this.instantiationService.createInstance(UserDataProfileElement, profile, [[], []], [titlePrimaryActions, titleSecondaryActions], [primaryActions, secondaryActions]));
+        const profileElement = disposables.add(this.instantiationService.createInstance(UserDataProfileElement, profile, [[], []], [primaryActions, secondaryActions]));
         activateAction.checked = this.userDataProfileService.currentProfile.id === profileElement.profile.id;
         disposables.add(this.userDataProfileService.onDidChangeCurrentProfile(() => activateAction.checked = this.userDataProfileService.currentProfile.id === profileElement.profile.id));
         useAsNewWindowProfileAction.checked = profileElement.isNewWindowProfile;
@@ -632,27 +651,44 @@ let UserDataProfilesEditorModel = class UserDataProfilesEditorModel extends Edit
         if (this.newProfileElement) {
             const result = await this.dialogService.confirm({
                 type: 'info',
-                message: ( localizeWithPath(
-                    _moduleId,
-                    11,
+                message: ( localize(
+                    11419,
                     "A new profile is already being created. Do you want to discard it and create a new one?"
                 )),
-                primaryButton: ( localizeWithPath(_moduleId, 12, "Discard & Create")),
-                cancelButton: ( localizeWithPath(_moduleId, 13, "Cancel"))
+                primaryButton: ( localize(11420, "Discard & Create")),
+                cancelButton: ( localize(11421, "Cancel"))
             });
             if (!result.confirmed) {
                 return;
             }
             this.revert();
         }
+        if (copyFrom instanceof URI) {
+            try {
+                await this.userDataProfileImportExportService.resolveProfileTemplate(copyFrom);
+            }
+            catch (error) {
+                this.dialogService.error(getErrorMessage(error));
+                return;
+            }
+        }
         if (!this.newProfileElement) {
             const disposables = ( (new DisposableStore()));
             const cancellationTokenSource = ( (new CancellationTokenSource()));
             disposables.add(toDisposable(() => cancellationTokenSource.dispose(true)));
-            const createAction = disposables.add(( (new Action('userDataProfile.create', ( localizeWithPath(_moduleId, 14, "Create")), undefined, true, () => this.saveNewProfile(false, cancellationTokenSource.token)))));
-            const cancelAction = disposables.add(( (new Action('userDataProfile.cancel', ( localizeWithPath(_moduleId, 13, "Cancel")), ThemeIcon.asClassName(Codicon.trash), true, () => this.discardNewProfile()))));
-            const previewProfileAction = disposables.add(( (new Action('userDataProfile.preview', ( localizeWithPath(_moduleId, 15, "Preview")), ThemeIcon.asClassName(Codicon.openPreview), true, () => this.previewNewProfile(cancellationTokenSource.token)))));
-            this.newProfileElement = disposables.add(this.instantiationService.createInstance(NewProfileElement, copyFrom ? '' : ( localizeWithPath(_moduleId, 4, "Untitled")), copyFrom, [[createAction], [cancelAction, previewProfileAction]], [[], []], [[cancelAction], []]));
+            const createAction = disposables.add(( (new Action('userDataProfile.create', ( localize(11422, "Create")), undefined, true, () => this.saveNewProfile(false, cancellationTokenSource.token)))));
+            const cancelAction = disposables.add(( (new Action('userDataProfile.cancel', ( localize(11422, "Cancel")), ThemeIcon.asClassName(Codicon.trash), true, () => this.discardNewProfile()))));
+            const previewProfileAction = disposables.add(( (new Action('userDataProfile.preview', ( localize(11423, "Preview")), ThemeIcon.asClassName(Codicon.openPreview), true, () => this.previewNewProfile(cancellationTokenSource.token)))));
+            this.newProfileElement = disposables.add(this.instantiationService.createInstance(NewProfileElement, copyFrom ? '' : ( localize(11423, "Untitled")), copyFrom, [[createAction], [cancelAction, previewProfileAction]], [[cancelAction], []]));
+            const updateCreateActionLabel = () => {
+                if (this.newProfileElement?.copyFrom && ( (this.userDataProfilesService.profiles.some(p => p.name === this.newProfileElement?.name)))) {
+                    createAction.label = ( localize(11424, "Replace"));
+                }
+                else {
+                    createAction.label = ( localize(11424, "Create"));
+                }
+            };
+            updateCreateActionLabel();
             disposables.add(this.newProfileElement.onDidChange(e => {
                 if (e.preview) {
                     previewProfileAction.checked = !!this.newProfileElement?.previewProfile;
@@ -660,6 +696,13 @@ let UserDataProfilesEditorModel = class UserDataProfilesEditorModel extends Edit
                 if (e.disabled || e.message) {
                     previewProfileAction.enabled = createAction.enabled = !this.newProfileElement?.disabled && !this.newProfileElement?.message;
                 }
+                if (e.name || e.copyFrom) {
+                    updateCreateActionLabel();
+                }
+            }));
+            disposables.add(this.userDataProfilesService.onDidChangeProfiles((e) => {
+                updateCreateActionLabel();
+                this.newProfileElement?.validate();
             }));
             this._profiles.push([this.newProfileElement, disposables]);
             this._onDidChange.fire(this.newProfileElement);
@@ -757,7 +800,13 @@ let UserDataProfilesEditorModel = class UserDataProfilesEditorModel extends Edit
         }
         if (profile && !profile.isTransient && this.newProfileElement) {
             this.removeNewProfile();
-            this.onDidChangeProfiles({ added: [profile], removed: [], updated: [], all: this.userDataProfilesService.profiles });
+            const existing = this._profiles.find(([p]) => p.name === profile.name);
+            if (existing) {
+                this._onDidChange.fire(existing[0]);
+            }
+            else {
+                this.onDidChangeProfiles({ added: [profile], removed: [], updated: [], all: this.userDataProfilesService.profiles });
+            }
         }
         return profile;
     }
@@ -774,14 +823,9 @@ let UserDataProfilesEditorModel = class UserDataProfilesEditorModel extends Edit
     async removeProfile(profile) {
         const result = await this.dialogService.confirm({
             type: 'info',
-            message: ( localizeWithPath(
-                _moduleId,
-                16,
-                "Are you sure you want to delete the profile '{0}'?",
-                profile.name
-            )),
-            primaryButton: ( localizeWithPath(_moduleId, 8, "Delete")),
-            cancelButton: ( localizeWithPath(_moduleId, 13, "Cancel"))
+            message: ( localize(11425, "Are you sure you want to delete the profile '{0}'?", profile.name)),
+            primaryButton: ( localize(11425, "Delete")),
+            cancelButton: ( localize(11425, "Cancel"))
         });
         if (result.confirmed) {
             await this.userDataProfileManagementService.removeProfile(profile);

package/vscode/src/vs/workbench/services/userDataProfile/browser/extensionsResource.js

@@ -2,7 +2,7 @@ import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { CancellationToken } from 'vscode/vscode/vs/base/common/cancellation';
 import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
 import { DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize } from 'vscode/vscode/vs/nls';
 import { GlobalExtensionEnablementService } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionEnablementService';
 import { EXTENSION_INSTALL_SKIP_WALKTHROUGH_CONTEXT } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagement';
 import { IExtensionManagementService, IExtensionGalleryService, IGlobalExtensionEnablementService } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagement.service';
@@ -17,7 +17,6 @@ import { IUserDataProfileStorageService } from 'vscode/vscode/vs/platform/userDa
 import { TreeItemCollapsibleState } from 'vscode/vscode/vs/workbench/common/views';
 import { IUserDataProfileService } from 'vscode/vscode/vs/workbench/services/userDataProfile/common/userDataProfile.service';
 
-const _moduleId = "vs/workbench/services/userDataProfile/browser/extensionsResource";
 let ExtensionsResourceInitializer = class ExtensionsResourceInitializer {
     constructor(userDataProfileService, extensionManagementService, extensionGalleryService, extensionEnablementService, logService) {
         this.userDataProfileService = userDataProfileService;
@@ -170,9 +169,8 @@ let ExtensionsResource = class ExtensionsResource {
                             if (token.isCancellationRequested) {
                                 return;
                             }
-                            progress?.(( localizeWithPath(
-                                _moduleId,
-                                0,
+                            progress?.(( localize(
+                                8800,
                                 "Installing extension {0}...",
                                 installExtensionInfo.extension.displayName ?? installExtensionInfo.extension.identifier.id
                             )));
@@ -264,7 +262,7 @@ class ExtensionsResourceTreeItem {
     constructor() {
         this.type = ProfileResourceType.Extensions;
         this.handle = ProfileResourceType.Extensions;
-        this.label = { label: ( localizeWithPath(_moduleId, 1, "Extensions")) };
+        this.label = { label: ( localize(8801, "Extensions")) };
         this.collapsibleState = TreeItemCollapsibleState.Expanded;
         this.contextValue = ProfileResourceType.Extensions;
         this.excludedExtensions = ( (new Set()));
@@ -277,7 +275,7 @@ class ExtensionsResourceTreeItem {
                 handle: e.identifier.id.toLowerCase(),
                 parent: this,
                 label: { label: e.displayName || e.identifier.id },
-                description: e.disabled ? ( localizeWithPath(_moduleId, 2, "Disabled")) : undefined,
+                description: e.disabled ? ( localize(8802, "Disabled")) : undefined,
                 collapsibleState: TreeItemCollapsibleState.None,
                 checkbox: that.checkbox ? {
                     get isChecked() { return !( (that.excludedExtensions.has(e.identifier.id.toLowerCase()))); },
@@ -289,9 +287,9 @@ class ExtensionsResourceTreeItem {
                             that.excludedExtensions.add(e.identifier.id.toLowerCase());
                         }
                     },
-                    tooltip: ( localizeWithPath(_moduleId, 3, "Select {0} Extension", e.displayName || e.identifier.id)),
+                    tooltip: ( localize(8803, "Select {0} Extension", e.displayName || e.identifier.id)),
                     accessibilityInformation: {
-                        label: ( localizeWithPath(_moduleId, 3, "Select {0} Extension", e.displayName || e.identifier.id)),
+                        label: ( localize(8803, "Select {0} Extension", e.displayName || e.identifier.id)),
                     }
                 } : undefined,
                 themeIcon: Codicon.extensions,

package/vscode/src/vs/workbench/services/userDataProfile/browser/globalStateResource.js

@@ -1,5 +1,5 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize } from 'vscode/vscode/vs/nls';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
 import { StorageScope, StorageTarget } from 'vscode/vscode/vs/platform/storage/common/storage';
@@ -10,7 +10,6 @@ import { IUserDataProfileStorageService } from 'vscode/vscode/vs/platform/userDa
 import { API_OPEN_EDITOR_COMMAND_ID } from 'vscode/vscode/vs/workbench/browser/parts/editor/editorCommands';
 import { TreeItemCollapsibleState } from 'vscode/vscode/vs/workbench/common/views';
 
-const _moduleId = "vs/workbench/services/userDataProfile/browser/globalStateResource";
 let GlobalStateResourceInitializer = class GlobalStateResourceInitializer {
     constructor(storageService) {
         this.storageService = storageService;
@@ -86,7 +85,7 @@ class GlobalStateResourceTreeItem {
         this.uriIdentityService = uriIdentityService;
         this.type = ProfileResourceType.GlobalState;
         this.handle = ProfileResourceType.GlobalState;
-        this.label = { label: ( localizeWithPath(_moduleId, 0, "UI State")) };
+        this.label = { label: ( localize(8795, "UI State")) };
         this.collapsibleState = TreeItemCollapsibleState.Collapsed;
     }
     async getChildren() {

package/vscode/src/vs/workbench/services/userDataProfile/browser/keybindingsResource.js

@@ -9,10 +9,9 @@ import { TreeItemCollapsibleState } from 'vscode/vscode/vs/workbench/common/view
 import { ProfileResourceType } from 'vscode/vscode/vs/platform/userDataProfile/common/userDataProfile';
 import { API_OPEN_EDITOR_COMMAND_ID } from 'vscode/vscode/vs/workbench/browser/parts/editor/editorCommands';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize } from 'vscode/vscode/vs/nls';
 import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
 
-const _moduleId = "vs/workbench/services/userDataProfile/browser/keybindingsResource";
 let KeybindingsResourceInitializer = class KeybindingsResourceInitializer {
     constructor(userDataProfileService, fileService, logService) {
         this.userDataProfileService = userDataProfileService;
@@ -82,7 +81,7 @@ let KeybindingsResourceTreeItem = class KeybindingsResourceTreeItem {
         this.instantiationService = instantiationService;
         this.type = ProfileResourceType.Keybindings;
         this.handle = ProfileResourceType.Keybindings;
-        this.label = { label: ( localizeWithPath(_moduleId, 0, "Keyboard Shortcuts")) };
+        this.label = { label: ( localize(8796, "Keyboard Shortcuts")) };
         this.collapsibleState = TreeItemCollapsibleState.Expanded;
     }
     isFromDefaultProfile() {

package/vscode/src/vs/workbench/services/userDataProfile/browser/settingsResource.js

@@ -12,10 +12,9 @@ import { TreeItemCollapsibleState } from 'vscode/vscode/vs/workbench/common/view
 import { ProfileResourceType } from 'vscode/vscode/vs/platform/userDataProfile/common/userDataProfile';
 import { API_OPEN_EDITOR_COMMAND_ID } from 'vscode/vscode/vs/workbench/browser/parts/editor/editorCommands';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize } from 'vscode/vscode/vs/nls';
 import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
 
-const _moduleId = "vs/workbench/services/userDataProfile/browser/settingsResource";
 let SettingsResourceInitializer = class SettingsResourceInitializer {
     constructor(userDataProfileService, fileService, logService) {
         this.userDataProfileService = userDataProfileService;
@@ -103,7 +102,7 @@ let SettingsResourceTreeItem = class SettingsResourceTreeItem {
         this.instantiationService = instantiationService;
         this.type = ProfileResourceType.Settings;
         this.handle = ProfileResourceType.Settings;
-        this.label = { label: ( localizeWithPath(_moduleId, 0, "Settings")) };
+        this.label = { label: ( localize(8794, "Settings")) };
         this.collapsibleState = TreeItemCollapsibleState.Expanded;
     }
     async getChildren() {

package/vscode/src/vs/workbench/services/userDataProfile/browser/snippetsResource.js

@@ -1,7 +1,7 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { VSBuffer } from 'vscode/vscode/vs/base/common/buffer';
 import { ResourceSet } from 'vscode/vscode/vs/base/common/map';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize } from 'vscode/vscode/vs/nls';
 import { FileOperationError, FileOperationResult } from 'vscode/vscode/vs/platform/files/common/files';
 import { IFileService } from 'vscode/vscode/vs/platform/files/common/files.service';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
@@ -11,7 +11,6 @@ import { API_OPEN_EDITOR_COMMAND_ID } from 'vscode/vscode/vs/workbench/browser/p
 import { TreeItemCollapsibleState } from 'vscode/vscode/vs/workbench/common/views';
 import { IUserDataProfileService } from 'vscode/vscode/vs/workbench/services/userDataProfile/common/userDataProfile.service';
 
-const _moduleId = "vs/workbench/services/userDataProfile/browser/snippetsResource";
 let SnippetsResourceInitializer = class SnippetsResourceInitializer {
     constructor(userDataProfileService, fileService, uriIdentityService) {
         this.userDataProfileService = userDataProfileService;
@@ -94,7 +93,7 @@ let SnippetsResourceTreeItem = class SnippetsResourceTreeItem {
         this.uriIdentityService = uriIdentityService;
         this.type = ProfileResourceType.Snippets;
         this.handle = ( (this.profile.snippetsHome.toString()));
-        this.label = { label: ( localizeWithPath(_moduleId, 0, "Snippets")) };
+        this.label = { label: ( localize(8798, "Snippets")) };
         this.collapsibleState = TreeItemCollapsibleState.Collapsed;
         this.excludedSnippets = ( (new ResourceSet()));
     }
@@ -121,9 +120,8 @@ let SnippetsResourceTreeItem = class SnippetsResourceTreeItem {
                         }
                     },
                     accessibilityInformation: {
-                        label: ( localizeWithPath(
-                            _moduleId,
-                            1,
+                        label: ( localize(
+                            8799,
                             "Select Snippet {0}",
                             this.uriIdentityService.extUri.basename(resource)
                         )),

package/vscode/src/vs/workbench/services/userDataProfile/browser/tasksResource.js

@@ -1,6 +1,6 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { VSBuffer } from 'vscode/vscode/vs/base/common/buffer';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize } from 'vscode/vscode/vs/nls';
 import { FileOperationError, FileOperationResult } from 'vscode/vscode/vs/platform/files/common/files';
 import { IFileService } from 'vscode/vscode/vs/platform/files/common/files.service';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
@@ -11,7 +11,6 @@ import { API_OPEN_EDITOR_COMMAND_ID } from 'vscode/vscode/vs/workbench/browser/p
 import { TreeItemCollapsibleState } from 'vscode/vscode/vs/workbench/common/views';
 import { IUserDataProfileService } from 'vscode/vscode/vs/workbench/services/userDataProfile/common/userDataProfile.service';
 
-const _moduleId = "vs/workbench/services/userDataProfile/browser/tasksResource";
 let TasksResourceInitializer = class TasksResourceInitializer {
     constructor(userDataProfileService, fileService, logService) {
         this.userDataProfileService = userDataProfileService;
@@ -81,7 +80,7 @@ let TasksResourceTreeItem = class TasksResourceTreeItem {
         this.instantiationService = instantiationService;
         this.type = ProfileResourceType.Tasks;
         this.handle = ProfileResourceType.Tasks;
-        this.label = { label: ( localizeWithPath(_moduleId, 0, "User Tasks")) };
+        this.label = { label: ( localize(8797, "Tasks")) };
         this.collapsibleState = TreeItemCollapsibleState.Expanded;
     }
     async getChildren() {