@codingame/monaco-vscode-user-data-profile-service-override 6.0.3 → 7.0.1

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

@@ -2,7 +2,7 @@ import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { Disposable, MutableDisposable, DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
 import { isWeb } from 'vscode/vscode/vs/base/common/platform';
 import { localizeWithPath, localize2WithPath } from 'vscode/vscode/vs/nls';
-import { MenuRegistry, MenuId, registerAction2, Action2 } from 'vscode/vscode/vs/platform/actions/common/actions';
+import { MenuId, MenuRegistry, registerAction2, Action2 } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { IMenuService } from 'vscode/vscode/vs/platform/actions/common/actions.service';
 import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
@@ -25,15 +25,23 @@ import { IOpenerService } from 'vscode/vscode/vs/platform/opener/common/opener.s
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { EditorPaneDescriptor } from 'vscode/vscode/vs/workbench/browser/editor';
 import { EditorExtensions } from 'vscode/vscode/vs/workbench/common/editor';
-import { UserDataProfilesEditor, UserDataProfilesEditorInput, UserDataProfilesEditorInputSerializer } from './userDataProfilesEditor.js';
+import { UserDataProfilesEditorInput, UserDataProfilesEditor, UserDataProfilesEditorInputSerializer } from './userDataProfilesEditor.js';
 import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
 import { IEditorGroupsService } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
+import { IHostService } from 'vscode/vscode/vs/workbench/services/host/browser/host.service';
+import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
+import { Extensions, ConfigurationScope } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
+import { workbenchConfigurationNodeBase } from 'vscode/vscode/vs/workbench/common/configuration';
+import { IProductService } from 'vscode/vscode/vs/platform/product/common/productService.service';
 
 const _moduleId = "vs/workbench/contrib/userDataProfile/browser/userDataProfile";
+const OpenProfileMenu = ( (new MenuId('OpenProfile')));
+const CONFIG_ENABLE_NEW_PROFILES_UI = 'workbench.experimental.enableNewProfilesUI';
+const CONTEXT_ENABLE_NEW_PROFILES_UI = ( (ContextKeyExpr.equals('config.workbench.experimental.enableNewProfilesUI', true)));
 let UserDataProfilesWorkbenchContribution = class UserDataProfilesWorkbenchContribution extends Disposable {
     static { this.ID = 'workbench.contrib.userDataProfiles'; }
-    constructor(userDataProfileService, userDataProfilesService, userDataProfileManagementService, userDataProfileImportExportService, telemetryService, workspaceContextService, workspaceTagsService, contextKeyService, lifecycleService) {
+    constructor(userDataProfileService, userDataProfilesService, userDataProfileManagementService, userDataProfileImportExportService, telemetryService, workspaceContextService, workspaceTagsService, contextKeyService, configurationService, editorGroupsService, instantiationService, productService, lifecycleService) {
         super();
         this.userDataProfileService = userDataProfileService;
         this.userDataProfilesService = userDataProfilesService;
@@ -42,6 +50,10 @@ let UserDataProfilesWorkbenchContribution = class UserDataProfilesWorkbenchContr
         this.telemetryService = telemetryService;
         this.workspaceContextService = workspaceContextService;
         this.workspaceTagsService = workspaceTagsService;
+        this.configurationService = configurationService;
+        this.editorGroupsService = editorGroupsService;
+        this.instantiationService = instantiationService;
+        this.productService = productService;
         this.lifecycleService = lifecycleService;
         this.startTime = Date.now();
         this.profilesDisposable = this._register(( (new MutableDisposable())));
@@ -58,6 +70,7 @@ let UserDataProfilesWorkbenchContribution = class UserDataProfilesWorkbenchContr
         this.hasProfilesContext = HAS_PROFILES_CONTEXT.bindTo(contextKeyService);
         this.hasProfilesContext.set(this.userDataProfilesService.profiles.length > 1);
         this._register(this.userDataProfilesService.onDidChangeProfiles(e => this.hasProfilesContext.set(this.userDataProfilesService.profiles.length > 1)));
+        this.registerConfiguration();
         this.registerEditor();
         this.registerActions();
         if (isWeb) {
@@ -65,8 +78,28 @@ let UserDataProfilesWorkbenchContribution = class UserDataProfilesWorkbenchContr
         }
         this.reportWorkspaceProfileInfo();
     }
+    openProfilesEditor() {
+        return this.editorGroupsService.activeGroup.openEditor(( (new UserDataProfilesEditorInput(this.instantiationService))));
+    }
+    isNewProfilesUIEnabled() {
+        return this.configurationService.getValue(CONFIG_ENABLE_NEW_PROFILES_UI) === true;
+    }
+    registerConfiguration() {
+        ( (Registry.as(Extensions.Configuration)))
+            .registerConfiguration({
+            ...workbenchConfigurationNodeBase,
+            properties: {
+                [CONFIG_ENABLE_NEW_PROFILES_UI]: {
+                    type: 'boolean',
+                    description: ( localizeWithPath(_moduleId, 0, "Enables the new profiles UI.")),
+                    default: this.productService.quality !== 'stable',
+                    scope: ConfigurationScope.APPLICATION,
+                }
+            }
+        });
+    }
     registerEditor() {
-        ( (Registry.as(EditorExtensions.EditorPane))).registerEditorPane(EditorPaneDescriptor.create(UserDataProfilesEditor, UserDataProfilesEditor.ID, ( localizeWithPath(_moduleId, 0, "Profiles Editor"))), [
+        ( (Registry.as(EditorExtensions.EditorPane))).registerEditorPane(EditorPaneDescriptor.create(UserDataProfilesEditor, UserDataProfilesEditor.ID, ( localizeWithPath(_moduleId, 1, "Profiles Editor"))), [
             ( (new SyncDescriptor(UserDataProfilesEditorInput)))
         ]);
         ( (Registry.as(EditorExtensions.EditorFactory))).registerEditorSerializer(UserDataProfilesEditorInput.ID, UserDataProfilesEditorInputSerializer);
@@ -75,6 +108,7 @@ let UserDataProfilesWorkbenchContribution = class UserDataProfilesWorkbenchContr
         this.registerProfileSubMenu();
         this._register(this.registerManageProfilesAction());
         this._register(this.registerSwitchProfileAction());
+        this.registerOpenProfileSubMenu();
         this.registerProfilesActions();
         this._register(this.userDataProfilesService.onDidChangeProfiles(() => this.registerProfilesActions()));
         this.registerCurrentProfilesActions();
@@ -88,11 +122,15 @@ let UserDataProfilesWorkbenchContribution = class UserDataProfilesWorkbenchContr
         const getProfilesTitle = () => {
             return ( localizeWithPath(
                 _moduleId,
-                1,
+                2,
                 "Profile ({0})",
                 this.userDataProfileService.currentProfile.name
             ));
         };
+        const when = ( (ContextKeyExpr.or(
+             (CONTEXT_ENABLE_NEW_PROFILES_UI.negate()),
+            HAS_PROFILES_CONTEXT
+        )));
         MenuRegistry.appendMenuItem(MenuId.GlobalActivity, {
             get title() {
                 return getProfilesTitle();
@@ -100,6 +138,7 @@ let UserDataProfilesWorkbenchContribution = class UserDataProfilesWorkbenchContr
             submenu: ProfilesMenu,
             group: '2_configuration',
             order: 1,
+            when,
         });
         MenuRegistry.appendMenuItem(MenuId.MenubarPreferencesMenu, {
             get title() {
@@ -108,56 +147,25 @@ let UserDataProfilesWorkbenchContribution = class UserDataProfilesWorkbenchContr
             submenu: ProfilesMenu,
             group: '2_configuration',
             order: 1,
-            when: PROFILES_ENABLEMENT_CONTEXT,
+            when,
         });
     }
-    registerManageProfilesAction() {
-        const disposables = ( (new DisposableStore()));
-        const when = ( (ContextKeyExpr.equals('config.workbench.experimental.enableNewProfilesUI', true)));
-        disposables.add(registerAction2(class ManageProfilesAction extends Action2 {
-            constructor() {
-                super({
-                    id: `workbench.profiles.actions.manageProfiles`,
-                    title: {
-                        ...( localize2WithPath(_moduleId, 2, "Profiles")),
-                        mnemonicTitle: ( localizeWithPath(_moduleId, 3, "&&Profiles")),
-                    },
-                    menu: [
-                        {
-                            id: MenuId.GlobalActivity,
-                            group: '2_configuration',
-                            when,
-                            order: 1
-                        },
-                        {
-                            id: MenuId.MenubarPreferencesMenu,
-                            group: '2_configuration',
-                            when,
-                            order: 1
-                        }
-                    ]
-                });
-            }
-            run(accessor) {
-                const editorGroupsService = accessor.get(IEditorGroupsService);
-                const instantiationService = accessor.get(IInstantiationService);
-                return editorGroupsService.activeGroup.openEditor(( (new UserDataProfilesEditorInput(instantiationService))));
-            }
-        }));
-        disposables.add(MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
-            command: {
-                id: 'workbench.profiles.actions.manageProfiles',
-                category: Categories.Preferences,
-                title: ( localize2WithPath(_moduleId, 4, "Open Profiles (UI)")),
-                precondition: when,
-            },
-        }));
-        return disposables;
+    registerOpenProfileSubMenu() {
+        MenuRegistry.appendMenuItem(MenuId.MenubarFileMenu, {
+            title: ( localizeWithPath(_moduleId, 3, "New Window with Profile")),
+            submenu: OpenProfileMenu,
+            group: '1_new',
+            order: 4,
+            when: HAS_PROFILES_CONTEXT,
+        });
     }
     registerProfilesActions() {
         this.profilesDisposable.value = ( (new DisposableStore()));
         for (const profile of this.userDataProfilesService.profiles) {
-            this.profilesDisposable.value.add(this.registerProfileEntryAction(profile));
+            if (!profile.isTransient) {
+                this.profilesDisposable.value.add(this.registerProfileEntryAction(profile));
+                this.profilesDisposable.value.add(this.registerNewWindowAction(profile));
+            }
         }
     }
     registerProfileEntryAction(profile) {
@@ -189,12 +197,41 @@ let UserDataProfilesWorkbenchContribution = class UserDataProfilesWorkbenchContr
             }
         });
     }
+    registerNewWindowAction(profile) {
+        const disposables = ( (new DisposableStore()));
+        const id = `workbench.action.openProfile.${profile.name.toLowerCase().replace('/\s+/', '_')}`;
+        disposables.add(registerAction2(class NewWindowAction extends Action2 {
+            constructor() {
+                super({
+                    id,
+                    title: ( localize2WithPath(_moduleId, 4, "{0}", profile.name)),
+                    menu: {
+                        id: OpenProfileMenu,
+                        when: HAS_PROFILES_CONTEXT
+                    }
+                });
+            }
+            run(accessor) {
+                const hostService = accessor.get(IHostService);
+                return hostService.openWindow({ remoteAuthority: null, forceProfile: profile.name });
+            }
+        }));
+        disposables.add(MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
+            command: {
+                id,
+                category: PROFILES_CATEGORY,
+                title: ( localize2WithPath(_moduleId, 5, "Open {0} Profile", profile.name)),
+                precondition: HAS_PROFILES_CONTEXT
+            },
+        }));
+        return disposables;
+    }
     registerSwitchProfileAction() {
         return registerAction2(class SwitchProfileAction extends Action2 {
             constructor() {
                 super({
                     id: `workbench.profiles.actions.switchProfile`,
-                    title: ( localize2WithPath(_moduleId, 5, 'Switch Profile...')),
+                    title: ( localize2WithPath(_moduleId, 6, 'Switch Profile...')),
                     category: PROFILES_CATEGORY,
                     f1: true,
                     precondition: PROFILES_ENABLEMENT_CONTEXT,
@@ -210,7 +247,7 @@ let UserDataProfilesWorkbenchContribution = class UserDataProfilesWorkbenchContr
                         action,
                         label: action.checked ? `$(check) ${action.label}` : action.label,
                     })))), {
-                        placeHolder: ( localizeWithPath(_moduleId, 6, "Select Profile"))
+                        placeHolder: ( localizeWithPath(_moduleId, 7, "Select Profile"))
                     });
                     await result?.action.run();
                 }
@@ -227,31 +264,78 @@ let UserDataProfilesWorkbenchContribution = class UserDataProfilesWorkbenchContr
         this.currentprofileActionsDisposable.value.add(this.registerExportCurrentProfileAction());
         this.currentprofileActionsDisposable.value.add(this.registerImportProfileAction());
     }
+    registerManageProfilesAction() {
+        const disposables = ( (new DisposableStore()));
+        disposables.add(registerAction2(class ManageProfilesAction extends Action2 {
+            constructor() {
+                super({
+                    id: `workbench.profiles.actions.manageProfiles`,
+                    title: {
+                        ...( localize2WithPath(_moduleId, 8, "Profiles")),
+                        mnemonicTitle: ( localizeWithPath(_moduleId, 9, "&&Profiles")),
+                    },
+                    menu: [
+                        {
+                            id: MenuId.GlobalActivity,
+                            group: '2_configuration',
+                            order: 1,
+                            when: CONTEXT_ENABLE_NEW_PROFILES_UI,
+                        },
+                        {
+                            id: MenuId.MenubarPreferencesMenu,
+                            group: '2_configuration',
+                            order: 1,
+                            when: CONTEXT_ENABLE_NEW_PROFILES_UI,
+                        },
+                    ]
+                });
+            }
+            run(accessor) {
+                const editorGroupsService = accessor.get(IEditorGroupsService);
+                const instantiationService = accessor.get(IInstantiationService);
+                return editorGroupsService.activeGroup.openEditor(( (new UserDataProfilesEditorInput(instantiationService))));
+            }
+        }));
+        disposables.add(MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
+            command: {
+                id: 'workbench.profiles.actions.manageProfiles',
+                category: Categories.Preferences,
+                title: ( localize2WithPath(_moduleId, 10, "Open Profiles (UI)")),
+                precondition: CONTEXT_ENABLE_NEW_PROFILES_UI,
+            },
+        }));
+        return disposables;
+    }
     registerEditCurrentProfileAction() {
         const that = this;
         return registerAction2(class RenameCurrentProfileAction extends Action2 {
             constructor() {
-                const when = ( (ContextKeyExpr.and( (ContextKeyExpr.notEquals(
+                const precondition = ( (ContextKeyExpr.and( (ContextKeyExpr.notEquals(
                     CURRENT_PROFILE_CONTEXT.key,
                     that.userDataProfilesService.defaultProfile.id
                 )),  (IS_CURRENT_PROFILE_TRANSIENT_CONTEXT.toNegated()))));
                 super({
                     id: `workbench.profiles.actions.editCurrentProfile`,
-                    title: ( localize2WithPath(_moduleId, 7, "Edit Profile...")),
-                    precondition: when,
+                    title: ( localize2WithPath(_moduleId, 11, "Edit Profile...")),
+                    precondition,
                     f1: true,
                     menu: [
                         {
                             id: ProfilesMenu,
                             group: '2_manage_current',
-                            when,
+                            when: ( (ContextKeyExpr.and(precondition,  (CONTEXT_ENABLE_NEW_PROFILES_UI.negate())))),
                             order: 2
                         }
                     ]
                 });
             }
-            run() {
-                return that.userDataProfileImportExportService.editProfile(that.userDataProfileService.currentProfile);
+            run(accessor) {
+                if (that.isNewProfilesUIEnabled()) {
+                    return that.openProfilesEditor();
+                }
+                else {
+                    return that.userDataProfileImportExportService.editProfile(that.userDataProfileService.currentProfile);
+                }
             }
         });
     }
@@ -261,15 +345,14 @@ let UserDataProfilesWorkbenchContribution = class UserDataProfilesWorkbenchContr
             constructor() {
                 super({
                     id,
-                    title: ( localize2WithPath(_moduleId, 8, "Show Profile Contents")),
+                    title: ( localize2WithPath(_moduleId, 12, "Show Profile Contents")),
                     category: PROFILES_CATEGORY,
                     menu: [
                         {
                             id: ProfilesMenu,
                             group: '2_manage_current',
-                            order: 3
-                        }, {
-                            id: MenuId.CommandPalette
+                            order: 3,
+                            when: ( (CONTEXT_ENABLE_NEW_PROFILES_UI.negate()))
                         }
                     ]
                 });
@@ -288,14 +371,15 @@ let UserDataProfilesWorkbenchContribution = class UserDataProfilesWorkbenchContr
             constructor() {
                 super({
                     id,
-                    title: ( localize2WithPath(_moduleId, 9, "Export Profile...")),
+                    title: ( localize2WithPath(_moduleId, 13, "Export Profile...")),
                     category: PROFILES_CATEGORY,
                     precondition: ( (IS_PROFILE_EXPORT_IN_PROGRESS_CONTEXT.toNegated())),
                     menu: [
                         {
                             id: ProfilesMenu,
                             group: '4_import_export_profiles',
-                            order: 1
+                            order: 1,
+                            when: ( (CONTEXT_ENABLE_NEW_PROFILES_UI.negate())),
                         }, {
                             id: MenuId.CommandPalette
                         }
@@ -303,8 +387,12 @@ let UserDataProfilesWorkbenchContribution = class UserDataProfilesWorkbenchContr
                 });
             }
             async run(accessor) {
-                const userDataProfileImportExportService = accessor.get(IUserDataProfileImportExportService);
-                return userDataProfileImportExportService.exportProfile();
+                if (that.isNewProfilesUIEnabled()) {
+                    return that.openProfilesEditor();
+                }
+                else {
+                    return that.userDataProfileImportExportService.exportProfile2();
+                }
             }
         }));
         disposables.add(MenuRegistry.appendMenuItem(MenuId.MenubarShare, {
@@ -312,7 +400,7 @@ let UserDataProfilesWorkbenchContribution = class UserDataProfilesWorkbenchContr
                 id,
                 title: ( localize2WithPath(
                     _moduleId,
-                    10,
+                    14,
                     "Export Profile ({0})...",
                     that.userDataProfileService.currentProfile.name
                 )),
@@ -329,14 +417,17 @@ let UserDataProfilesWorkbenchContribution = class UserDataProfilesWorkbenchContr
             constructor() {
                 super({
                     id,
-                    title: ( localize2WithPath(_moduleId, 11, "Import Profile...")),
+                    title: ( localize2WithPath(_moduleId, 15, "Import Profile...")),
                     category: PROFILES_CATEGORY,
                     precondition: ( (IS_PROFILE_IMPORT_IN_PROGRESS_CONTEXT.toNegated())),
                     menu: [
                         {
                             id: ProfilesMenu,
                             group: '4_import_export_profiles',
-                            when: PROFILES_ENABLEMENT_CONTEXT,
+                            when: ( (ContextKeyExpr.and(
+                                PROFILES_ENABLEMENT_CONTEXT,
+                                 (CONTEXT_ENABLE_NEW_PROFILES_UI.negate())
+                            ))),
                             order: 2
                         }, {
                             id: MenuId.CommandPalette,
@@ -356,19 +447,19 @@ let UserDataProfilesWorkbenchContribution = class UserDataProfilesWorkbenchContr
                 const updateQuickPickItems = (value) => {
                     const quickPickItems = [];
                     if (value) {
-                        quickPickItems.push({ label: quickPick.value, description: ( localizeWithPath(_moduleId, 12, "Import from URL")) });
+                        quickPickItems.push({ label: quickPick.value, description: ( localizeWithPath(_moduleId, 16, "Import from URL")) });
                     }
-                    quickPickItems.push({ label: ( localizeWithPath(_moduleId, 13, "Select File...")) });
+                    quickPickItems.push({ label: ( localizeWithPath(_moduleId, 17, "Select File...")) });
                     if (profileTemplateQuickPickItems.length) {
                         quickPickItems.push({
                             type: 'separator',
-                            label: ( localizeWithPath(_moduleId, 14, "Profile Templates"))
+                            label: ( localizeWithPath(_moduleId, 18, "Profile Templates"))
                         }, ...profileTemplateQuickPickItems);
                     }
                     quickPick.items = quickPickItems;
                 };
-                quickPick.title = ( localizeWithPath(_moduleId, 15, "Import from Profile Template..."));
-                quickPick.placeholder = ( localizeWithPath(_moduleId, 16, "Provide Profile Template URL"));
+                quickPick.title = ( localizeWithPath(_moduleId, 19, "Import from Profile Template..."));
+                quickPick.placeholder = ( localizeWithPath(_moduleId, 20, "Provide Profile Template URL"));
                 quickPick.ignoreFocusOut = true;
                 disposables.add(quickPick.onDidChangeValue(updateQuickPickItems));
                 updateQuickPickItems();
@@ -390,7 +481,7 @@ let UserDataProfilesWorkbenchContribution = class UserDataProfilesWorkbenchContr
                         }
                     }
                     catch (error) {
-                        notificationService.error(( localizeWithPath(_moduleId, 17, "Error while creating profile: {0}", getErrorMessage(error))));
+                        notificationService.error(( localizeWithPath(_moduleId, 21, "Error while creating profile: {0}", getErrorMessage(error))));
                     }
                 }));
                 disposables.add(quickPick.onDidHide(() => disposables.dispose()));
@@ -402,7 +493,7 @@ let UserDataProfilesWorkbenchContribution = class UserDataProfilesWorkbenchContr
                     canSelectFiles: true,
                     canSelectMany: false,
                     filters: PROFILE_FILTER,
-                    title: ( localizeWithPath(_moduleId, 18, "Select Profile Template File")),
+                    title: ( localizeWithPath(_moduleId, 22, "Select Profile Template File")),
                 });
                 if (!profileLocation) {
                     return null;
@@ -413,7 +504,7 @@ let UserDataProfilesWorkbenchContribution = class UserDataProfilesWorkbenchContr
         disposables.add(MenuRegistry.appendMenuItem(MenuId.MenubarShare, {
             command: {
                 id,
-                title: ( localize2WithPath(_moduleId, 19, "Import Profile...")),
+                title: ( localize2WithPath(_moduleId, 23, "Import Profile...")),
                 precondition: PROFILES_ENABLEMENT_CONTEXT,
             },
         }));
@@ -425,7 +516,7 @@ let UserDataProfilesWorkbenchContribution = class UserDataProfilesWorkbenchContr
             constructor() {
                 super({
                     id: 'workbench.profiles.actions.createFromCurrentProfile',
-                    title: ( localize2WithPath(_moduleId, 20, "Save Current Profile As...")),
+                    title: ( localize2WithPath(_moduleId, 24, "Save Current Profile As...")),
                     category: PROFILES_CATEGORY,
                     f1: true,
                     precondition: PROFILES_ENABLEMENT_CONTEXT
@@ -442,7 +533,7 @@ let UserDataProfilesWorkbenchContribution = class UserDataProfilesWorkbenchContr
             constructor() {
                 super({
                     id: 'workbench.profiles.actions.createProfile',
-                    title: ( localize2WithPath(_moduleId, 21, "Create Profile...")),
+                    title: ( localize2WithPath(_moduleId, 25, "Create Profile...")),
                     category: PROFILES_CATEGORY,
                     precondition: PROFILES_ENABLEMENT_CONTEXT,
                     f1: true,
@@ -450,14 +541,22 @@ let UserDataProfilesWorkbenchContribution = class UserDataProfilesWorkbenchContr
                         {
                             id: ProfilesMenu,
                             group: '3_manage_profiles',
-                            when: PROFILES_ENABLEMENT_CONTEXT,
+                            when: ( (ContextKeyExpr.and(
+                                PROFILES_ENABLEMENT_CONTEXT,
+                                 (CONTEXT_ENABLE_NEW_PROFILES_UI.negate())
+                            ))),
                             order: 1
                         }
                     ]
                 });
             }
             async run(accessor) {
-                return that.userDataProfileImportExportService.createProfile();
+                if (that.isNewProfilesUIEnabled()) {
+                    return that.openProfilesEditor();
+                }
+                else {
+                    return that.userDataProfileImportExportService.createProfile();
+                }
             }
         }));
     }
@@ -466,7 +565,7 @@ let UserDataProfilesWorkbenchContribution = class UserDataProfilesWorkbenchContr
             constructor() {
                 super({
                     id: 'workbench.profiles.actions.deleteProfile',
-                    title: ( localize2WithPath(_moduleId, 22, "Delete Profile...")),
+                    title: ( localize2WithPath(_moduleId, 26, "Delete Profile...")),
                     category: PROFILES_CATEGORY,
                     f1: true,
                     precondition: ( (ContextKeyExpr.and(PROFILES_ENABLEMENT_CONTEXT, HAS_PROFILES_CONTEXT))),
@@ -474,7 +573,10 @@ let UserDataProfilesWorkbenchContribution = class UserDataProfilesWorkbenchContr
                         {
                             id: ProfilesMenu,
                             group: '3_manage_profiles',
-                            when: PROFILES_ENABLEMENT_CONTEXT,
+                            when: ( (ContextKeyExpr.and(
+                                PROFILES_ENABLEMENT_CONTEXT,
+                                 (CONTEXT_ENABLE_NEW_PROFILES_UI.negate())
+                            ))),
                             order: 2
                         }
                     ]
@@ -490,11 +592,11 @@ let UserDataProfilesWorkbenchContribution = class UserDataProfilesWorkbenchContr
                 if (profiles.length) {
                     const picks = await quickInputService.pick(( (profiles.map(profile => ({
                         label: profile.name,
-                        description: profile.id === userDataProfileService.currentProfile.id ? ( localizeWithPath(_moduleId, 23, "Current")) : undefined,
+                        description: profile.id === userDataProfileService.currentProfile.id ? ( localizeWithPath(_moduleId, 27, "Current")) : undefined,
                         profile
                     })))), {
-                        title: ( localizeWithPath(_moduleId, 24, "Delete Profile...")),
-                        placeHolder: ( localizeWithPath(_moduleId, 25, "Select Profiles to Delete")),
+                        title: ( localizeWithPath(_moduleId, 28, "Delete Profile...")),
+                        placeHolder: ( localizeWithPath(_moduleId, 29, "Select Profiles to Delete")),
                         canPickMany: true
                     });
                     if (picks) {
@@ -555,7 +657,11 @@ UserDataProfilesWorkbenchContribution = ( (__decorate([
     ( (__param(5, IWorkspaceContextService))),
     ( (__param(6, IWorkspaceTagsService))),
     ( (__param(7, IContextKeyService))),
-    ( (__param(8, ILifecycleService)))
+    ( (__param(8, IConfigurationService))),
+    ( (__param(9, IEditorGroupsService))),
+    ( (__param(10, IInstantiationService))),
+    ( (__param(11, IProductService))),
+    ( (__param(12, ILifecycleService)))
 ], UserDataProfilesWorkbenchContribution)));
 
-export { UserDataProfilesWorkbenchContribution };
+export { OpenProfileMenu, UserDataProfilesWorkbenchContribution };