@codingame/monaco-vscode-user-data-profile-service-override 5.3.0 → 6.0.1

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

@@ -7,6 +7,7 @@ import { IMenuService } from 'vscode/vscode/vs/platform/actions/common/actions.s
 import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
 import { IUserDataProfilesService } from 'vscode/vscode/vs/platform/userDataProfile/common/userDataProfile.service';
+import { LifecyclePhase } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
 import { ILifecycleService } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle.service';
 import { CURRENT_PROFILE_CONTEXT, PROFILES_ENABLEMENT_CONTEXT, IS_CURRENT_PROFILE_TRANSIENT_CONTEXT, HAS_PROFILES_CONTEXT, ProfilesMenu, PROFILES_CATEGORY, IS_PROFILE_EXPORT_IN_PROGRESS_CONTEXT, IS_PROFILE_IMPORT_IN_PROGRESS_CONTEXT, PROFILE_FILTER, PROFILES_TITLE } from 'vscode/vscode/vs/workbench/services/userDataProfile/common/userDataProfile';
 import { IUserDataProfileImportExportService, IUserDataProfileService, IUserDataProfileManagementService } from 'vscode/vscode/vs/workbench/services/userDataProfile/common/userDataProfile.service';
@@ -15,11 +16,19 @@ import { INotificationService } from 'vscode/vscode/vs/platform/notification/com
 import { IFileDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs.service';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
 import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry.service';
+import { WorkbenchState } from 'vscode/vscode/vs/platform/workspace/common/workspace';
 import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace.service';
 import { IWorkspaceTagsService } from 'vscode/vscode/vs/workbench/contrib/tags/common/workspaceTags.service';
 import { getErrorMessage } from 'vscode/vscode/vs/base/common/errors';
 import { Categories } from 'vscode/vscode/vs/platform/action/common/actionCommonCategories';
 import { IOpenerService } from 'vscode/vscode/vs/platform/opener/common/opener.service';
+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 { 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';
 
 const _moduleId = "vs/workbench/contrib/userDataProfile/browser/userDataProfile";
 let UserDataProfilesWorkbenchContribution = class UserDataProfilesWorkbenchContribution extends Disposable {
@@ -34,6 +43,7 @@ let UserDataProfilesWorkbenchContribution = class UserDataProfilesWorkbenchContr
         this.workspaceContextService = workspaceContextService;
         this.workspaceTagsService = workspaceTagsService;
         this.lifecycleService = lifecycleService;
+        this.startTime = Date.now();
         this.profilesDisposable = this._register(( (new MutableDisposable())));
         this.currentprofileActionsDisposable = this._register(( (new MutableDisposable())));
         this.currentProfileContext = CURRENT_PROFILE_CONTEXT.bindTo(contextKeyService);
@@ -48,14 +58,22 @@ 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.registerEditor();
         this.registerActions();
         if (isWeb) {
-            lifecycleService.when(4 ).then(() => userDataProfilesService.cleanUp());
+            lifecycleService.when(LifecyclePhase.Eventually).then(() => userDataProfilesService.cleanUp());
         }
         this.reportWorkspaceProfileInfo();
     }
+    registerEditor() {
+        ( (Registry.as(EditorExtensions.EditorPane))).registerEditorPane(EditorPaneDescriptor.create(UserDataProfilesEditor, UserDataProfilesEditor.ID, ( localizeWithPath(_moduleId, 0, "Profiles Editor"))), [
+            ( (new SyncDescriptor(UserDataProfilesEditorInput)))
+        ]);
+        ( (Registry.as(EditorExtensions.EditorFactory))).registerEditorSerializer(UserDataProfilesEditorInput.ID, UserDataProfilesEditorInputSerializer);
+    }
     registerActions() {
         this.registerProfileSubMenu();
+        this._register(this.registerManageProfilesAction());
         this._register(this.registerSwitchProfileAction());
         this.registerProfilesActions();
         this._register(this.userDataProfilesService.onDidChangeProfiles(() => this.registerProfilesActions()));
@@ -70,8 +88,8 @@ let UserDataProfilesWorkbenchContribution = class UserDataProfilesWorkbenchContr
         const getProfilesTitle = () => {
             return ( localizeWithPath(
                 _moduleId,
-                0,
-                "Profiles ({0})",
+                1,
+                "Profile ({0})",
                 this.userDataProfileService.currentProfile.name
             ));
         };
@@ -93,6 +111,49 @@ let UserDataProfilesWorkbenchContribution = class UserDataProfilesWorkbenchContr
             when: PROFILES_ENABLEMENT_CONTEXT,
         });
     }
+    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;
+    }
     registerProfilesActions() {
         this.profilesDisposable.value = ( (new DisposableStore()));
         for (const profile of this.userDataProfilesService.profiles) {
@@ -118,6 +179,11 @@ let UserDataProfilesWorkbenchContribution = class UserDataProfilesWorkbenchContr
             }
             async run(accessor) {
                 if (that.userDataProfileService.currentProfile.id !== profile.id) {
+                    if (profile.isDefault && Date.now() - that.startTime < ((1000 * 20) )) {
+                        that.telemetryService.publicLog2('profiles:newwindowprofile', {
+                            emptyWindow: that.workspaceContextService.getWorkbenchState() === WorkbenchState.EMPTY
+                        });
+                    }
                     return that.userDataProfileManagementService.switchProfile(profile);
                 }
             }
@@ -128,7 +194,7 @@ let UserDataProfilesWorkbenchContribution = class UserDataProfilesWorkbenchContr
             constructor() {
                 super({
                     id: `workbench.profiles.actions.switchProfile`,
-                    title: ( localize2WithPath(_moduleId, 1, 'Switch Profile...')),
+                    title: ( localize2WithPath(_moduleId, 5, 'Switch Profile...')),
                     category: PROFILES_CATEGORY,
                     f1: true,
                     precondition: PROFILES_ENABLEMENT_CONTEXT,
@@ -144,7 +210,7 @@ let UserDataProfilesWorkbenchContribution = class UserDataProfilesWorkbenchContr
                         action,
                         label: action.checked ? `$(check) ${action.label}` : action.label,
                     })))), {
-                        placeHolder: ( localizeWithPath(_moduleId, 2, "Select Profile"))
+                        placeHolder: ( localizeWithPath(_moduleId, 6, "Select Profile"))
                     });
                     await result?.action.run();
                 }
@@ -171,7 +237,7 @@ let UserDataProfilesWorkbenchContribution = class UserDataProfilesWorkbenchContr
                 )),  (IS_CURRENT_PROFILE_TRANSIENT_CONTEXT.toNegated()))));
                 super({
                     id: `workbench.profiles.actions.editCurrentProfile`,
-                    title: ( localize2WithPath(_moduleId, 3, "Edit Profile...")),
+                    title: ( localize2WithPath(_moduleId, 7, "Edit Profile...")),
                     precondition: when,
                     f1: true,
                     menu: [
@@ -195,7 +261,7 @@ let UserDataProfilesWorkbenchContribution = class UserDataProfilesWorkbenchContr
             constructor() {
                 super({
                     id,
-                    title: ( localize2WithPath(_moduleId, 4, "Show Profile Contents")),
+                    title: ( localize2WithPath(_moduleId, 8, "Show Profile Contents")),
                     category: PROFILES_CATEGORY,
                     menu: [
                         {
@@ -222,7 +288,7 @@ let UserDataProfilesWorkbenchContribution = class UserDataProfilesWorkbenchContr
             constructor() {
                 super({
                     id,
-                    title: ( localize2WithPath(_moduleId, 5, "Export Profile...")),
+                    title: ( localize2WithPath(_moduleId, 9, "Export Profile...")),
                     category: PROFILES_CATEGORY,
                     precondition: ( (IS_PROFILE_EXPORT_IN_PROGRESS_CONTEXT.toNegated())),
                     menu: [
@@ -246,7 +312,7 @@ let UserDataProfilesWorkbenchContribution = class UserDataProfilesWorkbenchContr
                 id,
                 title: ( localize2WithPath(
                     _moduleId,
-                    6,
+                    10,
                     "Export Profile ({0})...",
                     that.userDataProfileService.currentProfile.name
                 )),
@@ -263,7 +329,7 @@ let UserDataProfilesWorkbenchContribution = class UserDataProfilesWorkbenchContr
             constructor() {
                 super({
                     id,
-                    title: ( localize2WithPath(_moduleId, 7, "Import Profile...")),
+                    title: ( localize2WithPath(_moduleId, 11, "Import Profile...")),
                     category: PROFILES_CATEGORY,
                     precondition: ( (IS_PROFILE_IMPORT_IN_PROGRESS_CONTEXT.toNegated())),
                     menu: [
@@ -290,19 +356,19 @@ let UserDataProfilesWorkbenchContribution = class UserDataProfilesWorkbenchContr
                 const updateQuickPickItems = (value) => {
                     const quickPickItems = [];
                     if (value) {
-                        quickPickItems.push({ label: quickPick.value, description: ( localizeWithPath(_moduleId, 8, "Import from URL")) });
+                        quickPickItems.push({ label: quickPick.value, description: ( localizeWithPath(_moduleId, 12, "Import from URL")) });
                     }
-                    quickPickItems.push({ label: ( localizeWithPath(_moduleId, 9, "Select File...")) });
+                    quickPickItems.push({ label: ( localizeWithPath(_moduleId, 13, "Select File...")) });
                     if (profileTemplateQuickPickItems.length) {
                         quickPickItems.push({
                             type: 'separator',
-                            label: ( localizeWithPath(_moduleId, 10, "Profile Templates"))
+                            label: ( localizeWithPath(_moduleId, 14, "Profile Templates"))
                         }, ...profileTemplateQuickPickItems);
                     }
                     quickPick.items = quickPickItems;
                 };
-                quickPick.title = ( localizeWithPath(_moduleId, 11, "Import from Profile Template..."));
-                quickPick.placeholder = ( localizeWithPath(_moduleId, 12, "Provide Profile Template URL"));
+                quickPick.title = ( localizeWithPath(_moduleId, 15, "Import from Profile Template..."));
+                quickPick.placeholder = ( localizeWithPath(_moduleId, 16, "Provide Profile Template URL"));
                 quickPick.ignoreFocusOut = true;
                 disposables.add(quickPick.onDidChangeValue(updateQuickPickItems));
                 updateQuickPickItems();
@@ -324,7 +390,7 @@ let UserDataProfilesWorkbenchContribution = class UserDataProfilesWorkbenchContr
                         }
                     }
                     catch (error) {
-                        notificationService.error(( localizeWithPath(_moduleId, 13, "Error while creating profile: {0}", getErrorMessage(error))));
+                        notificationService.error(( localizeWithPath(_moduleId, 17, "Error while creating profile: {0}", getErrorMessage(error))));
                     }
                 }));
                 disposables.add(quickPick.onDidHide(() => disposables.dispose()));
@@ -336,7 +402,7 @@ let UserDataProfilesWorkbenchContribution = class UserDataProfilesWorkbenchContr
                     canSelectFiles: true,
                     canSelectMany: false,
                     filters: PROFILE_FILTER,
-                    title: ( localizeWithPath(_moduleId, 14, "Select Profile Template File")),
+                    title: ( localizeWithPath(_moduleId, 18, "Select Profile Template File")),
                 });
                 if (!profileLocation) {
                     return null;
@@ -347,7 +413,7 @@ let UserDataProfilesWorkbenchContribution = class UserDataProfilesWorkbenchContr
         disposables.add(MenuRegistry.appendMenuItem(MenuId.MenubarShare, {
             command: {
                 id,
-                title: ( localize2WithPath(_moduleId, 15, "Import Profile...")),
+                title: ( localize2WithPath(_moduleId, 19, "Import Profile...")),
                 precondition: PROFILES_ENABLEMENT_CONTEXT,
             },
         }));
@@ -359,7 +425,7 @@ let UserDataProfilesWorkbenchContribution = class UserDataProfilesWorkbenchContr
             constructor() {
                 super({
                     id: 'workbench.profiles.actions.createFromCurrentProfile',
-                    title: ( localize2WithPath(_moduleId, 16, "Save Current Profile As...")),
+                    title: ( localize2WithPath(_moduleId, 20, "Save Current Profile As...")),
                     category: PROFILES_CATEGORY,
                     f1: true,
                     precondition: PROFILES_ENABLEMENT_CONTEXT
@@ -376,7 +442,7 @@ let UserDataProfilesWorkbenchContribution = class UserDataProfilesWorkbenchContr
             constructor() {
                 super({
                     id: 'workbench.profiles.actions.createProfile',
-                    title: ( localize2WithPath(_moduleId, 17, "Create Profile...")),
+                    title: ( localize2WithPath(_moduleId, 21, "Create Profile...")),
                     category: PROFILES_CATEGORY,
                     precondition: PROFILES_ENABLEMENT_CONTEXT,
                     f1: true,
@@ -400,7 +466,7 @@ let UserDataProfilesWorkbenchContribution = class UserDataProfilesWorkbenchContr
             constructor() {
                 super({
                     id: 'workbench.profiles.actions.deleteProfile',
-                    title: ( localize2WithPath(_moduleId, 18, "Delete Profile...")),
+                    title: ( localize2WithPath(_moduleId, 22, "Delete Profile...")),
                     category: PROFILES_CATEGORY,
                     f1: true,
                     precondition: ( (ContextKeyExpr.and(PROFILES_ENABLEMENT_CONTEXT, HAS_PROFILES_CONTEXT))),
@@ -424,11 +490,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, 19, "Current")) : undefined,
+                        description: profile.id === userDataProfileService.currentProfile.id ? ( localizeWithPath(_moduleId, 23, "Current")) : undefined,
                         profile
                     })))), {
-                        title: ( localizeWithPath(_moduleId, 20, "Delete Profile...")),
-                        placeHolder: ( localizeWithPath(_moduleId, 21, "Select Profiles to Delete")),
+                        title: ( localizeWithPath(_moduleId, 24, "Delete Profile...")),
+                        placeHolder: ( localizeWithPath(_moduleId, 25, "Select Profiles to Delete")),
                         canPickMany: true
                     });
                     if (picks) {
@@ -472,7 +538,7 @@ let UserDataProfilesWorkbenchContribution = class UserDataProfilesWorkbenchContr
         return quickPickItems;
     }
     async reportWorkspaceProfileInfo() {
-        await this.lifecycleService.when(4 );
+        await this.lifecycleService.when(LifecyclePhase.Eventually);
         const workspaceId = await this.workspaceTagsService.getTelemetryWorkspaceId(this.workspaceContextService.getWorkspace(), this.workspaceContextService.getWorkbenchState());
         this.telemetryService.publicLog2('workspaceProfileInfo', {
             workspaceId,