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

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

@@ -2,10 +2,12 @@ import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { VSBuffer } from 'vscode/vscode/vs/base/common/buffer';
 import { Event } from 'vscode/vscode/vs/base/common/event';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { ConfigurationTarget } from 'vscode/vscode/vs/platform/configuration/common/configuration';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { ConfigurationModelParser } from 'vscode/vscode/vs/platform/configuration/common/configurationModels';
 import { IEnvironmentService } from 'vscode/vscode/vs/platform/environment/common/environment.service';
 import { IExtensionManagementService } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagement.service';
+import { FileOperationResult } from 'vscode/vscode/vs/platform/files/common/files';
 import { IFileService } from 'vscode/vscode/vs/platform/files/common/files.service';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
 import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry.service';
@@ -13,7 +15,7 @@ import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/commo
 import { IUserDataProfilesService } from 'vscode/vscode/vs/platform/userDataProfile/common/userDataProfile.service';
 import { AbstractJsonFileSynchroniser, AbstractInitializer } from 'vscode/vscode/vs/platform/userDataSync/common/abstractSynchronizer';
 import { merge, updateIgnoredSettings, isEmpty, getIgnoredSettings } from 'vscode/vscode/vs/platform/userDataSync/common/settingsMerge';
-import { USER_DATA_SYNC_SCHEME, USER_DATA_SYNC_CONFIGURATION_SCOPE, UserDataSyncError } from 'vscode/vscode/vs/platform/userDataSync/common/userDataSync';
+import { SyncResource, USER_DATA_SYNC_SCHEME, USER_DATA_SYNC_CONFIGURATION_SCOPE, Change, UserDataSyncError, UserDataSyncErrorCode } from 'vscode/vscode/vs/platform/userDataSync/common/userDataSync';
 import { IUserDataSyncStoreService, IUserDataSyncLocalStoreService, IUserDataSyncLogService, IUserDataSyncUtilService, IUserDataSyncEnablementService } from 'vscode/vscode/vs/platform/userDataSync/common/userDataSync.service';
 
 const _moduleId = "vs/platform/userDataSync/common/settingsSync";
@@ -28,7 +30,7 @@ function parseSettingsSyncContent(syncContent) {
 }
 let SettingsSynchroniser = class SettingsSynchroniser extends AbstractJsonFileSynchroniser {
     constructor(profile, collection, fileService, environmentService, storageService, userDataSyncStoreService, userDataSyncLocalStoreService, logService, userDataSyncUtilService, configurationService, userDataSyncEnablementService, telemetryService, extensionManagementService, uriIdentityService) {
-        super(profile.settingsResource, { syncResource: "settings" , profile }, collection, fileService, environmentService, storageService, userDataSyncStoreService, userDataSyncLocalStoreService, userDataSyncEnablementService, telemetryService, logService, userDataSyncUtilService, configurationService, uriIdentityService);
+        super(profile.settingsResource, { syncResource: SyncResource.Settings, profile }, collection, fileService, environmentService, storageService, userDataSyncStoreService, userDataSyncLocalStoreService, userDataSyncEnablementService, telemetryService, logService, userDataSyncUtilService, configurationService, uriIdentityService);
         this.extensionManagementService = extensionManagementService;
         this.version = 2;
         this.previewResource = this.extUri.joinPath(this.syncPreviewFolder, 'settings.json');
@@ -80,8 +82,8 @@ let SettingsSynchroniser = class SettingsSynchroniser extends AbstractJsonFileSy
         const baseContent = lastSettingsSyncContent?.settings ?? null;
         const previewResult = {
             content: hasConflicts ? baseContent : mergedContent,
-            localChange: hasLocalChanged ? 2  : 0 ,
-            remoteChange: hasRemoteChanged ? 2  : 0 ,
+            localChange: hasLocalChanged ? Change.Modified : Change.None,
+            remoteChange: hasRemoteChanged ? Change.Modified : Change.None,
             hasConflicts
         };
         return [{
@@ -125,15 +127,15 @@ let SettingsSynchroniser = class SettingsSynchroniser extends AbstractJsonFileSy
         if (this.extUri.isEqual(resource, this.localResource)) {
             return {
                 content: resourcePreview.fileContent ? updateIgnoredSettings(( resourcePreview.fileContent.value.toString()), '{}', ignoredSettings, formattingOptions) : null,
-                localChange: 0 ,
-                remoteChange: 2 ,
+                localChange: Change.None,
+                remoteChange: Change.Modified,
             };
         }
         if (this.extUri.isEqual(resource, this.remoteResource)) {
             return {
                 content: resourcePreview.remoteContent !== null ? updateIgnoredSettings(resourcePreview.remoteContent, resourcePreview.fileContent ? ( resourcePreview.fileContent.value.toString()) : '{}', ignoredSettings, formattingOptions) : null,
-                localChange: 2 ,
-                remoteChange: 0 ,
+                localChange: Change.Modified,
+                remoteChange: Change.None,
             };
         }
         if (this.extUri.isEqual(resource, this.previewResource)) {
@@ -147,8 +149,8 @@ let SettingsSynchroniser = class SettingsSynchroniser extends AbstractJsonFileSy
             else {
                 return {
                     content: content !== null ? updateIgnoredSettings(content, resourcePreview.fileContent ? ( resourcePreview.fileContent.value.toString()) : '{}', ignoredSettings, formattingOptions) : null,
-                    localChange: 2 ,
-                    remoteChange: 2 ,
+                    localChange: Change.Modified,
+                    remoteChange: Change.Modified,
                 };
             }
         }
@@ -157,22 +159,22 @@ let SettingsSynchroniser = class SettingsSynchroniser extends AbstractJsonFileSy
     async applyResult(remoteUserData, lastSyncUserData, resourcePreviews, force) {
         const { fileContent } = resourcePreviews[0][0];
         let { content, localChange, remoteChange } = resourcePreviews[0][1];
-        if (localChange === 0  && remoteChange === 0 ) {
+        if (localChange === Change.None && remoteChange === Change.None) {
             this.logService.info(`${this.syncResourceLogLabel}: No changes found during synchronizing settings.`);
         }
         content = content ? content.trim() : '{}';
         content = content || '{}';
         this.validateContent(content);
-        if (localChange !== 0 ) {
+        if (localChange !== Change.None) {
             this.logService.trace(`${this.syncResourceLogLabel}: Updating local settings...`);
             if (fileContent) {
                 await this.backupLocal(JSON.stringify(this.toSettingsSyncContent(( fileContent.value.toString()))));
             }
             await this.updateLocalFileContent(content, fileContent, force);
-            await this.configurationService.reloadConfiguration(3 );
+            await this.configurationService.reloadConfiguration(ConfigurationTarget.USER_LOCAL);
             this.logService.info(`${this.syncResourceLogLabel}: Updated local settings`);
         }
-        if (remoteChange !== 0 ) {
+        if (remoteChange !== Change.None) {
             const formatUtils = await this.getFormattingOptions();
             const remoteSettingsSyncContent = this.getSettingsSyncContent(remoteUserData);
             const ignoredSettings = await this.getIgnoredSettings(content);
@@ -199,7 +201,7 @@ let SettingsSynchroniser = class SettingsSynchroniser extends AbstractJsonFileSy
             }
         }
         catch (error) {
-            if (error.fileOperationResult !== 1 ) {
+            if (error.fileOperationResult !== FileOperationResult.FILE_NOT_FOUND) {
                 return true;
             }
         }
@@ -255,7 +257,7 @@ let SettingsSynchroniser = class SettingsSynchroniser extends AbstractJsonFileSy
                 _moduleId,
                 0,
                 "Unable to sync settings as there are errors/warning in settings file."
-            ), "LocalInvalidContent" , this.resource));
+            ), UserDataSyncErrorCode.LocalInvalidContent, this.resource));
         }
     }
 };
@@ -275,7 +277,7 @@ SettingsSynchroniser = ( __decorate([
 ], SettingsSynchroniser));
 let SettingsInitializer = class SettingsInitializer extends AbstractInitializer {
     constructor(fileService, userDataProfilesService, environmentService, logService, storageService, uriIdentityService) {
-        super("settings" , userDataProfilesService, environmentService, logService, fileService, storageService, uriIdentityService);
+        super(SyncResource.Settings, userDataProfilesService, environmentService, logService, fileService, storageService, uriIdentityService);
     }
     async doInitialize(remoteUserData) {
         const settingsSyncContent = remoteUserData.syncData ? this.parseSettingsSyncContent(remoteUserData.syncData.content) : null;
@@ -297,7 +299,7 @@ let SettingsInitializer = class SettingsInitializer extends AbstractInitializer
             return isEmpty(( fileContent.value.toString()).trim());
         }
         catch (error) {
-            return error.fileOperationResult === 1 ;
+            return error.fileOperationResult === FileOperationResult.FILE_NOT_FOUND;
         }
     }
     parseSettingsSyncContent(syncContent) {

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

@@ -4,7 +4,7 @@ import { Event } from 'vscode/vscode/vs/base/common/event';
 import { deepClone } from 'vscode/vscode/vs/base/common/objects';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { IEnvironmentService } from 'vscode/vscode/vs/platform/environment/common/environment.service';
-import { FileOperationError } from 'vscode/vscode/vs/platform/files/common/files';
+import { FileOperationError, FileOperationResult } from 'vscode/vscode/vs/platform/files/common/files';
 import { IFileService } from 'vscode/vscode/vs/platform/files/common/files.service';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
 import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry.service';
@@ -12,7 +12,7 @@ import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/commo
 import { IUserDataProfilesService } from 'vscode/vscode/vs/platform/userDataProfile/common/userDataProfile.service';
 import { AbstractSynchroniser, AbstractInitializer } from 'vscode/vscode/vs/platform/userDataSync/common/abstractSynchronizer';
 import { merge, areSame } from './snippetsMerge.js';
-import { USER_DATA_SYNC_SCHEME } from 'vscode/vscode/vs/platform/userDataSync/common/userDataSync';
+import { SyncResource, USER_DATA_SYNC_SCHEME, Change } from 'vscode/vscode/vs/platform/userDataSync/common/userDataSync';
 import { IUserDataSyncStoreService, IUserDataSyncLocalStoreService, IUserDataSyncLogService, IUserDataSyncEnablementService } from 'vscode/vscode/vs/platform/userDataSync/common/userDataSync.service';
 
 function parseSnippets(syncData) {
@@ -20,7 +20,7 @@ function parseSnippets(syncData) {
 }
 let SnippetsSynchroniser = class SnippetsSynchroniser extends AbstractSynchroniser {
     constructor(profile, collection, environmentService, fileService, storageService, userDataSyncStoreService, userDataSyncLocalStoreService, logService, configurationService, userDataSyncEnablementService, telemetryService, uriIdentityService) {
-        super({ syncResource: "snippets" , profile }, collection, fileService, environmentService, storageService, userDataSyncStoreService, userDataSyncLocalStoreService, userDataSyncEnablementService, telemetryService, logService, configurationService, uriIdentityService);
+        super({ syncResource: SyncResource.Snippets, profile }, collection, fileService, environmentService, storageService, userDataSyncStoreService, userDataSyncLocalStoreService, userDataSyncEnablementService, telemetryService, logService, configurationService, uriIdentityService);
         this.version = 1;
         this.snippetsFolder = profile.snippetsHome;
         this._register(this.fileService.watch(environmentService.userRoamingDataHome));
@@ -59,19 +59,19 @@ let SnippetsSynchroniser = class SnippetsSynchroniser extends AbstractSynchronis
         if (this.extUri.isEqualOrParent(resource, this.syncPreviewFolder.with({ scheme: USER_DATA_SYNC_SCHEME, authority: 'local' }))) {
             return {
                 content: resourcePreview.fileContent ? ( resourcePreview.fileContent.value.toString()) : null,
-                localChange: 0 ,
+                localChange: Change.None,
                 remoteChange: resourcePreview.fileContent
-                    ? resourcePreview.remoteContent !== null ? 2  : 1
-                    : 3
+                    ? resourcePreview.remoteContent !== null ? Change.Modified : Change.Added
+                    : Change.Deleted
             };
         }
         if (this.extUri.isEqualOrParent(resource, this.syncPreviewFolder.with({ scheme: USER_DATA_SYNC_SCHEME, authority: 'remote' }))) {
             return {
                 content: resourcePreview.remoteContent,
                 localChange: resourcePreview.remoteContent !== null
-                    ? resourcePreview.fileContent ? 2  : 1
-                    : 3 ,
-                remoteChange: 0 ,
+                    ? resourcePreview.fileContent ? Change.Modified : Change.Added
+                    : Change.Deleted,
+                remoteChange: Change.None,
             };
         }
         if (this.extUri.isEqualOrParent(resource, this.syncPreviewFolder)) {
@@ -86,11 +86,11 @@ let SnippetsSynchroniser = class SnippetsSynchroniser extends AbstractSynchronis
                 return {
                     content,
                     localChange: content === null
-                        ? resourcePreview.fileContent !== null ? 3  : 0
-                        : 2 ,
+                        ? resourcePreview.fileContent !== null ? Change.Deleted : Change.None
+                        : Change.Modified,
                     remoteChange: content === null
-                        ? resourcePreview.remoteContent !== null ? 3  : 0
-                        : 2
+                        ? resourcePreview.remoteContent !== null ? Change.Deleted : Change.None
+                        : Change.Modified
                 };
             }
         }
@@ -100,14 +100,14 @@ let SnippetsSynchroniser = class SnippetsSynchroniser extends AbstractSynchronis
         const accptedResourcePreviews = ( resourcePreviews.map(
             ([resourcePreview, acceptResult]) => ({ ...resourcePreview, acceptResult })
         ));
-        if (accptedResourcePreviews.every(({ localChange, remoteChange }) => localChange === 0  && remoteChange === 0 )) {
+        if (accptedResourcePreviews.every(({ localChange, remoteChange }) => localChange === Change.None && remoteChange === Change.None)) {
             this.logService.info(`${this.syncResourceLogLabel}: No changes found during synchronizing snippets.`);
         }
-        if (( accptedResourcePreviews.some(({ localChange }) => localChange !== 0 ))) {
+        if (( accptedResourcePreviews.some(({ localChange }) => localChange !== Change.None))) {
             await this.updateLocalBackup(accptedResourcePreviews);
             await this.updateLocalSnippets(accptedResourcePreviews, force);
         }
-        if (( accptedResourcePreviews.some(({ remoteChange }) => remoteChange !== 0 ))) {
+        if (( accptedResourcePreviews.some(({ remoteChange }) => remoteChange !== Change.None))) {
             remoteUserData = await this.updateRemoteSnippets(accptedResourcePreviews, remoteUserData, force);
         }
         if (lastSyncUserData?.ref !== remoteUserData.ref) {
@@ -128,8 +128,8 @@ let SnippetsSynchroniser = class SnippetsSynchroniser extends AbstractSynchronis
             const previewResult = {
                 content: snippetsMergeResult.local.added[key],
                 hasConflicts: false,
-                localChange: 1 ,
-                remoteChange: 0 ,
+                localChange: Change.Added,
+                remoteChange: Change.None,
             };
             resourcePreviews.set(key, {
                 baseResource: this.extUri.joinPath(this.syncPreviewFolder, key).with({ scheme: USER_DATA_SYNC_SCHEME, authority: 'base' }),
@@ -150,8 +150,8 @@ let SnippetsSynchroniser = class SnippetsSynchroniser extends AbstractSynchronis
             const previewResult = {
                 content: snippetsMergeResult.local.updated[key],
                 hasConflicts: false,
-                localChange: 2 ,
-                remoteChange: 0 ,
+                localChange: Change.Modified,
+                remoteChange: Change.None,
             };
             const localContent = localFileContent[key] ? ( localFileContent[key].value.toString()) : null;
             resourcePreviews.set(key, {
@@ -173,8 +173,8 @@ let SnippetsSynchroniser = class SnippetsSynchroniser extends AbstractSynchronis
             const previewResult = {
                 content: null,
                 hasConflicts: false,
-                localChange: 3 ,
-                remoteChange: 0 ,
+                localChange: Change.Deleted,
+                remoteChange: Change.None,
             };
             const localContent = localFileContent[key] ? ( localFileContent[key].value.toString()) : null;
             resourcePreviews.set(key, {
@@ -196,8 +196,8 @@ let SnippetsSynchroniser = class SnippetsSynchroniser extends AbstractSynchronis
             const previewResult = {
                 content: snippetsMergeResult.remote.added[key],
                 hasConflicts: false,
-                localChange: 0 ,
-                remoteChange: 1 ,
+                localChange: Change.None,
+                remoteChange: Change.Added,
             };
             const localContent = localFileContent[key] ? ( localFileContent[key].value.toString()) : null;
             resourcePreviews.set(key, {
@@ -219,8 +219,8 @@ let SnippetsSynchroniser = class SnippetsSynchroniser extends AbstractSynchronis
             const previewResult = {
                 content: snippetsMergeResult.remote.updated[key],
                 hasConflicts: false,
-                localChange: 0 ,
-                remoteChange: 2 ,
+                localChange: Change.None,
+                remoteChange: Change.Modified,
             };
             const localContent = localFileContent[key] ? ( localFileContent[key].value.toString()) : null;
             resourcePreviews.set(key, {
@@ -242,8 +242,8 @@ let SnippetsSynchroniser = class SnippetsSynchroniser extends AbstractSynchronis
             const previewResult = {
                 content: null,
                 hasConflicts: false,
-                localChange: 0 ,
-                remoteChange: 3 ,
+                localChange: Change.None,
+                remoteChange: Change.Deleted,
             };
             resourcePreviews.set(key, {
                 baseResource: this.extUri.joinPath(this.syncPreviewFolder, key).with({ scheme: USER_DATA_SYNC_SCHEME, authority: 'base' }),
@@ -264,8 +264,8 @@ let SnippetsSynchroniser = class SnippetsSynchroniser extends AbstractSynchronis
             const previewResult = {
                 content: baseSnippets[key] ?? null,
                 hasConflicts: true,
-                localChange: localFileContent[key] ? 2  : 1 ,
-                remoteChange: remoteSnippets[key] ? 2  : 1
+                localChange: localFileContent[key] ? Change.Modified : Change.Added,
+                remoteChange: remoteSnippets[key] ? Change.Modified : Change.Added
             };
             const localContent = localFileContent[key] ? ( localFileContent[key].value.toString()) : null;
             resourcePreviews.set(key, {
@@ -288,8 +288,8 @@ let SnippetsSynchroniser = class SnippetsSynchroniser extends AbstractSynchronis
                 const previewResult = {
                     content: localFileContent[key] ? ( localFileContent[key].value.toString()) : null,
                     hasConflicts: false,
-                    localChange: 0 ,
-                    remoteChange: 0
+                    localChange: Change.None,
+                    remoteChange: Change.None
                 };
                 const localContent = localFileContent[key] ? ( localFileContent[key].value.toString()) : null;
                 resourcePreviews.set(key, {
@@ -341,15 +341,15 @@ let SnippetsSynchroniser = class SnippetsSynchroniser extends AbstractSynchronis
     }
     async updateLocalSnippets(resourcePreviews, force) {
         for (const { fileContent, acceptResult, localResource, remoteResource, localChange } of resourcePreviews) {
-            if (localChange !== 0 ) {
+            if (localChange !== Change.None) {
                 const key = remoteResource ? this.extUri.basename(remoteResource) : this.extUri.basename(localResource);
                 const resource = this.extUri.joinPath(this.snippetsFolder, key);
-                if (localChange === 3 ) {
+                if (localChange === Change.Deleted) {
                     this.logService.trace(`${this.syncResourceLogLabel}: Deleting snippet...`, this.extUri.basename(resource));
                     await this.fileService.del(resource);
                     this.logService.info(`${this.syncResourceLogLabel}: Deleted snippet`, this.extUri.basename(resource));
                 }
-                else if (localChange === 1 ) {
+                else if (localChange === Change.Added) {
                     this.logService.trace(`${this.syncResourceLogLabel}: Creating snippet...`, this.extUri.basename(resource));
                     await this.fileService.createFile(resource, VSBuffer.fromString(acceptResult.content), { overwrite: force });
                     this.logService.info(`${this.syncResourceLogLabel}: Created snippet`, this.extUri.basename(resource));
@@ -366,9 +366,9 @@ let SnippetsSynchroniser = class SnippetsSynchroniser extends AbstractSynchronis
         const currentSnippets = remoteUserData.syncData ? this.parseSnippets(remoteUserData.syncData) : {};
         const newSnippets = deepClone(currentSnippets);
         for (const { acceptResult, localResource, remoteResource, remoteChange } of resourcePreviews) {
-            if (remoteChange !== 0 ) {
+            if (remoteChange !== Change.None) {
                 const key = localResource ? this.extUri.basename(localResource) : this.extUri.basename(remoteResource);
-                if (remoteChange === 3 ) {
+                if (remoteChange === Change.Deleted) {
                     delete newSnippets[key];
                 }
                 else {
@@ -400,7 +400,7 @@ let SnippetsSynchroniser = class SnippetsSynchroniser extends AbstractSynchronis
             stat = await this.fileService.resolve(this.snippetsFolder);
         }
         catch (e) {
-            if (e instanceof FileOperationError && e.fileOperationResult === 1 ) {
+            if (e instanceof FileOperationError && e.fileOperationResult === FileOperationResult.FILE_NOT_FOUND) {
                 return snippets;
             }
             else {
@@ -433,7 +433,7 @@ SnippetsSynchroniser = ( __decorate([
 ], SnippetsSynchroniser));
 let SnippetsInitializer = class SnippetsInitializer extends AbstractInitializer {
     constructor(fileService, userDataProfilesService, environmentService, logService, storageService, uriIdentityService) {
-        super("snippets" , userDataProfilesService, environmentService, logService, fileService, storageService, uriIdentityService);
+        super(SyncResource.Snippets, userDataProfilesService, environmentService, logService, fileService, storageService, uriIdentityService);
     }
     async doInitialize(remoteUserData) {
         const remoteSnippets = remoteUserData.syncData ? JSON.parse(remoteUserData.syncData.content) : null;
@@ -462,7 +462,7 @@ let SnippetsInitializer = class SnippetsInitializer extends AbstractInitializer
             return !stat.children?.length;
         }
         catch (error) {
-            return error.fileOperationResult === 1 ;
+            return error.fileOperationResult === FileOperationResult.FILE_NOT_FOUND;
         }
     }
 };

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

@@ -8,7 +8,7 @@ import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/te
 import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
 import { IUserDataProfilesService } from 'vscode/vscode/vs/platform/userDataProfile/common/userDataProfile.service';
 import { AbstractFileSynchroniser, AbstractInitializer } from 'vscode/vscode/vs/platform/userDataSync/common/abstractSynchronizer';
-import { USER_DATA_SYNC_SCHEME } from 'vscode/vscode/vs/platform/userDataSync/common/userDataSync';
+import { SyncResource, USER_DATA_SYNC_SCHEME, Change } from 'vscode/vscode/vs/platform/userDataSync/common/userDataSync';
 import { IUserDataSyncStoreService, IUserDataSyncLocalStoreService, IUserDataSyncLogService, IUserDataSyncEnablementService } from 'vscode/vscode/vs/platform/userDataSync/common/userDataSync.service';
 
 function getTasksContentFromSyncContent(syncContent, logService) {
@@ -23,7 +23,7 @@ function getTasksContentFromSyncContent(syncContent, logService) {
 }
 let TasksSynchroniser = class TasksSynchroniser extends AbstractFileSynchroniser {
     constructor(profile, collection, userDataSyncStoreService, userDataSyncLocalStoreService, logService, configurationService, userDataSyncEnablementService, fileService, environmentService, storageService, telemetryService, uriIdentityService) {
-        super(profile.tasksResource, { syncResource: "tasks" , profile }, collection, fileService, environmentService, storageService, userDataSyncStoreService, userDataSyncLocalStoreService, userDataSyncEnablementService, telemetryService, logService, configurationService, uriIdentityService);
+        super(profile.tasksResource, { syncResource: SyncResource.Tasks, profile }, collection, fileService, environmentService, storageService, userDataSyncStoreService, userDataSyncLocalStoreService, userDataSyncEnablementService, telemetryService, logService, configurationService, uriIdentityService);
         this.version = 1;
         this.previewResource = this.extUri.joinPath(this.syncPreviewFolder, 'tasks.json');
         this.baseResource = this.previewResource.with({ scheme: USER_DATA_SYNC_SCHEME, authority: 'base' });
@@ -61,8 +61,8 @@ let TasksSynchroniser = class TasksSynchroniser extends AbstractFileSynchroniser
         }
         const previewResult = {
             content: hasConflicts ? lastSyncContent : content,
-            localChange: hasLocalChanged ? fileContent ? 2  : 1  : 0 ,
-            remoteChange: hasRemoteChanged ? 2  : 0 ,
+            localChange: hasLocalChanged ? fileContent ? Change.Modified : Change.Added : Change.None,
+            remoteChange: hasRemoteChanged ? Change.Modified : Change.None,
             hasConflicts
         };
         const localContent = fileContent ? ( fileContent.value.toString()) : null;
@@ -98,15 +98,15 @@ let TasksSynchroniser = class TasksSynchroniser extends AbstractFileSynchroniser
         if (this.extUri.isEqual(resource, this.localResource)) {
             return {
                 content: resourcePreview.fileContent ? ( resourcePreview.fileContent.value.toString()) : null,
-                localChange: 0 ,
-                remoteChange: 2 ,
+                localChange: Change.None,
+                remoteChange: Change.Modified,
             };
         }
         if (this.extUri.isEqual(resource, this.remoteResource)) {
             return {
                 content: resourcePreview.remoteContent,
-                localChange: 2 ,
-                remoteChange: 0 ,
+                localChange: Change.Modified,
+                remoteChange: Change.None,
             };
         }
         if (this.extUri.isEqual(resource, this.previewResource)) {
@@ -120,8 +120,8 @@ let TasksSynchroniser = class TasksSynchroniser extends AbstractFileSynchroniser
             else {
                 return {
                     content,
-                    localChange: 2 ,
-                    remoteChange: 2 ,
+                    localChange: Change.Modified,
+                    remoteChange: Change.Modified,
                 };
             }
         }
@@ -130,10 +130,10 @@ let TasksSynchroniser = class TasksSynchroniser extends AbstractFileSynchroniser
     async applyResult(remoteUserData, lastSyncUserData, resourcePreviews, force) {
         const { fileContent } = resourcePreviews[0][0];
         const { content, localChange, remoteChange } = resourcePreviews[0][1];
-        if (localChange === 0  && remoteChange === 0 ) {
+        if (localChange === Change.None && remoteChange === Change.None) {
             this.logService.info(`${this.syncResourceLogLabel}: No changes found during synchronizing tasks.`);
         }
-        if (localChange !== 0 ) {
+        if (localChange !== Change.None) {
             this.logService.trace(`${this.syncResourceLogLabel}: Updating local tasks...`);
             if (fileContent) {
                 await this.backupLocal(JSON.stringify(this.toTasksSyncContent(( fileContent.value.toString()))));
@@ -146,7 +146,7 @@ let TasksSynchroniser = class TasksSynchroniser extends AbstractFileSynchroniser
             }
             this.logService.info(`${this.syncResourceLogLabel}: Updated local tasks`);
         }
-        if (remoteChange !== 0 ) {
+        if (remoteChange !== Change.None) {
             this.logService.trace(`${this.syncResourceLogLabel}: Updating remote tasks...`);
             const remoteContents = JSON.stringify(this.toTasksSyncContent(content));
             remoteUserData = await this.updateRemoteUserData(remoteContents, force ? null : remoteUserData.ref);
@@ -192,7 +192,7 @@ TasksSynchroniser = ( __decorate([
 ], TasksSynchroniser));
 let TasksInitializer = class TasksInitializer extends AbstractInitializer {
     constructor(fileService, userDataProfilesService, environmentService, logService, storageService, uriIdentityService) {
-        super("tasks" , userDataProfilesService, environmentService, logService, fileService, storageService, uriIdentityService);
+        super(SyncResource.Tasks, userDataProfilesService, environmentService, logService, fileService, storageService, uriIdentityService);
         this.tasksResource = this.userDataProfilesService.defaultProfile.tasksResource;
     }
     async doInitialize(remoteUserData) {

package/vscode/src/vs/workbench/contrib/userDataProfile/browser/media/userDataProfilesEditor.css.js

@@ -0,0 +1,6 @@
+import n from 'vscode/external/rollup-plugin-styles/dist/runtime/inject-css.js';
+
+var css = ".profiles-editor{height:100%;margin:20px auto 0;max-width:1000px;overflow:hidden}.profiles-editor .contents-view,.profiles-editor .sidebar-view{height:100%}.profiles-editor .contents-container,.profiles-editor .sidebar-container{height:100%;padding:0 20px}.profiles-editor .sidebar-container .new-profile-button{align-items:center;display:flex}.profiles-editor .sidebar-container .new-profile-button>.monaco-button-dropdown{flex-grow:1}.profiles-editor .monaco-button-dropdown>.monaco-dropdown-button{align-items:center;display:flex;padding:0 4px}.profiles-editor .sidebar-container .profiles-tree{margin-top:10px}.profiles-editor .sidebar-container .profiles-tree .profile-tree-item{align-items:center;display:flex}.profiles-editor .sidebar-container .profiles-tree .profile-tree-item>*{margin-right:5px}.profiles-editor .sidebar-container .profiles-tree .profile-tree-item>.profile-tree-item-description{align-items:center;display:flex;font-size:.9em;margin-left:2px;opacity:.7}.profiles-editor .hide{display:none!important}.profiles-editor .contents-container .profile-header{align-items:center;display:flex;height:34px}.profiles-editor .contents-container .profile-header .profile-title{flex:1;font-size:x-large;font-weight:700}.profiles-editor .contents-container .profile-header .profile-actions-container{display:flex;height:28px}.profiles-editor .contents-container .profile-header .profile-actions-container .actions-container{gap:4px}.profiles-editor .contents-container .profile-header .profile-actions-container .actions-container .codicon{font-size:18px}.profiles-editor .contents-container .profile-header .profile-actions-container .profile-button-container{margin-right:5px;min-width:120px}.profiles-editor .contents-container .profile-header .profile-actions-container .profile-button-container .monaco-button{padding-left:10px;padding-right:10px}.profiles-editor .contents-container .profile-body{margin-top:20px}.profiles-editor .contents-container .profile-name-container{align-items:center;display:flex;margin:0 0 20px 15px;width:330px}.profiles-editor .contents-container .profile-name-container .codicon{cursor:pointer;font-size:20px;padding:2px}.profiles-editor .contents-container .profile-name-container .monaco-inputbox{flex:1;margin-left:10px}.profiles-editor .contents-container .profile-select-container{align-items:center;display:flex;justify-content:center;overflow:hidden}.profiles-editor .contents-container .profile-select-container>.monaco-select-box{border-radius:2px;cursor:pointer;line-height:17px;padding:2px 23px 2px 8px}.profiles-editor .contents-container .profile-copy-from-container{align-items:center;display:flex;margin:0 0 20px 20px}.profiles-editor .contents-container .profile-copy-from-container>.profile-copy-from-label{align-items:center;display:inline-flex;margin-right:10px}.profiles-editor .contents-container .profile-copy-from-container>.profile-select-container{width:250px}.profiles-editor .contents-container .profile-contents-container{font-size:medium;margin:0 0 10px 20px}.profiles-editor .contents-container .profile-tree-item-container{align-items:center;display:flex}.profiles-editor .contents-container .profile-tree-item-container.new-profile-resource-type-container>.profile-resource-type-label-container{width:150px}.profiles-editor .contents-container .profile-tree-item-container.new-profile-resource-type-container>.profile-select-container{width:170px}.profiles-editor .contents-container .profile-tree-item-container .profile-resource-type-description{font-size:.9em;margin-left:10px;opacity:.7}";
+n(css,{});
+
+export { css, css as default };

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

@@ -1,9 +1,10 @@
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
-import { Extensions, registerWorkbenchContribution2 } from 'vscode/vscode/vs/workbench/common/contributions';
+import { Extensions, registerWorkbenchContribution2, WorkbenchPhase } from 'vscode/vscode/vs/workbench/common/contributions';
 import { UserDataProfilesWorkbenchContribution } from './userDataProfile.js';
+import { LifecyclePhase } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
 import './userDataProfileActions.js';
 import { UserDataProfilePreviewContribution } from './userDataProfilePreview.js';
 
 const workbenchRegistry = ( Registry.as(Extensions.Workbench));
-registerWorkbenchContribution2(UserDataProfilesWorkbenchContribution.ID, UserDataProfilesWorkbenchContribution, 2 );
-workbenchRegistry.registerWorkbenchContribution(UserDataProfilePreviewContribution, 3 );
+registerWorkbenchContribution2(UserDataProfilesWorkbenchContribution.ID, UserDataProfilesWorkbenchContribution, WorkbenchPhase.BlockRestore);
+workbenchRegistry.registerWorkbenchContribution(UserDataProfilePreviewContribution, LifecyclePhase.Restored);