@codingame/monaco-vscode-user-data-sync-service-override 10.1.4 → 11.0.1

package/package.json

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

package/vscode/src/vs/platform/userDataSync/common/userDataAutoSyncService.js

@@ -407,20 +407,20 @@ class AutoSync extends Disposable {
             if (this.hasSyncServiceChanged()) {
                 if (await this.hasDefaultServiceChanged()) {
                     throw ( new UserDataAutoSyncError(
-                        localize(3497, "Cannot sync because default service has changed"),
+                        localize(3496, "Cannot sync because default service has changed"),
                         "DefaultServiceChanged"
                     ));
                 }
                 else {
                     throw ( new UserDataAutoSyncError(
-                        localize(3498, "Cannot sync because sync service has changed"),
+                        localize(3497, "Cannot sync because sync service has changed"),
                         "ServiceChanged"
                     ));
                 }
             }
             else {
                 throw ( new UserDataAutoSyncError(
-                    localize(3499, "Cannot sync because syncing is turned off in the cloud"),
+                    localize(3498, "Cannot sync because syncing is turned off in the cloud"),
                     "TurnedOff"
                 ));
             }
@@ -430,20 +430,20 @@ class AutoSync extends Disposable {
             if (this.hasSyncServiceChanged()) {
                 if (await this.hasDefaultServiceChanged()) {
                     throw ( new UserDataAutoSyncError(
-                        localize(3497, "Cannot sync because default service has changed"),
+                        localize(3496, "Cannot sync because default service has changed"),
                         "DefaultServiceChanged"
                     ));
                 }
                 else {
                     throw ( new UserDataAutoSyncError(
-                        localize(3498, "Cannot sync because sync service has changed"),
+                        localize(3497, "Cannot sync because sync service has changed"),
                         "ServiceChanged"
                     ));
                 }
             }
             else {
                 throw ( new UserDataAutoSyncError(
-                    localize(3500, "Cannot sync because current session is expired"),
+                    localize(3499, "Cannot sync because current session is expired"),
                     "SessionExpired"
                 ));
             }
@@ -455,7 +455,7 @@ class AutoSync extends Disposable {
         const currentMachine = machines.find(machine => machine.isCurrent);
         if (currentMachine?.disabled) {
             throw ( new UserDataAutoSyncError(localize(
-                3501,
+                3500,
                 "Cannot sync because syncing is turned off on this machine from another machine."
             ), "TurnedOff" ));
         }

package/vscode/src/vs/platform/userDataSync/common/userDataProfilesManifestMerge.js

@@ -73,14 +73,13 @@ function compare(from, to, ignoredProfiles) {
     const added = toKeys.filter(key => !fromKeys.includes(key));
     const removed = fromKeys.filter(key => !toKeys.includes(key));
     const updated = [];
-    for (const { id, name, shortName, icon, useDefaultFlags } of from) {
+    for (const { id, name, icon, useDefaultFlags } of from) {
         if (removed.includes(id)) {
             continue;
         }
         const toProfile = to.find(p => p.id === id);
         if (!toProfile
             || toProfile.name !== name
-            || toProfile.shortName !== shortName
             || toProfile.icon !== icon
             || !equals(toProfile.useDefaultFlags, useDefaultFlags)) {
             updated.push(id);

package/vscode/src/vs/platform/userDataSync/common/userDataProfilesManifestSync.js

@@ -34,12 +34,6 @@ let UserDataProfilesManifestSynchroniser = class UserDataProfilesManifestSynchro
         return remoteUserData?.syncData ? parseUserDataProfilesManifest(remoteUserData.syncData) : null;
     }
     async generateSyncPreview(remoteUserData, lastSyncUserData, isRemoteDataFromCurrentMachine) {
-        if (!this.userDataProfilesService.isEnabled()) {
-            throw ( new UserDataSyncError(
-                'Cannot sync profiles because they are disabled',
-                "LocalError"
-            ));
-        }
         const remoteProfiles = remoteUserData.syncData ? parseUserDataProfilesManifest(remoteUserData.syncData) : null;
         const lastSyncProfiles = lastSyncUserData?.syncData ? parseUserDataProfilesManifest(lastSyncUserData.syncData) : null;
         const localProfiles = this.getLocalUserDataProfiles();
@@ -152,14 +146,14 @@ let UserDataProfilesManifestSynchroniser = class UserDataProfilesManifestSynchro
             })));
             await Promise.all(( local.added.map(async (profile) => {
                 this.logService.trace(`${this.syncResourceLogLabel}: Creating '${profile.name}' profile...`);
-                await this.userDataProfilesService.createProfile(profile.id, profile.name, { shortName: profile.shortName, icon: profile.icon, useDefaultFlags: profile.useDefaultFlags });
+                await this.userDataProfilesService.createProfile(profile.id, profile.name, { icon: profile.icon, useDefaultFlags: profile.useDefaultFlags });
                 this.logService.info(`${this.syncResourceLogLabel}: Created profile '${profile.name}'.`);
             })));
             await Promise.all(( local.updated.map(async (profile) => {
                 const localProfile = this.userDataProfilesService.profiles.find(p => p.id === profile.id);
                 if (localProfile) {
                     this.logService.trace(`${this.syncResourceLogLabel}: Updating '${profile.name}' profile...`);
-                    await this.userDataProfilesService.updateProfile(localProfile, { name: profile.name, shortName: profile.shortName, icon: profile.icon, useDefaultFlags: profile.useDefaultFlags });
+                    await this.userDataProfilesService.updateProfile(localProfile, { name: profile.name, icon: profile.icon, useDefaultFlags: profile.useDefaultFlags });
                     this.logService.info(`${this.syncResourceLogLabel}: Updated profile '${profile.name}'.`);
                 }
                 else {
@@ -175,7 +169,7 @@ let UserDataProfilesManifestSynchroniser = class UserDataProfilesManifestSynchro
                 for (const profile of remote?.added || []) {
                     const collection = await this.userDataSyncStoreService.createCollection(this.syncHeaders);
                     addedCollections.push(collection);
-                    remoteProfiles.push({ id: profile.id, name: profile.name, collection, shortName: profile.shortName, icon: profile.icon, useDefaultFlags: profile.useDefaultFlags });
+                    remoteProfiles.push({ id: profile.id, name: profile.name, collection, icon: profile.icon, useDefaultFlags: profile.useDefaultFlags });
                 }
             }
             else {
@@ -187,7 +181,7 @@ let UserDataProfilesManifestSynchroniser = class UserDataProfilesManifestSynchro
             for (const profile of remote?.updated || []) {
                 const profileToBeUpdated = remoteProfiles.find(({ id }) => profile.id === id);
                 if (profileToBeUpdated) {
-                    remoteProfiles.splice(remoteProfiles.indexOf(profileToBeUpdated), 1, { ...profileToBeUpdated, id: profile.id, name: profile.name, shortName: profile.shortName, icon: profile.icon, useDefaultFlags: profile.useDefaultFlags });
+                    remoteProfiles.splice(remoteProfiles.indexOf(profileToBeUpdated), 1, { ...profileToBeUpdated, id: profile.id, name: profile.name, icon: profile.icon, useDefaultFlags: profile.useDefaultFlags });
                 }
             }
             try {

package/vscode/src/vs/platform/userDataSync/common/userDataSyncLog.js

@@ -9,7 +9,7 @@ import { USER_DATA_SYNC_LOG_ID } from 'vscode/vscode/vs/platform/userDataSync/co
 let UserDataSyncLogService = class UserDataSyncLogService extends AbstractLogger {
     constructor(loggerService, environmentService) {
         super();
-        this.logger = this._register(loggerService.createLogger(joinPath(environmentService.logsHome, `${USER_DATA_SYNC_LOG_ID}.log`), { id: USER_DATA_SYNC_LOG_ID, name: ( localize(3502, "Settings Sync")) }));
+        this.logger = this._register(loggerService.createLogger(joinPath(environmentService.logsHome, `${USER_DATA_SYNC_LOG_ID}.log`), { id: USER_DATA_SYNC_LOG_ID, name: ( localize(3501, "Settings Sync")) }));
     }
     trace(message, ...args) {
         this.logger.trace(message, ...args);

package/vscode/src/vs/platform/userDataSync/common/userDataSyncResourceProvider.js

@@ -10,13 +10,13 @@ import { CONFIG_SYNC_KEYBINDINGS_PER_PLATFORM, USER_DATA_SYNC_SCHEME, UserDataSy
 import { IUserDataSyncStoreService, IUserDataSyncLocalStoreService, IUserDataSyncLogService } from 'vscode/vscode/vs/platform/userDataSync/common/userDataSync.service';
 import { IUserDataProfilesService } from 'vscode/vscode/vs/platform/userDataProfile/common/userDataProfile.service';
 import { isSyncData } from 'vscode/vscode/vs/platform/userDataSync/common/abstractSynchronizer';
-import { parseSnippets } from '@codingame/monaco-vscode-user-data-profile-service-override/vscode/vs/platform/userDataSync/common/snippetsSync';
-import { parseSettingsSyncContent } from '@codingame/monaco-vscode-user-data-profile-service-override/vscode/vs/platform/userDataSync/common/settingsSync';
-import { getKeybindingsContentFromSyncContent } from '@codingame/monaco-vscode-user-data-profile-service-override/vscode/vs/platform/userDataSync/common/keybindingsSync';
+import { parseSnippets } from '@codingame/monaco-vscode-user-data-profile-user-data-sync-common/vscode/vs/platform/userDataSync/common/snippetsSync';
+import { parseSettingsSyncContent } from '@codingame/monaco-vscode-user-data-profile-user-data-sync-common/vscode/vs/platform/userDataSync/common/settingsSync';
+import { getKeybindingsContentFromSyncContent } from '@codingame/monaco-vscode-user-data-profile-user-data-sync-common/vscode/vs/platform/userDataSync/common/keybindingsSync';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
-import { getTasksContentFromSyncContent } from '@codingame/monaco-vscode-user-data-profile-service-override/vscode/vs/platform/userDataSync/common/tasksSync';
-import { stringify, parseExtensions, LocalExtensionsProvider } from '@codingame/monaco-vscode-user-data-profile-service-override/vscode/vs/platform/userDataSync/common/extensionsSync';
-import { stringify as stringify$1, LocalGlobalStateProvider } from '@codingame/monaco-vscode-user-data-profile-service-override/vscode/vs/platform/userDataSync/common/globalStateSync';
+import { getTasksContentFromSyncContent } from '@codingame/monaco-vscode-user-data-profile-user-data-sync-common/vscode/vs/platform/userDataSync/common/tasksSync';
+import { stringify, parseExtensions, LocalExtensionsProvider } from '@codingame/monaco-vscode-user-data-profile-user-data-sync-common/vscode/vs/platform/userDataSync/common/extensionsSync';
+import { stringify as stringify$1, LocalGlobalStateProvider } from '@codingame/monaco-vscode-user-data-profile-user-data-sync-common/vscode/vs/platform/userDataSync/common/globalStateSync';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { parseUserDataProfilesManifest, stringifyLocalProfiles } from './userDataProfilesManifestSync.js';
 import { toFormattedString } from 'vscode/vscode/vs/base/common/jsonFormatter';
@@ -428,7 +428,7 @@ let UserDataSyncResourceProviderService = class UserDataSyncResourceProviderServ
             this.logService.error(error);
         }
         throw ( new UserDataSyncError(localize(
-            3503,
+            3502,
             "Cannot parse sync data as it is not compatible with the current version."
         ), "IncompatibleRemoteContent" , syncResource));
     }

package/vscode/src/vs/platform/userDataSync/common/userDataSyncService.js

@@ -15,12 +15,12 @@ import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/c
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
 import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry.service';
 import { IUserDataProfilesService } from 'vscode/vscode/vs/platform/userDataProfile/common/userDataProfile.service';
-import { ExtensionsSynchroniser } from '@codingame/monaco-vscode-user-data-profile-service-override/vscode/vs/platform/userDataSync/common/extensionsSync';
-import { GlobalStateSynchroniser } from '@codingame/monaco-vscode-user-data-profile-service-override/vscode/vs/platform/userDataSync/common/globalStateSync';
-import { KeybindingsSynchroniser } from '@codingame/monaco-vscode-user-data-profile-service-override/vscode/vs/platform/userDataSync/common/keybindingsSync';
-import { SettingsSynchroniser } from '@codingame/monaco-vscode-user-data-profile-service-override/vscode/vs/platform/userDataSync/common/settingsSync';
-import { SnippetsSynchroniser } from '@codingame/monaco-vscode-user-data-profile-service-override/vscode/vs/platform/userDataSync/common/snippetsSync';
-import { TasksSynchroniser } from '@codingame/monaco-vscode-user-data-profile-service-override/vscode/vs/platform/userDataSync/common/tasksSync';
+import { ExtensionsSynchroniser } from '@codingame/monaco-vscode-user-data-profile-user-data-sync-common/vscode/vs/platform/userDataSync/common/extensionsSync';
+import { GlobalStateSynchroniser } from '@codingame/monaco-vscode-user-data-profile-user-data-sync-common/vscode/vs/platform/userDataSync/common/globalStateSync';
+import { KeybindingsSynchroniser } from '@codingame/monaco-vscode-user-data-profile-user-data-sync-common/vscode/vs/platform/userDataSync/common/keybindingsSync';
+import { SettingsSynchroniser } from '@codingame/monaco-vscode-user-data-profile-user-data-sync-common/vscode/vs/platform/userDataSync/common/settingsSync';
+import { SnippetsSynchroniser } from '@codingame/monaco-vscode-user-data-profile-user-data-sync-common/vscode/vs/platform/userDataSync/common/snippetsSync';
+import { TasksSynchroniser } from '@codingame/monaco-vscode-user-data-profile-user-data-sync-common/vscode/vs/platform/userDataSync/common/tasksSync';
 import { UserDataProfilesManifestSynchroniser } from './userDataProfilesManifestSync.js';
 import { createSyncHeaders, UserDataSyncError, ALL_SYNC_RESOURCES, USER_DATA_SYNC_CONFIGURATION_SCOPE, UserDataSyncStoreError } from 'vscode/vscode/vs/platform/userDataSync/common/userDataSync';
 import { IUserDataSyncStoreService, IUserDataSyncStoreManagementService, IUserDataSyncLogService, IUserDataSyncEnablementService, IUserDataSyncResourceProviderService, IUserDataSyncLocalStoreService } from 'vscode/vscode/vs/platform/userDataSync/common/userDataSync.service';
@@ -208,25 +208,31 @@ let UserDataSyncService = class UserDataSyncService extends Disposable {
         }
     }
     async applyManualSync(manifest, executionId, token) {
-        const profileSynchronizers = this.getActiveProfileSynchronizers();
-        for (const profileSynchronizer of profileSynchronizers) {
-            if (token.isCancellationRequested) {
+        try {
+            this.setStatus("syncing" );
+            const profileSynchronizers = this.getActiveProfileSynchronizers();
+            for (const profileSynchronizer of profileSynchronizers) {
+                if (token.isCancellationRequested) {
+                    return;
+                }
+                await profileSynchronizer.apply(executionId, token);
+            }
+            const defaultProfileSynchronizer = profileSynchronizers.find(s => s.profile.isDefault);
+            if (!defaultProfileSynchronizer) {
                 return;
             }
-            await profileSynchronizer.apply(executionId, token);
-        }
-        const defaultProfileSynchronizer = profileSynchronizers.find(s => s.profile.isDefault);
-        if (!defaultProfileSynchronizer) {
-            return;
-        }
-        const userDataProfileManifestSynchronizer = defaultProfileSynchronizer.enabled.find(s => s.resource === "profiles" );
-        if (!userDataProfileManifestSynchronizer) {
-            return;
+            const userDataProfileManifestSynchronizer = defaultProfileSynchronizer.enabled.find(s => s.resource === "profiles" );
+            if (!userDataProfileManifestSynchronizer) {
+                return;
+            }
+            const remoteProfiles = (await userDataProfileManifestSynchronizer.getRemoteSyncedProfiles(manifest?.latest ?? null)) || [];
+            const remoteProfilesToSync = remoteProfiles.filter(remoteProfile => profileSynchronizers.every(s => s.profile.id !== remoteProfile.id));
+            if (remoteProfilesToSync.length) {
+                await this.syncRemoteProfiles(remoteProfilesToSync, manifest, false, executionId, token);
+            }
         }
-        const remoteProfiles = (await userDataProfileManifestSynchronizer.getRemoteSyncedProfiles(manifest?.latest ?? null)) || [];
-        const remoteProfilesToSync = remoteProfiles.filter(remoteProfile => profileSynchronizers.every(s => s.profile.id !== remoteProfile.id));
-        if (remoteProfilesToSync.length) {
-            await this.syncRemoteProfiles(remoteProfilesToSync, manifest, false, executionId, token);
+        finally {
+            this.setStatus("idle" );
         }
     }
     async syncProfile(profileSynchronizer, manifest, merge, executionId, token) {
@@ -441,9 +447,6 @@ let UserDataSyncService = class UserDataSyncService extends Disposable {
                 const result = await this.performActionWithProfileSynchronizer(defaultProfileSynchronizer, action, disposables);
                 return isUndefined(result) ? null : result;
             }
-            if (this.userDataProfilesService.isEnabled()) {
-                return null;
-            }
             const userDataProfileManifestSynchronizer = disposables.add(this.instantiationService.createInstance(UserDataProfilesManifestSynchroniser, profile, undefined));
             const manifest = await this.userDataSyncStoreService.manifest(null);
             const syncProfiles = (await userDataProfileManifestSynchronizer.getRemoteSyncedProfiles(manifest?.latest ?? null)) || [];
@@ -551,7 +554,7 @@ let ProfileSynchronizer = class ProfileSynchronizer extends Disposable {
     get disabled() { return ALL_SYNC_RESOURCES.filter(syncResource => !this.userDataSyncEnablementService.isResourceEnabled(syncResource)); }
     get status() { return this._status; }
     get conflicts() { return this._conflicts; }
-    constructor(profile, collection, userDataSyncEnablementService, instantiationService, extensionGalleryService, userDataSyncStoreManagementService, telemetryService, logService, userDataProfilesService, configurationService) {
+    constructor(profile, collection, userDataSyncEnablementService, instantiationService, extensionGalleryService, userDataSyncStoreManagementService, telemetryService, logService, configurationService) {
         super();
         this.profile = profile;
         this.collection = collection;
@@ -561,7 +564,6 @@ let ProfileSynchronizer = class ProfileSynchronizer extends Disposable {
         this.userDataSyncStoreManagementService = userDataSyncStoreManagementService;
         this.telemetryService = telemetryService;
         this.logService = logService;
-        this.userDataProfilesService = userDataProfilesService;
         this.configurationService = configurationService;
         this._enabled = [];
         this._status = "idle" ;
@@ -600,9 +602,6 @@ let ProfileSynchronizer = class ProfileSynchronizer extends Disposable {
             if (!this.profile.isDefault) {
                 return;
             }
-            if (!this.userDataProfilesService.isEnabled()) {
-                return;
-            }
         }
         if (syncResource === "workspaceState" ) {
             return;
@@ -791,8 +790,7 @@ ProfileSynchronizer = ( __decorate([
     ( __param(5, IUserDataSyncStoreManagementService)),
     ( __param(6, ITelemetryService)),
     ( __param(7, IUserDataSyncLogService)),
-    ( __param(8, IUserDataProfilesService)),
-    ( __param(9, IConfigurationService))
+    ( __param(8, IConfigurationService))
 ], ProfileSynchronizer));
 function canBailout(e) {
     if (e instanceof UserDataSyncError) {

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

@@ -29,12 +29,12 @@ let UserDataSyncReportIssueContribution = class UserDataSyncReportIssueContribut
         switch (error.code) {
             case "LocalTooManyRequests" : {
                 const message = isWeb ? ( localize(
-                    3529,
+                    3528,
                     "Settings sync is suspended temporarily because the current device is making too many requests. Please reload {0} to resume.",
                     this.productService.nameLong
                 ))
                     : ( localize(
-                    3530,
+                    3529,
                     "Settings sync is suspended temporarily because the current device is making too many requests. Please restart {0} to resume.",
                     this.productService.nameLong
                 ));
@@ -43,26 +43,26 @@ let UserDataSyncReportIssueContribution = class UserDataSyncReportIssueContribut
                     message,
                     actions: {
                         primary: [
-                            ( (new Action('Show Sync Logs', ( localize(3531, "Show Log")), undefined, true, () => this.commandService.executeCommand(SHOW_SYNC_LOG_COMMAND_ID)))),
-                            ( (new Action('Restart', isWeb ? ( localize(3532, "Reload")) : ( localize(3533, "Restart")), undefined, true, () => this.hostService.restart())))
+                            ( (new Action('Show Sync Logs', ( localize(3530, "Show Log")), undefined, true, () => this.commandService.executeCommand(SHOW_SYNC_LOG_COMMAND_ID)))),
+                            ( (new Action('Restart', isWeb ? ( localize(3531, "Reload")) : ( localize(3532, "Restart")), undefined, true, () => this.hostService.restart())))
                         ]
                     }
                 });
                 return;
             }
             case "RemoteTooManyRequests" : {
-                const operationId = error.operationId ? ( localize(3534, "Operation Id: {0}", error.operationId)) : undefined;
+                const operationId = error.operationId ? ( localize(3533, "Operation Id: {0}", error.operationId)) : undefined;
                 const message = ( localize(
-                    3535,
+                    3534,
                     "Settings sync is disabled because the current device is making too many requests. Please wait for 10 minutes and turn on sync."
                 ));
                 this.notificationService.notify({
                     severity: Severity$1.Error,
                     message: operationId ? `${message} ${operationId}` : message,
-                    source: error.operationId ? ( localize(3536, "Settings Sync. Operation Id: {0}", error.operationId)) : undefined,
+                    source: error.operationId ? ( localize(3535, "Settings Sync. Operation Id: {0}", error.operationId)) : undefined,
                     actions: {
                         primary: [
-                            ( (new Action('Show Sync Logs', ( localize(3531, "Show Log")), undefined, true, () => this.commandService.executeCommand(SHOW_SYNC_LOG_COMMAND_ID)))),
+                            ( (new Action('Show Sync Logs', ( localize(3530, "Show Log")), undefined, true, () => this.commandService.executeCommand(SHOW_SYNC_LOG_COMMAND_ID)))),
                         ]
                     }
                 });