@codingame/monaco-vscode-user-data-profile-service-override 10.1.4 → 11.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-user-data-profile-service-override",
-  "version": "10.1.4",
+  "version": "11.0.0",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -26,6 +26,7 @@
     }
   },
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@10.1.4"
+    "vscode": "npm:@codingame/monaco-vscode-api@11.0.0",
+    "@codingame/monaco-vscode-user-data-profile-user-data-sync-common": "11.0.0"
   }
 }

package/vscode/src/vs/platform/userDataProfile/browser/userDataProfile.js

@@ -63,17 +63,10 @@ let BrowserUserDataProfilesService = class BrowserUserDataProfilesService extend
         localStorage.setItem(UserDataProfilesService.PROFILES_KEY, JSON.stringify(storedProfiles));
     }
     getStoredProfileAssociations() {
-        const migrateKey = 'profileAssociationsMigration';
         try {
             const value = localStorage.getItem(UserDataProfilesService.PROFILE_ASSOCIATIONS_KEY);
             if (value) {
-                let associations = JSON.parse(value);
-                if (!localStorage.getItem(migrateKey)) {
-                    associations = this.migrateStoredProfileAssociations(associations);
-                    this.saveStoredProfileAssociations(associations);
-                    localStorage.setItem(migrateKey, 'true');
-                }
-                return associations;
+                return JSON.parse(value);
             }
         }
         catch (error) {

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

@@ -7,7 +7,7 @@ import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/cont
 import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
 import { IUserDataProfilesService } from 'vscode/vscode/vs/platform/userDataProfile/common/userDataProfile.service';
 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, isProfileURL, PROFILES_CATEGORY, PROFILES_TITLE } from 'vscode/vscode/vs/workbench/services/userDataProfile/common/userDataProfile';
+import { CURRENT_PROFILE_CONTEXT, IS_CURRENT_PROFILE_TRANSIENT_CONTEXT, HAS_PROFILES_CONTEXT, isProfileURL, PROFILES_CATEGORY, PROFILES_TITLE } from 'vscode/vscode/vs/workbench/services/userDataProfile/common/userDataProfile';
 import { IUserDataProfileService, IUserDataProfileManagementService } from 'vscode/vscode/vs/workbench/services/userDataProfile/common/userDataProfile.service';
 import { IQuickInputService } from 'vscode/vscode/vs/platform/quickinput/common/quickInput.service';
 import { INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification.service';
@@ -29,6 +29,7 @@ import { IURLService } from 'vscode/vscode/vs/platform/url/common/url.service';
 import { IBrowserWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/browser/environmentService.service';
 
 const OpenProfileMenu = ( (new MenuId('OpenProfile')));
+const ProfilesMenu = ( (new MenuId('Profiles')));
 let UserDataProfilesWorkbenchContribution = class UserDataProfilesWorkbenchContribution extends Disposable {
     static { this.ID = 'workbench.contrib.userDataProfiles'; }
     constructor(userDataProfileService, userDataProfilesService, userDataProfileManagementService, telemetryService, workspaceContextService, workspaceTagsService, contextKeyService, editorGroupsService, instantiationService, lifecycleService, urlService, environmentService) {
@@ -45,7 +46,6 @@ let UserDataProfilesWorkbenchContribution = class UserDataProfilesWorkbenchContr
         this.urlService = urlService;
         this.profilesDisposable = this._register(( (new MutableDisposable())));
         this.currentProfileContext = CURRENT_PROFILE_CONTEXT.bindTo(contextKeyService);
-        PROFILES_ENABLEMENT_CONTEXT.bindTo(contextKeyService).set(this.userDataProfilesService.isEnabled());
         this.isCurrentProfileTransientContext = IS_CURRENT_PROFILE_TRANSIENT_CONTEXT.bindTo(contextKeyService);
         this.currentProfileContext.set(this.userDataProfileService.currentProfile.id);
         this.isCurrentProfileTransientContext.set(!!this.userDataProfileService.currentProfile.isTransient);
@@ -82,12 +82,13 @@ let UserDataProfilesWorkbenchContribution = class UserDataProfilesWorkbenchContr
         return editor;
     }
     registerEditor() {
-        ( (Registry.as(EditorExtensions.EditorPane))).registerEditorPane(EditorPaneDescriptor.create(UserDataProfilesEditor, UserDataProfilesEditor.ID, ( localize(8916, "Profiles Editor"))), [
+        ( (Registry.as(EditorExtensions.EditorPane))).registerEditorPane(EditorPaneDescriptor.create(UserDataProfilesEditor, UserDataProfilesEditor.ID, ( localize(8970, "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.registerOpenProfileSubMenu();
@@ -100,9 +101,32 @@ let UserDataProfilesWorkbenchContribution = class UserDataProfilesWorkbenchContr
         this.registerDeleteProfileAction();
         this.registerHelpAction();
     }
+    registerProfileSubMenu() {
+        const getProfilesTitle = () => {
+            return ( localize(8971, "Profile ({0})", this.userDataProfileService.currentProfile.name));
+        };
+        MenuRegistry.appendMenuItem(MenuId.GlobalActivity, {
+            get title() {
+                return getProfilesTitle();
+            },
+            submenu: ProfilesMenu,
+            group: '2_configuration',
+            order: 1,
+            when: HAS_PROFILES_CONTEXT
+        });
+        MenuRegistry.appendMenuItem(MenuId.MenubarPreferencesMenu, {
+            get title() {
+                return getProfilesTitle();
+            },
+            submenu: ProfilesMenu,
+            group: '2_configuration',
+            order: 1,
+            when: HAS_PROFILES_CONTEXT
+        });
+    }
     registerOpenProfileSubMenu() {
         MenuRegistry.appendMenuItem(MenuId.MenubarFileMenu, {
-            title: ( localize(8917, "New Window with Profile")),
+            title: ( localize(8972, "New Window with Profile")),
             submenu: OpenProfileMenu,
             group: '1_new',
             order: 4,
@@ -112,16 +136,43 @@ let UserDataProfilesWorkbenchContribution = class UserDataProfilesWorkbenchContr
         this.profilesDisposable.value = ( (new DisposableStore()));
         for (const profile of this.userDataProfilesService.profiles) {
             if (!profile.isTransient) {
+                this.profilesDisposable.value.add(this.registerProfileEntryAction(profile));
                 this.profilesDisposable.value.add(this.registerNewWindowAction(profile));
             }
         }
     }
+    registerProfileEntryAction(profile) {
+        const that = this;
+        return registerAction2(class ProfileEntryAction extends Action2 {
+            constructor() {
+                super({
+                    id: `workbench.profiles.actions.profileEntry.${profile.id}`,
+                    title: profile.name,
+                    metadata: {
+                        description: ( localize2(8973, "Switch to {0} profile", profile.name)),
+                    },
+                    toggled: ( (ContextKeyExpr.equals(CURRENT_PROFILE_CONTEXT.key, profile.id))),
+                    menu: [
+                        {
+                            id: ProfilesMenu,
+                            group: '0_profiles',
+                        }
+                    ]
+                });
+            }
+            async run(accessor) {
+                if (that.userDataProfileService.currentProfile.id !== profile.id) {
+                    return that.userDataProfileManagementService.switchProfile(profile);
+                }
+            }
+        });
+    }
     registerNewWindowWithProfileAction() {
         return registerAction2(class NewWindowWithProfileAction extends Action2 {
             constructor() {
                 super({
                     id: `workbench.profiles.actions.newWindowWithProfile`,
-                    title: ( localize2(8918, "New Window with Profile...")),
+                    title: ( localize2(8974, "New Window with Profile...")),
                     category: PROFILES_CATEGORY,
                     precondition: HAS_PROFILES_CONTEXT,
                     f1: true,
@@ -135,8 +186,8 @@ let UserDataProfilesWorkbenchContribution = class UserDataProfilesWorkbenchContr
                     label: profile.name,
                     profile
                 })))), {
-                    title: ( localize(8919, "New Window with Profile")),
-                    placeHolder: ( localize(8920, "Select Profile")),
+                    title: ( localize(8975, "New Window with Profile")),
+                    placeHolder: ( localize(8976, "Select Profile")),
                     canPickMany: false
                 });
                 if (pick) {
@@ -152,7 +203,10 @@ let UserDataProfilesWorkbenchContribution = class UserDataProfilesWorkbenchContr
             constructor() {
                 super({
                     id,
-                    title: ( localize2(8921, "{0}", profile.name)),
+                    title: ( localize2(8977, "{0}", profile.name)),
+                    metadata: {
+                        description: ( localize2(8978, "Open New Window with {0} Profile", profile.name)),
+                    },
                     menu: {
                         id: OpenProfileMenu,
                         group: '0_profiles',
@@ -169,7 +223,7 @@ let UserDataProfilesWorkbenchContribution = class UserDataProfilesWorkbenchContr
             command: {
                 id,
                 category: PROFILES_CATEGORY,
-                title: ( localize2(8922, "Open {0} Profile", profile.name)),
+                title: ( localize2(8979, "Open {0} Profile", profile.name)),
                 precondition: HAS_PROFILES_CONTEXT
             },
         }));
@@ -181,10 +235,9 @@ let UserDataProfilesWorkbenchContribution = class UserDataProfilesWorkbenchContr
             constructor() {
                 super({
                     id: `workbench.profiles.actions.switchProfile`,
-                    title: ( localize2(8923, 'Switch Profile...')),
+                    title: ( localize2(8980, 'Switch Profile...')),
                     category: PROFILES_CATEGORY,
                     f1: true,
-                    precondition: PROFILES_ENABLEMENT_CONTEXT,
                 });
             }
             async run(accessor) {
@@ -198,7 +251,7 @@ let UserDataProfilesWorkbenchContribution = class UserDataProfilesWorkbenchContr
                     });
                 }
                 const result = await quickInputService.pick(items.sort((a, b) => a.profile.name.localeCompare(b.profile.name)), {
-                    placeHolder: ( localize(8924, "Select Profile"))
+                    placeHolder: ( localize(8981, "Select Profile"))
                 });
                 if (result) {
                     await that.userDataProfileManagementService.switchProfile(result.profile);
@@ -213,19 +266,26 @@ let UserDataProfilesWorkbenchContribution = class UserDataProfilesWorkbenchContr
                 super({
                     id: `workbench.profiles.actions.manageProfiles`,
                     title: {
-                        ...( localize2(8925, "Profiles")),
-                        mnemonicTitle: ( localize(8926, "&&Profiles")),
+                        ...( localize2(8982, "Profiles")),
+                        mnemonicTitle: ( localize(8983, "&&Profiles")),
                     },
                     menu: [
                         {
                             id: MenuId.GlobalActivity,
                             group: '2_configuration',
                             order: 1,
+                            when: ( (HAS_PROFILES_CONTEXT.negate()))
                         },
                         {
                             id: MenuId.MenubarPreferencesMenu,
                             group: '2_configuration',
                             order: 1,
+                            when: ( (HAS_PROFILES_CONTEXT.negate()))
+                        },
+                        {
+                            id: ProfilesMenu,
+                            group: '1_manage',
+                            order: 1,
                         },
                     ]
                 });
@@ -240,7 +300,7 @@ let UserDataProfilesWorkbenchContribution = class UserDataProfilesWorkbenchContr
             command: {
                 id: 'workbench.profiles.actions.manageProfiles',
                 category: Categories.Preferences,
-                title: ( localize2(8927, "Open Profiles (UI)")),
+                title: ( localize2(8984, "Open Profiles (UI)")),
             },
         }));
         return disposables;
@@ -253,7 +313,7 @@ let UserDataProfilesWorkbenchContribution = class UserDataProfilesWorkbenchContr
             constructor() {
                 super({
                     id,
-                    title: ( localize2(8928, "Export Profile...")),
+                    title: ( localize2(8985, "Export Profile...")),
                     category: PROFILES_CATEGORY,
                     f1: true,
                 });
@@ -267,11 +327,10 @@ let UserDataProfilesWorkbenchContribution = class UserDataProfilesWorkbenchContr
             command: {
                 id,
                 title: ( localize2(
-                    8929,
+                    8986,
                     "Export Profile ({0})...",
                     that.userDataProfileService.currentProfile.name
                 )),
-                precondition: PROFILES_ENABLEMENT_CONTEXT,
             },
         }));
         return disposables;
@@ -282,10 +341,9 @@ let UserDataProfilesWorkbenchContribution = class UserDataProfilesWorkbenchContr
             constructor() {
                 super({
                     id: 'workbench.profiles.actions.createFromCurrentProfile',
-                    title: ( localize2(8930, "Save Current Profile As...")),
+                    title: ( localize2(8987, "Save Current Profile As...")),
                     category: PROFILES_CATEGORY,
                     f1: true,
-                    precondition: PROFILES_ENABLEMENT_CONTEXT
                 });
             }
             async run() {
@@ -300,9 +358,8 @@ let UserDataProfilesWorkbenchContribution = class UserDataProfilesWorkbenchContr
             constructor() {
                 super({
                     id: 'workbench.profiles.actions.createProfile',
-                    title: ( localize2(8931, "New Profile...")),
+                    title: ( localize2(8988, "New Profile...")),
                     category: PROFILES_CATEGORY,
-                    precondition: PROFILES_ENABLEMENT_CONTEXT,
                     f1: true,
                     menu: [
                         {
@@ -324,10 +381,10 @@ let UserDataProfilesWorkbenchContribution = class UserDataProfilesWorkbenchContr
             constructor() {
                 super({
                     id: 'workbench.profiles.actions.deleteProfile',
-                    title: ( localize2(8932, "Delete Profile...")),
+                    title: ( localize2(8989, "Delete Profile...")),
                     category: PROFILES_CATEGORY,
                     f1: true,
-                    precondition: ( (ContextKeyExpr.and(PROFILES_ENABLEMENT_CONTEXT, HAS_PROFILES_CONTEXT))),
+                    precondition: HAS_PROFILES_CONTEXT,
                 });
             }
             async run(accessor) {
@@ -340,11 +397,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 ? ( localize(8933, "Current")) : undefined,
+                        description: profile.id === userDataProfileService.currentProfile.id ? ( localize(8990, "Current")) : undefined,
                         profile
                     })))), {
-                        title: ( localize(8934, "Delete Profile...")),
-                        placeHolder: ( localize(8935, "Select Profiles to Delete")),
+                        title: ( localize(8991, "Delete Profile...")),
+                        placeHolder: ( localize(8992, "Select Profiles to Delete")),
                         canPickMany: true
                     });
                     if (picks) {

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

@@ -2,19 +2,18 @@ import { localize2 } from 'vscode/vscode/vs/nls';
 import { Categories } from 'vscode/vscode/vs/platform/action/common/actionCommonCategories';
 import { Action2, registerAction2 } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { IUserDataProfilesService } from 'vscode/vscode/vs/platform/userDataProfile/common/userDataProfile.service';
-import { PROFILES_CATEGORY, PROFILES_ENABLEMENT_CONTEXT } from 'vscode/vscode/vs/workbench/services/userDataProfile/common/userDataProfile';
+import { PROFILES_CATEGORY } from 'vscode/vscode/vs/workbench/services/userDataProfile/common/userDataProfile';
 import { IUserDataProfileManagementService } from 'vscode/vscode/vs/workbench/services/userDataProfile/common/userDataProfile.service';
 
 class CreateTransientProfileAction extends Action2 {
     static { this.ID = 'workbench.profiles.actions.createTemporaryProfile'; }
-    static { this.TITLE = ( localize2(8936, "Create a Temporary Profile")); }
+    static { this.TITLE = ( localize2(8993, "Create a Temporary Profile")); }
     constructor() {
         super({
             id: CreateTransientProfileAction.ID,
             title: CreateTransientProfileAction.TITLE,
             category: PROFILES_CATEGORY,
             f1: true,
-            precondition: PROFILES_ENABLEMENT_CONTEXT,
         });
     }
     async run(accessor) {
@@ -26,10 +25,9 @@ registerAction2(class CleanupProfilesAction extends Action2 {
     constructor() {
         super({
             id: 'workbench.profiles.actions.cleanupProfiles',
-            title: ( localize2(8937, "Cleanup Profiles")),
+            title: ( localize2(8994, "Cleanup Profiles")),
             category: Categories.Developer,
             f1: true,
-            precondition: PROFILES_ENABLEMENT_CONTEXT,
         });
     }
     async run(accessor) {
@@ -40,10 +38,9 @@ registerAction2(class ResetWorkspacesAction extends Action2 {
     constructor() {
         super({
             id: 'workbench.profiles.actions.resetWorkspaces',
-            title: ( localize2(8938, "Reset Workspace Profiles Associations")),
+            title: ( localize2(8995, "Reset Workspace Profiles Associations")),
             category: Categories.Developer,
             f1: true,
-            precondition: PROFILES_ENABLEMENT_CONTEXT,
         });
     }
     async run(accessor) {