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

package/package.json

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

package/vscode/src/vs/platform/userDataProfile/common/userDataProfileStorageService.js

@@ -1,7 +1,7 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { Disposable, isDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { Storage } from 'vscode/vscode/vs/base/parts/storage/common/storage';
-import { AbstractStorageService } from 'vscode/vscode/vs/platform/storage/common/storage';
+import { StorageScope, StorageTarget, AbstractStorageService } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
 import 'vscode/vscode/vs/base/common/event';
 import 'vscode/vscode/vs/platform/userDataProfile/common/userDataProfile';
@@ -37,18 +37,16 @@ let AbstractUserDataProfileStorageService = class AbstractUserDataProfileStorage
     getItems(storageService) {
         const result = ( new Map());
         const populate = (target) => {
-            for (const key of ( storageService.keys(0, target))) {
-                result.set(key, { value: storageService.get(key, 0 ), target });
+            for (const key of ( storageService.keys(StorageScope.PROFILE, target))) {
+                result.set(key, { value: storageService.get(key, StorageScope.PROFILE), target });
             }
         };
-        populate(0 );
-        populate(1 );
+        populate(StorageTarget.USER);
+        populate(StorageTarget.MACHINE);
         return result;
     }
     writeItems(storageService, items, target) {
-        storageService.storeAll(( Array.from(items.entries()).map(
-            ([key, value]) => ({ key, value, scope: 0 , target })
-        )), true);
+        storageService.storeAll(( Array.from(items.entries()).map(([key, value]) => ({ key, value, scope: StorageScope.PROFILE, target }))), true);
     }
     async closeAndDispose(storageDatabase) {
         try {
@@ -73,7 +71,7 @@ class StorageService extends AbstractStorageService {
         return this.profileStorage.init();
     }
     getStorage(scope) {
-        return scope === 0  ? this.profileStorage : undefined;
+        return scope === StorageScope.PROFILE ? this.profileStorage : undefined;
     }
     getLogDetails() { return undefined; }
     async switchToProfile() { }

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

@@ -9,12 +9,12 @@ import { compare } from 'vscode/vscode/vs/base/common/strings';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { IEnvironmentService } from 'vscode/vscode/vs/platform/environment/common/environment.service';
 import { GlobalExtensionEnablementService } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionEnablementService';
-import { DISABLED_EXTENSIONS_STORAGE_PATH, EXTENSION_INSTALL_SKIP_WALKTHROUGH_CONTEXT, EXTENSION_INSTALL_SYNC_CONTEXT, ExtensionManagementError, ExtensionManagementErrorCode } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagement';
+import { DISABLED_EXTENSIONS_STORAGE_PATH, EXTENSION_INSTALL_SKIP_WALKTHROUGH_CONTEXT, EXTENSION_INSTALL_SOURCE_CONTEXT, ExtensionInstallSource, ExtensionManagementError, ExtensionManagementErrorCode } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagement';
 import { IExtensionManagementService, IExtensionGalleryService } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagement.service';
 import { areSameExtensions } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagementUtil';
 import { ExtensionStorageService } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionStorage';
 import { IExtensionStorageService } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionStorage.service';
-import { isApplicationScopedExtension } from 'vscode/vscode/vs/platform/extensions/common/extensions';
+import { ExtensionType, isApplicationScopedExtension } from 'vscode/vscode/vs/platform/extensions/common/extensions';
 import { IFileService } from 'vscode/vscode/vs/platform/files/common/files.service';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { ServiceCollection } from 'vscode/vscode/vs/platform/instantiation/common/serviceCollection';
@@ -26,7 +26,7 @@ import { IUserDataProfilesService } from 'vscode/vscode/vs/platform/userDataProf
 import { AbstractSynchroniser, getSyncResourceLogLabel, AbstractInitializer } from 'vscode/vscode/vs/platform/userDataSync/common/abstractSynchronizer';
 import { merge } from './extensionsMerge.js';
 import { IIgnoredExtensionsManagementService } from 'vscode/vscode/vs/platform/userDataSync/common/ignoredExtensions.service';
-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';
 import { IUserDataProfileStorageService } from 'vscode/vscode/vs/platform/userDataProfile/common/userDataProfileStorageService.service';
 
@@ -34,7 +34,7 @@ async function parseAndMigrateExtensions(syncData, extensionManagementService) {
     const extensions = JSON.parse(syncData.content);
     if (syncData.version === 1
         || syncData.version === 2) {
-        const builtinExtensions = (await extensionManagementService.getInstalled(0 )).filter(e => e.isBuiltin);
+        const builtinExtensions = (await extensionManagementService.getInstalled(ExtensionType.System)).filter(e => e.isBuiltin);
         for (const extension of extensions) {
             if (syncData.version === 1) {
                 if (extension.enabled === false) {
@@ -69,7 +69,7 @@ function stringify(extensions, format) {
 let ExtensionsSynchroniser = class ExtensionsSynchroniser extends AbstractSynchroniser {
     constructor(
     profile, collection, environmentService, fileService, storageService, userDataSyncStoreService, userDataSyncLocalStoreService, extensionManagementService, ignoredExtensionsManagementService, logService, configurationService, userDataSyncEnablementService, telemetryService, extensionStorageService, uriIdentityService, userDataProfileStorageService, instantiationService) {
-        super({ syncResource: "extensions" , profile }, collection, fileService, environmentService, storageService, userDataSyncStoreService, userDataSyncLocalStoreService, userDataSyncEnablementService, telemetryService, logService, configurationService, uriIdentityService);
+        super({ syncResource: SyncResource.Extensions, profile }, collection, fileService, environmentService, storageService, userDataSyncStoreService, userDataSyncLocalStoreService, userDataSyncEnablementService, telemetryService, logService, configurationService, uriIdentityService);
         this.extensionManagementService = extensionManagementService;
         this.ignoredExtensionsManagementService = ignoredExtensionsManagementService;
         this.instantiationService = instantiationService;
@@ -100,8 +100,8 @@ let ExtensionsSynchroniser = class ExtensionsSynchroniser extends AbstractSynchr
         const previewResult = {
             local, remote,
             content: this.getPreviewContent(localExtensions, local.added, local.updated, local.removed),
-            localChange: local.added.length > 0 || local.removed.length > 0 || local.updated.length > 0 ? 2  : 0 ,
-            remoteChange: remote !== null ? 2  : 0 ,
+            localChange: local.added.length > 0 || local.removed.length > 0 || local.updated.length > 0 ? Change.Modified : Change.None,
+            remoteChange: remote !== null ? Change.Modified : Change.None,
         };
         const localContent = this.stringify(localExtensions, false);
         return [{
@@ -171,8 +171,8 @@ let ExtensionsSynchroniser = class ExtensionsSynchroniser extends AbstractSynchr
             content: resourcePreview.localContent,
             local,
             remote,
-            localChange: local.added.length > 0 || local.removed.length > 0 || local.updated.length > 0 ? 2  : 0 ,
-            remoteChange: remote !== null ? 2  : 0 ,
+            localChange: local.added.length > 0 || local.removed.length > 0 || local.updated.length > 0 ? Change.Modified : Change.None,
+            remoteChange: remote !== null ? Change.Modified : Change.None,
         };
     }
     async acceptRemote(resourcePreview) {
@@ -186,8 +186,8 @@ let ExtensionsSynchroniser = class ExtensionsSynchroniser extends AbstractSynchr
                 content: resourcePreview.remoteContent,
                 local,
                 remote,
-                localChange: local.added.length > 0 || local.removed.length > 0 || local.updated.length > 0 ? 2  : 0 ,
-                remoteChange: remote !== null ? 2  : 0 ,
+                localChange: local.added.length > 0 || local.removed.length > 0 || local.updated.length > 0 ? Change.Modified : Change.None,
+                remoteChange: remote !== null ? Change.Modified : Change.None,
             };
         }
         else {
@@ -195,18 +195,18 @@ let ExtensionsSynchroniser = class ExtensionsSynchroniser extends AbstractSynchr
                 content: resourcePreview.remoteContent,
                 local: { added: [], removed: [], updated: [] },
                 remote: null,
-                localChange: 0 ,
-                remoteChange: 0 ,
+                localChange: Change.None,
+                remoteChange: Change.None,
             };
         }
     }
     async applyResult(remoteUserData, lastSyncUserData, resourcePreviews, force) {
         let { skippedExtensions, builtinExtensions, localExtensions } = resourcePreviews[0][0];
         const { local, remote, 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 extensions.`);
         }
-        if (localChange !== 0 ) {
+        if (localChange !== Change.None) {
             await this.backupLocal(JSON.stringify(localExtensions));
             skippedExtensions = await this.localExtensionsProvider.updateLocalExtensions(local.added, local.removed, local.updated, skippedExtensions, this.syncResource.profile);
         }
@@ -323,7 +323,7 @@ let LocalExtensionsProvider = class LocalExtensionsProvider {
                     }
                 }
                 catch (error) {
-                    this.logService.info(`${getSyncResourceLogLabel("extensions" , profile)}: Error while parsing extension state`, getErrorMessage(error));
+                    this.logService.info(`${getSyncResourceLogLabel(SyncResource.Extensions, profile)}: Error while parsing extension state`, getErrorMessage(error));
                 }
                 return syncExntesion;
             }));
@@ -331,7 +331,7 @@ let LocalExtensionsProvider = class LocalExtensionsProvider {
         return { localExtensions, ignoredExtensions };
     }
     async updateLocalExtensions(added, removed, updated, skippedExtensions, profile) {
-        const syncResourceLogLabel = getSyncResourceLogLabel("extensions" , profile);
+        const syncResourceLogLabel = getSyncResourceLogLabel(SyncResource.Extensions, profile);
         const extensionsToInstall = [];
         const syncExtensionsToInstall = ( new Map());
         const removeFromSkipped = [];
@@ -393,10 +393,11 @@ let LocalExtensionsProvider = class LocalExtensionsProvider {
                                             isMachineScoped: false ,
                                             donotIncludePackAndDependencies: true,
                                             installGivenVersion: e.pinned && !!e.version,
+                                            pinned: e.pinned,
                                             installPreReleaseVersion: e.preRelease,
                                             profileLocation: profile.extensionsResource,
                                             isApplicationScoped: e.isApplicationScoped,
-                                            context: { [EXTENSION_INSTALL_SKIP_WALKTHROUGH_CONTEXT]: true, [EXTENSION_INSTALL_SYNC_CONTEXT]: true }
+                                            context: { [EXTENSION_INSTALL_SKIP_WALKTHROUGH_CONTEXT]: true, [EXTENSION_INSTALL_SOURCE_CONTEXT]: ExtensionInstallSource.SETTINGS_SYNC }
                                         }
                                     });
                                     syncExtensionsToInstall.set(extension.identifier.id.toLowerCase(), e);
@@ -477,7 +478,7 @@ let LocalExtensionsProvider = class LocalExtensionsProvider {
     async withProfileScopedServices(profile, fn) {
         return this.userDataProfileStorageService.withProfileScopedStorageService(profile, async (storageService) => {
             const disposables = ( new DisposableStore());
-            const instantiationService = this.instantiationService.createChild(( new ServiceCollection([IStorageService, storageService])));
+            const instantiationService = disposables.add(this.instantiationService.createChild(( new ServiceCollection([IStorageService, storageService]))));
             const extensionEnablementService = disposables.add(instantiationService.createInstance(GlobalExtensionEnablementService));
             const extensionStorageService = disposables.add(instantiationService.createInstance(ExtensionStorageService));
             try {
@@ -499,7 +500,7 @@ LocalExtensionsProvider = ( __decorate([
 ], LocalExtensionsProvider));
 let AbstractExtensionsInitializer = class AbstractExtensionsInitializer extends AbstractInitializer {
     constructor(extensionManagementService, ignoredExtensionsManagementService, fileService, userDataProfilesService, environmentService, logService, storageService, uriIdentityService) {
-        super("extensions" , userDataProfilesService, environmentService, logService, fileService, storageService, uriIdentityService);
+        super(SyncResource.Extensions, userDataProfilesService, environmentService, logService, fileService, storageService, uriIdentityService);
         this.extensionManagementService = extensionManagementService;
         this.ignoredExtensionsManagementService = ignoredExtensionsManagementService;
     }

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

@@ -11,13 +11,14 @@ import { IEnvironmentService } from 'vscode/vscode/vs/platform/environment/commo
 import { IFileService } from 'vscode/vscode/vs/platform/files/common/files.service';
 import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
 import { getServiceMachineId } from 'vscode/vscode/vs/platform/externalServices/common/serviceMachineId';
+import { StorageTarget, StorageScope } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
 import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry.service';
 import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
 import { AbstractSynchroniser, getSyncResourceLogLabel, AbstractInitializer, isSyncData } from 'vscode/vscode/vs/platform/userDataSync/common/abstractSynchronizer';
 import { edit } from 'vscode/vscode/vs/platform/userDataSync/common/content';
 import { merge } from './globalStateMerge.js';
-import { USER_DATA_SYNC_SCHEME, ALL_SYNC_RESOURCES, getEnablementKey, SYNC_SERVICE_URL_TYPE, createSyncHeaders, UserDataSyncError } from 'vscode/vscode/vs/platform/userDataSync/common/userDataSync';
+import { SyncResource, USER_DATA_SYNC_SCHEME, Change, ALL_SYNC_RESOURCES, getEnablementKey, SYNC_SERVICE_URL_TYPE, createSyncHeaders, UserDataSyncError, UserDataSyncErrorCode } from 'vscode/vscode/vs/platform/userDataSync/common/userDataSync';
 import { IUserDataSyncStoreService, IUserDataSyncLocalStoreService, IUserDataSyncLogService, IUserDataSyncEnablementService } from 'vscode/vscode/vs/platform/userDataSync/common/userDataSync.service';
 import { IUserDataProfilesService } from 'vscode/vscode/vs/platform/userDataProfile/common/userDataProfile.service';
 import { IUserDataProfileStorageService } from 'vscode/vscode/vs/platform/userDataProfile/common/userDataProfileStorageService.service';
@@ -35,7 +36,7 @@ function stringify(globalState, format) {
 const GLOBAL_STATE_DATA_VERSION = 1;
 let GlobalStateSynchroniser = class GlobalStateSynchroniser extends AbstractSynchroniser {
     constructor(profile, collection, userDataProfileStorageService, fileService, userDataSyncStoreService, userDataSyncLocalStoreService, logService, environmentService, userDataSyncEnablementService, telemetryService, configurationService, storageService, uriIdentityService, instantiationService) {
-        super({ syncResource: "globalState" , profile }, collection, fileService, environmentService, storageService, userDataSyncStoreService, userDataSyncLocalStoreService, userDataSyncEnablementService, telemetryService, logService, configurationService, uriIdentityService);
+        super({ syncResource: SyncResource.GlobalState, profile }, collection, fileService, environmentService, storageService, userDataSyncStoreService, userDataSyncLocalStoreService, userDataSyncEnablementService, telemetryService, logService, configurationService, uriIdentityService);
         this.userDataProfileStorageService = userDataProfileStorageService;
         this.version = GLOBAL_STATE_DATA_VERSION;
         this.previewResource = this.extUri.joinPath(this.syncPreviewFolder, 'globalState.json');
@@ -51,7 +52,7 @@ let GlobalStateSynchroniser = class GlobalStateSynchroniser extends AbstractSync
                 return true;
             }
             if (( e.valueChanges.some(
-                ({ profile, changes }) => this.syncResource.profile.id === profile.id && ( changes.some(change => change.target === 0 ))
+                ({ profile, changes }) => this.syncResource.profile.id === profile.id && ( changes.some(change => change.target === StorageTarget.USER))
             ))) {
                 return true;
             }
@@ -75,8 +76,8 @@ let GlobalStateSynchroniser = class GlobalStateSynchroniser extends AbstractSync
             content: null,
             local,
             remote,
-            localChange: ( Object.keys(local.added)).length > 0 || ( Object.keys(local.updated)).length > 0 || local.removed.length > 0 ? 2  : 0 ,
-            remoteChange: remote.all !== null ? 2  : 0 ,
+            localChange: ( Object.keys(local.added)).length > 0 || ( Object.keys(local.updated)).length > 0 || local.removed.length > 0 ? Change.Modified : Change.None,
+            remoteChange: remote.all !== null ? Change.Modified : Change.None,
         };
         const localContent = stringify(localGlobalState, false);
         return [{
@@ -125,8 +126,8 @@ let GlobalStateSynchroniser = class GlobalStateSynchroniser extends AbstractSync
             content: resourcePreview.localContent,
             local: { added: {}, removed: [], updated: {} },
             remote: { added: ( Object.keys(resourcePreview.localUserData.storage)), removed: [], updated: [], all: resourcePreview.localUserData.storage },
-            localChange: 0 ,
-            remoteChange: 2 ,
+            localChange: Change.None,
+            remoteChange: Change.Modified,
         };
     }
     async acceptRemote(resourcePreview) {
@@ -137,8 +138,8 @@ let GlobalStateSynchroniser = class GlobalStateSynchroniser extends AbstractSync
                 content: resourcePreview.remoteContent,
                 local,
                 remote,
-                localChange: ( Object.keys(local.added)).length > 0 || ( Object.keys(local.updated)).length > 0 || local.removed.length > 0 ? 2  : 0 ,
-                remoteChange: remote !== null ? 2  : 0 ,
+                localChange: ( Object.keys(local.added)).length > 0 || ( Object.keys(local.updated)).length > 0 || local.removed.length > 0 ? Change.Modified : Change.None,
+                remoteChange: remote !== null ? Change.Modified : Change.None,
             };
         }
         else {
@@ -146,24 +147,24 @@ let GlobalStateSynchroniser = class GlobalStateSynchroniser extends AbstractSync
                 content: resourcePreview.remoteContent,
                 local: { added: {}, removed: [], updated: {} },
                 remote: { added: [], removed: [], updated: [], all: null },
-                localChange: 0 ,
-                remoteChange: 0 ,
+                localChange: Change.None,
+                remoteChange: Change.None,
             };
         }
     }
     async applyResult(remoteUserData, lastSyncUserData, resourcePreviews, force) {
         const { localUserData } = resourcePreviews[0][0];
         const { local, remote, 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 ui state.`);
         }
-        if (localChange !== 0 ) {
+        if (localChange !== Change.None) {
             this.logService.trace(`${this.syncResourceLogLabel}: Updating local ui state...`);
             await this.backupLocal(JSON.stringify(localUserData));
             await this.localGlobalStateProvider.writeLocalGlobalState(local, this.syncResource.profile);
             this.logService.info(`${this.syncResourceLogLabel}: Updated local ui state`);
         }
-        if (remoteChange !== 0 ) {
+        if (remoteChange !== Change.None) {
             this.logService.trace(`${this.syncResourceLogLabel}: Updating remote ui state...`);
             const content = JSON.stringify({ storage: remote.all });
             remoteUserData = await this.updateRemoteUserData(content, force ? null : remoteUserData.ref);
@@ -200,10 +201,10 @@ let GlobalStateSynchroniser = class GlobalStateSynchroniser extends AbstractSync
         const storageData = await this.userDataProfileStorageService.readStorageData(this.syncResource.profile);
         const user = [], machine = [];
         for (const [key, value] of storageData) {
-            if (value.target === 0 ) {
+            if (value.target === StorageTarget.USER) {
                 user.push(key);
             }
-            else if (value.target === 1 ) {
+            else if (value.target === StorageTarget.MACHINE) {
                 machine.push(key);
             }
         }
@@ -251,7 +252,7 @@ let LocalGlobalStateProvider = class LocalGlobalStateProvider {
         }
         const storageData = await this.userDataProfileStorageService.readStorageData(profile);
         for (const [key, value] of storageData) {
-            if (value.value && value.target === 0 ) {
+            if (value.value && value.target === StorageTarget.USER) {
                 storage[key] = { version: 1, value: value.value };
             }
         }
@@ -270,7 +271,7 @@ let LocalGlobalStateProvider = class LocalGlobalStateProvider {
         return '{}';
     }
     async writeLocalGlobalState({ added, removed, updated }, profile) {
-        const syncResourceLogLabel = getSyncResourceLogLabel("globalState" , profile);
+        const syncResourceLogLabel = getSyncResourceLogLabel(SyncResource.GlobalState, profile);
         const argv = {};
         const updatedStorage = ( new Map());
         const storageData = await this.userDataProfileStorageService.readStorageData(profile);
@@ -312,7 +313,7 @@ let LocalGlobalStateProvider = class LocalGlobalStateProvider {
         }
         if (updatedStorage.size) {
             this.logService.trace(`${syncResourceLogLabel}: Updating global state...`);
-            await this.userDataProfileStorageService.updateStorageData(profile, updatedStorage, 0 );
+            await this.userDataProfileStorageService.updateStorageData(profile, updatedStorage, StorageTarget.USER);
             this.logService.info(`${syncResourceLogLabel}: Updated global state`, [...( updatedStorage.keys())]);
         }
     }
@@ -325,7 +326,7 @@ LocalGlobalStateProvider = ( __decorate([
 ], LocalGlobalStateProvider));
 let GlobalStateInitializer = class GlobalStateInitializer extends AbstractInitializer {
     constructor(storageService, fileService, userDataProfilesService, environmentService, logService, uriIdentityService) {
-        super("globalState" , userDataProfilesService, environmentService, logService, fileService, storageService, uriIdentityService);
+        super(SyncResource.GlobalState, userDataProfilesService, environmentService, logService, fileService, storageService, uriIdentityService);
     }
     async doInitialize(remoteUserData) {
         const remoteGlobalState = remoteUserData.syncData ? JSON.parse(remoteUserData.syncData.content) : null;
@@ -340,7 +341,7 @@ let GlobalStateInitializer = class GlobalStateInitializer extends AbstractInitia
                 argv[key.substring(argvStoragePrefx.length)] = remoteGlobalState.storage[key].value;
             }
             else {
-                if (this.storageService.get(key, 0 ) === undefined) {
+                if (this.storageService.get(key, StorageScope.PROFILE) === undefined) {
                     storage[key] = remoteGlobalState.storage[key].value;
                 }
             }
@@ -360,7 +361,7 @@ let GlobalStateInitializer = class GlobalStateInitializer extends AbstractInitia
         if (( Object.keys(storage)).length) {
             const storageEntries = [];
             for (const key of ( Object.keys(storage))) {
-                storageEntries.push({ key, value: storage[key], scope: 0 , target: 0  });
+                storageEntries.push({ key, value: storage[key], scope: StorageScope.PROFILE, target: StorageTarget.USER });
             }
             this.storageService.storeAll(storageEntries, true);
         }
@@ -394,7 +395,7 @@ let UserDataSyncStoreTypeSynchronizer = class UserDataSyncStoreTypeSynchronizer
         catch (e) {
             if (e instanceof UserDataSyncError) {
                 switch (e.code) {
-                    case "PreconditionFailed" :
+                    case UserDataSyncErrorCode.PreconditionFailed:
                         this.logService.info(`Failed to synchronize UserDataSyncStoreType as there is a new remote version available. Synchronizing again...`);
                         return this.doSync(userDataSyncStoreType, syncHeaders);
                 }
@@ -403,12 +404,12 @@ let UserDataSyncStoreTypeSynchronizer = class UserDataSyncStoreTypeSynchronizer
         }
     }
     async doSync(userDataSyncStoreType, syncHeaders) {
-        const globalStateUserData = await this.userDataSyncStoreClient.readResource("globalState" , null, undefined, syncHeaders);
+        const globalStateUserData = await this.userDataSyncStoreClient.readResource(SyncResource.GlobalState, null, undefined, syncHeaders);
         const remoteGlobalState = this.parseGlobalState(globalStateUserData) || { storage: {} };
         remoteGlobalState.storage[SYNC_SERVICE_URL_TYPE] = { value: userDataSyncStoreType, version: GLOBAL_STATE_DATA_VERSION };
         const machineId = await getServiceMachineId(this.environmentService, this.fileService, this.storageService);
         const syncDataToUpdate = { version: GLOBAL_STATE_DATA_VERSION, machineId, content: stringify(remoteGlobalState, false) };
-        await this.userDataSyncStoreClient.writeResource("globalState" , JSON.stringify(syncDataToUpdate), globalStateUserData.ref, undefined, syncHeaders);
+        await this.userDataSyncStoreClient.writeResource(SyncResource.GlobalState, JSON.stringify(syncDataToUpdate), globalStateUserData.ref, undefined, syncHeaders);
     }
     parseGlobalState({ content }) {
         if (!content) {

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

@@ -3,11 +3,12 @@ import { isNonEmptyArray } from 'vscode/vscode/vs/base/common/arrays';
 import { VSBuffer } from 'vscode/vscode/vs/base/common/buffer';
 import { Event } from 'vscode/vscode/vs/base/common/event';
 import { parse } from 'vscode/vscode/vs/base/common/json';
-import { OS } from 'vscode/vscode/vs/base/common/platform';
+import { OS, OperatingSystem } from 'vscode/vscode/vs/base/common/platform';
 import { isUndefined } from 'vscode/vscode/vs/base/common/types';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { IEnvironmentService } from 'vscode/vscode/vs/platform/environment/common/environment.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';
@@ -15,7 +16,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 } from './keybindingsMerge.js';
-import { USER_DATA_SYNC_SCHEME, UserDataSyncError, CONFIG_SYNC_KEYBINDINGS_PER_PLATFORM } from 'vscode/vscode/vs/platform/userDataSync/common/userDataSync';
+import { SyncResource, USER_DATA_SYNC_SCHEME, UserDataSyncError, UserDataSyncErrorCode, Change, CONFIG_SYNC_KEYBINDINGS_PER_PLATFORM } from 'vscode/vscode/vs/platform/userDataSync/common/userDataSync';
 import { IUserDataSyncStoreService, IUserDataSyncLocalStoreService, IUserDataSyncLogService, IUserDataSyncEnablementService, IUserDataSyncUtilService } from 'vscode/vscode/vs/platform/userDataSync/common/userDataSync.service';
 
 const _moduleId = "vs/platform/userDataSync/common/keybindingsSync";
@@ -26,11 +27,11 @@ function getKeybindingsContentFromSyncContent(syncContent, platformSpecific, log
             return isUndefined(parsed.all) ? null : parsed.all;
         }
         switch (OS) {
-            case 2 :
+            case OperatingSystem.Macintosh:
                 return isUndefined(parsed.mac) ? null : parsed.mac;
-            case 3 :
+            case OperatingSystem.Linux:
                 return isUndefined(parsed.linux) ? null : parsed.linux;
-            case 1 :
+            case OperatingSystem.Windows:
                 return isUndefined(parsed.windows) ? null : parsed.windows;
         }
     }
@@ -41,7 +42,7 @@ function getKeybindingsContentFromSyncContent(syncContent, platformSpecific, log
 }
 let KeybindingsSynchroniser = class KeybindingsSynchroniser extends AbstractJsonFileSynchroniser {
     constructor(profile, collection, userDataSyncStoreService, userDataSyncLocalStoreService, logService, configurationService, userDataSyncEnablementService, fileService, environmentService, storageService, userDataSyncUtilService, telemetryService, uriIdentityService) {
-        super(profile.keybindingsResource, { syncResource: "keybindings" , profile }, collection, fileService, environmentService, storageService, userDataSyncStoreService, userDataSyncLocalStoreService, userDataSyncEnablementService, telemetryService, logService, userDataSyncUtilService, configurationService, uriIdentityService);
+        super(profile.keybindingsResource, { syncResource: SyncResource.Keybindings, profile }, collection, fileService, environmentService, storageService, userDataSyncStoreService, userDataSyncLocalStoreService, userDataSyncEnablementService, telemetryService, logService, userDataSyncUtilService, configurationService, uriIdentityService);
         this.version = 2;
         this.previewResource = this.extUri.joinPath(this.syncPreviewFolder, 'keybindings.json');
         this.baseResource = this.previewResource.with({ scheme: USER_DATA_SYNC_SCHEME, authority: 'base' });
@@ -68,7 +69,7 @@ let KeybindingsSynchroniser = class KeybindingsSynchroniser extends AbstractJson
                     _moduleId,
                     0,
                     "Unable to sync keybindings because the content in the file is not valid. Please open the file and correct it."
-                ), "LocalInvalidContent" , this.resource));
+                ), UserDataSyncErrorCode.LocalInvalidContent, this.resource));
             }
             if (!lastSyncContent
                 || lastSyncContent !== localContent
@@ -91,8 +92,8 @@ let KeybindingsSynchroniser = class KeybindingsSynchroniser extends AbstractJson
         }
         const previewResult = {
             content: hasConflicts ? lastSyncContent : mergedContent,
-            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;
@@ -129,15 +130,15 @@ let KeybindingsSynchroniser = class KeybindingsSynchroniser extends AbstractJson
         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)) {
@@ -151,8 +152,8 @@ let KeybindingsSynchroniser = class KeybindingsSynchroniser extends AbstractJson
             else {
                 return {
                     content,
-                    localChange: 2 ,
-                    remoteChange: 2 ,
+                    localChange: Change.Modified,
+                    remoteChange: Change.Modified,
                 };
             }
         }
@@ -161,7 +162,7 @@ let KeybindingsSynchroniser = class KeybindingsSynchroniser extends AbstractJson
     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 keybindings.`);
         }
         if (content !== null) {
@@ -172,10 +173,10 @@ let KeybindingsSynchroniser = class KeybindingsSynchroniser extends AbstractJson
                     _moduleId,
                     0,
                     "Unable to sync keybindings because the content in the file is not valid. Please open the file and correct it."
-                ), "LocalInvalidContent" , this.resource));
+                ), UserDataSyncErrorCode.LocalInvalidContent, this.resource));
             }
         }
-        if (localChange !== 0 ) {
+        if (localChange !== Change.None) {
             this.logService.trace(`${this.syncResourceLogLabel}: Updating local keybindings...`);
             if (fileContent) {
                 await this.backupLocal(this.toSyncContent(( fileContent.value.toString())));
@@ -183,7 +184,7 @@ let KeybindingsSynchroniser = class KeybindingsSynchroniser extends AbstractJson
             await this.updateLocalFileContent(content || '[]', fileContent, force);
             this.logService.info(`${this.syncResourceLogLabel}: Updated local keybindings`);
         }
-        if (remoteChange !== 0 ) {
+        if (remoteChange !== Change.None) {
             this.logService.trace(`${this.syncResourceLogLabel}: Updating remote keybindings...`);
             const remoteContents = this.toSyncContent(content || '[]', remoteUserData.syncData?.content);
             remoteUserData = await this.updateRemoteUserData(remoteContents, force ? null : remoteUserData.ref);
@@ -210,7 +211,7 @@ let KeybindingsSynchroniser = class KeybindingsSynchroniser extends AbstractJson
             }
         }
         catch (error) {
-            if (error.fileOperationResult !== 1 ) {
+            if (error.fileOperationResult !== FileOperationResult.FILE_NOT_FOUND) {
                 return true;
             }
         }
@@ -249,13 +250,13 @@ let KeybindingsSynchroniser = class KeybindingsSynchroniser extends AbstractJson
             parsed.all = keybindingsContent;
         }
         switch (OS) {
-            case 2 :
+            case OperatingSystem.Macintosh:
                 parsed.mac = keybindingsContent;
                 break;
-            case 3 :
+            case OperatingSystem.Linux:
                 parsed.linux = keybindingsContent;
                 break;
-            case 1 :
+            case OperatingSystem.Windows:
                 parsed.windows = keybindingsContent;
                 break;
         }
@@ -280,7 +281,7 @@ KeybindingsSynchroniser = ( __decorate([
 ], KeybindingsSynchroniser));
 let KeybindingsInitializer = class KeybindingsInitializer extends AbstractInitializer {
     constructor(fileService, userDataProfilesService, environmentService, logService, storageService, uriIdentityService) {
-        super("keybindings" , userDataProfilesService, environmentService, logService, fileService, storageService, uriIdentityService);
+        super(SyncResource.Keybindings, userDataProfilesService, environmentService, logService, fileService, storageService, uriIdentityService);
     }
     async doInitialize(remoteUserData) {
         const keybindingsContent = remoteUserData.syncData ? this.getKeybindingsContentFromSyncContent(remoteUserData.syncData.content) : null;
@@ -303,7 +304,7 @@ let KeybindingsInitializer = class KeybindingsInitializer extends AbstractInitia
             return !isNonEmptyArray(keybindings);
         }
         catch (error) {
-            return error.fileOperationResult === 1 ;
+            return error.fileOperationResult === FileOperationResult.FILE_NOT_FOUND;
         }
     }
     getKeybindingsContentFromSyncContent(syncContent) {