@codingame/monaco-vscode-api 5.2.0 → 6.0.0

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

@@ -11,14 +11,15 @@ import { isUndefined } from '../../../base/common/types.js';
 import { localizeWithPath } from '../../../nls.js';
 import { IConfigurationService } from '../../configuration/common/configuration.service.js';
 import { IEnvironmentService } from '../../environment/common/environment.service.js';
-import { toFileOperationResult, FileOperationError } from '../../files/common/files.js';
+import { toFileOperationResult, FileOperationResult, FileOperationError } from '../../files/common/files.js';
 import { IFileService } from '../../files/common/files.service.js';
 import { ILogService } from '../../log/common/log.service.js';
 import { getServiceMachineId } from '../../externalServices/common/serviceMachineId.js';
+import { StorageScope, StorageTarget } from '../../storage/common/storage.js';
 import { IStorageService } from '../../storage/common/storage.service.js';
 import { ITelemetryService } from '../../telemetry/common/telemetry.service.js';
 import { IUriIdentityService } from '../../uriIdentity/common/uriIdentity.service.js';
-import { getPathSegments, PREVIEW_DIR_NAME, getLastSyncResourceUri, UserDataSyncError, USER_DATA_SYNC_SCHEME, USER_DATA_SYNC_CONFIGURATION_SCOPE } from './userDataSync.js';
+import { SyncStatus, getPathSegments, PREVIEW_DIR_NAME, getLastSyncResourceUri, UserDataSyncError, UserDataSyncErrorCode, MergeState, USER_DATA_SYNC_SCHEME, Change, USER_DATA_SYNC_CONFIGURATION_SCOPE } from './userDataSync.js';
 import { IUserDataSyncStoreService, IUserDataSyncLocalStoreService, IUserDataSyncEnablementService, IUserDataSyncLogService, IUserDataSyncUtilService } from './userDataSync.service.js';
 import { IUserDataProfilesService } from '../../userDataProfile/common/userDataProfile.service.js';
 const _moduleId = "vs/platform/userDataSync/common/abstractSynchronizer";
@@ -64,7 +65,7 @@ let AbstractSynchroniser = class AbstractSynchroniser extends Disposable {
         this.logService = logService;
         this.configurationService = configurationService;
         this.syncPreviewPromise = null;
-        this._status = "idle" ;
+        this._status = SyncStatus.Idle;
         this._onDidChangStatus = this._register(( new Emitter()));
         this.onDidChangeStatus = this._onDidChangStatus.event;
         this._conflicts = [];
@@ -88,7 +89,7 @@ let AbstractSynchroniser = class AbstractSynchroniser extends Disposable {
         this.localChangeTriggerThrottler.trigger(() => this.doTriggerLocalChange());
     }
     async doTriggerLocalChange() {
-        if (this.status === "hasConflicts" ) {
+        if (this.status === SyncStatus.HasConflicts) {
             this.logService.info(`${this.syncResourceLogLabel}: In conflicts state and local change detected. Syncing again...`);
             const preview = await this.syncPreviewPromise;
             this.syncPreviewPromise = null;
@@ -130,25 +131,25 @@ let AbstractSynchroniser = class AbstractSynchroniser extends Disposable {
     async _sync(manifest, apply, userDataSyncConfiguration, headers) {
         try {
             this.syncHeaders = { ...headers };
-            if (this.status === "hasConflicts" ) {
+            if (this.status === SyncStatus.HasConflicts) {
                 this.logService.info(`${this.syncResourceLogLabel}: Skipped synchronizing ${this.resource.toLowerCase()} as there are conflicts.`);
                 return this.syncPreviewPromise;
             }
-            if (this.status === "syncing" ) {
+            if (this.status === SyncStatus.Syncing) {
                 this.logService.info(`${this.syncResourceLogLabel}: Skipped synchronizing ${this.resource.toLowerCase()} as it is running already.`);
                 return this.syncPreviewPromise;
             }
             this.logService.trace(`${this.syncResourceLogLabel}: Started synchronizing ${this.resource.toLowerCase()}...`);
-            this.setStatus("syncing" );
-            let status = "idle" ;
+            this.setStatus(SyncStatus.Syncing);
+            let status = SyncStatus.Idle;
             try {
                 const lastSyncUserData = await this.getLastSyncUserData();
                 const remoteUserData = await this.getLatestRemoteUserData(manifest, lastSyncUserData);
                 status = await this.performSync(remoteUserData, lastSyncUserData, apply, userDataSyncConfiguration);
-                if (status === "hasConflicts" ) {
+                if (status === SyncStatus.HasConflicts) {
                     this.logService.info(`${this.syncResourceLogLabel}: Detected conflicts while synchronizing ${this.resource.toLowerCase()}.`);
                 }
-                else if (status === "idle" ) {
+                else if (status === SyncStatus.Idle) {
                     this.logService.trace(`${this.syncResourceLogLabel}: Finished synchronizing ${this.resource.toLowerCase()}.`);
                 }
                 return this.syncPreviewPromise || null;
@@ -169,7 +170,7 @@ let AbstractSynchroniser = class AbstractSynchroniser extends Disposable {
         await this.stop();
         try {
             this.logService.trace(`${this.syncResourceLogLabel}: Started resetting ${this.resource.toLowerCase()}...`);
-            this.setStatus("syncing" );
+            this.setStatus(SyncStatus.Syncing);
             const lastSyncUserData = await this.getLastSyncUserData();
             const remoteUserData = await this.getLatestRemoteUserData(null, lastSyncUserData);
             const isRemoteDataFromCurrentMachine = await this.isRemoteDataFromCurrentMachine(remoteUserData);
@@ -178,13 +179,13 @@ let AbstractSynchroniser = class AbstractSynchroniser extends Disposable {
             for (const resourcePreviewResult of resourcePreviewResults) {
                 const acceptResult = await this.getAcceptResult(resourcePreviewResult, resourcePreviewResult.remoteResource, undefined, CancellationToken.None);
                 const { remoteChange } = await this.getAcceptResult(resourcePreviewResult, resourcePreviewResult.previewResource, resourcePreviewResult.remoteContent, CancellationToken.None);
-                resourcePreviews.push([resourcePreviewResult, { ...acceptResult, remoteChange: remoteChange !== 0  ? remoteChange : 2  }]);
+                resourcePreviews.push([resourcePreviewResult, { ...acceptResult, remoteChange: remoteChange !== Change.None ? remoteChange : Change.Modified }]);
             }
             await this.applyResult(remoteUserData, lastSyncUserData, resourcePreviews, false);
             this.logService.info(`${this.syncResourceLogLabel}: Finished resetting ${this.resource.toLowerCase()}.`);
         }
         finally {
-            this.setStatus("idle" );
+            this.setStatus(SyncStatus.Idle);
         }
         return true;
     }
@@ -214,7 +215,7 @@ let AbstractSynchroniser = class AbstractSynchroniser extends Disposable {
                 this.resource,
                 this.version,
                 remoteUserData.syncData.version
-            ), "IncompatibleLocalContent" , this.resource));
+            ), UserDataSyncErrorCode.IncompatibleLocalContent, this.resource));
         }
         try {
             return await this.doSync(remoteUserData, lastSyncUserData, apply, userDataSyncConfiguration);
@@ -222,11 +223,11 @@ let AbstractSynchroniser = class AbstractSynchroniser extends Disposable {
         catch (e) {
             if (e instanceof UserDataSyncError) {
                 switch (e.code) {
-                    case "LocalPreconditionFailed" :
+                    case UserDataSyncErrorCode.LocalPreconditionFailed:
                         this.logService.info(`${this.syncResourceLogLabel}: Failed to synchronize ${this.syncResourceLogLabel} as there is a new local version available. Synchronizing again...`);
                         return this.performSync(remoteUserData, lastSyncUserData, apply, userDataSyncConfiguration);
-                    case "Conflict" :
-                    case "PreconditionFailed" :
+                    case UserDataSyncErrorCode.Conflict:
+                    case UserDataSyncErrorCode.PreconditionFailed:
                         this.logService.info(`${this.syncResourceLogLabel}: Failed to synchronize as there is a new remote version available. Synchronizing again...`);
                         remoteUserData = await this.getRemoteUserData(null);
                         lastSyncUserData = await this.getLastSyncUserData();
@@ -252,13 +253,13 @@ let AbstractSynchroniser = class AbstractSynchroniser extends Disposable {
                 }
             }
             this.updateConflicts(preview.resourcePreviews);
-            if (( preview.resourcePreviews.some(({ mergeState }) => mergeState === "conflict" ))) {
-                return "hasConflicts" ;
+            if (( preview.resourcePreviews.some(({ mergeState }) => mergeState === MergeState.Conflict))) {
+                return SyncStatus.HasConflicts;
             }
             if (apply) {
                 return await this.doApply(false);
             }
-            return "syncing" ;
+            return SyncStatus.Syncing;
         }
         catch (error) {
             this.syncPreviewPromise = null;
@@ -273,7 +274,7 @@ let AbstractSynchroniser = class AbstractSynchroniser extends Disposable {
                 ? await this.getAcceptResult(resourcePreview, resourcePreview.previewResource, undefined, CancellationToken.None)
                 : undefined;
             resourcePreview.acceptResult = acceptResult;
-            resourcePreview.mergeState = mergeResult.hasConflicts ? "conflict"  : acceptResult ? "accepted"  : "preview" ;
+            resourcePreview.mergeState = mergeResult.hasConflicts ? MergeState.Conflict : acceptResult ? MergeState.Accepted : MergeState.Preview;
             resourcePreview.localChange = acceptResult ? acceptResult.localChange : mergeResult.localChange;
             resourcePreview.remoteChange = acceptResult ? acceptResult.remoteChange : mergeResult.remoteChange;
             return resourcePreview;
@@ -284,7 +285,7 @@ let AbstractSynchroniser = class AbstractSynchroniser extends Disposable {
         await this.updateSyncResourcePreview(resource, async (resourcePreview) => {
             const acceptResult = await this.getAcceptResult(resourcePreview, resource, content, CancellationToken.None);
             resourcePreview.acceptResult = acceptResult;
-            resourcePreview.mergeState = "accepted" ;
+            resourcePreview.mergeState = MergeState.Accepted;
             resourcePreview.localChange = acceptResult.localChange;
             resourcePreview.remoteChange = acceptResult.remoteChange;
             return resourcePreview;
@@ -296,7 +297,7 @@ let AbstractSynchroniser = class AbstractSynchroniser extends Disposable {
             const mergeResult = await this.getMergeResult(resourcePreview, CancellationToken.None);
             await this.fileService.writeFile(resourcePreview.previewResource, VSBuffer.fromString(mergeResult.content || ''));
             resourcePreview.acceptResult = undefined;
-            resourcePreview.mergeState = "preview" ;
+            resourcePreview.mergeState = MergeState.Preview;
             resourcePreview.localChange = mergeResult.localChange;
             resourcePreview.remoteChange = mergeResult.remoteChange;
             return resourcePreview;
@@ -322,28 +323,28 @@ let AbstractSynchroniser = class AbstractSynchroniser extends Disposable {
         });
         preview = await this.syncPreviewPromise;
         this.updateConflicts(preview.resourcePreviews);
-        if (( preview.resourcePreviews.some(({ mergeState }) => mergeState === "conflict" ))) {
-            this.setStatus("hasConflicts" );
+        if (( preview.resourcePreviews.some(({ mergeState }) => mergeState === MergeState.Conflict))) {
+            this.setStatus(SyncStatus.HasConflicts);
         }
         else {
-            this.setStatus("syncing" );
+            this.setStatus(SyncStatus.Syncing);
         }
     }
     async doApply(force) {
         if (!this.syncPreviewPromise) {
-            return "idle" ;
+            return SyncStatus.Idle;
         }
         const preview = await this.syncPreviewPromise;
-        if (( preview.resourcePreviews.some(({ mergeState }) => mergeState === "conflict" ))) {
-            return "hasConflicts" ;
+        if (( preview.resourcePreviews.some(({ mergeState }) => mergeState === MergeState.Conflict))) {
+            return SyncStatus.HasConflicts;
         }
-        if (( preview.resourcePreviews.some(({ mergeState }) => mergeState !== "accepted" ))) {
-            return "syncing" ;
+        if (( preview.resourcePreviews.some(({ mergeState }) => mergeState !== MergeState.Accepted))) {
+            return SyncStatus.Syncing;
         }
         await this.applyResult(preview.remoteUserData, preview.lastSyncUserData, ( preview.resourcePreviews.map(resourcePreview => ([resourcePreview, resourcePreview.acceptResult]))), force);
         this.syncPreviewPromise = null;
         await this.clearPreviewFolder();
-        return "idle" ;
+        return SyncStatus.Idle;
     }
     async clearPreviewFolder() {
         try {
@@ -352,7 +353,7 @@ let AbstractSynchroniser = class AbstractSynchroniser extends Disposable {
         catch (error) {  }
     }
     updateConflicts(resourcePreviews) {
-        const conflicts = resourcePreviews.filter(({ mergeState }) => mergeState === "conflict" );
+        const conflicts = resourcePreviews.filter(({ mergeState }) => mergeState === MergeState.Conflict);
         if (!equals(this._conflicts, conflicts, (a, b) => this.extUri.isEqual(a.previewResource, b.previewResource))) {
             this._conflicts = conflicts;
             this._onDidChangeConflicts.fire(this.conflicts);
@@ -383,12 +384,12 @@ let AbstractSynchroniser = class AbstractSynchroniser extends Disposable {
         return null;
     }
     async resetLocal() {
-        this.storageService.remove(this.lastSyncUserDataStateKey, -1 );
+        this.storageService.remove(this.lastSyncUserDataStateKey, StorageScope.APPLICATION);
         try {
             await this.fileService.del(this.lastSyncResource);
         }
         catch (error) {
-            if (toFileOperationResult(error) !== 1 ) {
+            if (toFileOperationResult(error) !== FileOperationResult.FILE_NOT_FOUND) {
                 this.logService.error(error);
             }
         }
@@ -398,12 +399,12 @@ let AbstractSynchroniser = class AbstractSynchroniser extends Disposable {
         const resourcePreviews = [];
         for (const resourcePreviewResult of resourcePreviewResults) {
             const acceptedResource = resourcePreviewResult.previewResource.with({ scheme: USER_DATA_SYNC_SCHEME, authority: 'accepted' });
-            if (resourcePreviewResult.localChange === 0  && resourcePreviewResult.remoteChange === 0 ) {
+            if (resourcePreviewResult.localChange === Change.None && resourcePreviewResult.remoteChange === Change.None) {
                 resourcePreviews.push({
                     ...resourcePreviewResult,
                     acceptedResource,
-                    acceptResult: { content: null, localChange: 0 , remoteChange: 0  },
-                    mergeState: "accepted"
+                    acceptResult: { content: null, localChange: Change.None, remoteChange: Change.None },
+                    mergeState: MergeState.Accepted
                 });
             }
             else {
@@ -418,7 +419,7 @@ let AbstractSynchroniser = class AbstractSynchroniser extends Disposable {
                 resourcePreviews.push({
                     ...resourcePreviewResult,
                     acceptResult,
-                    mergeState: mergeResult?.hasConflicts ? "conflict"  : acceptResult ? "accepted"  : "preview" ,
+                    mergeState: mergeResult?.hasConflicts ? MergeState.Conflict : acceptResult ? MergeState.Accepted : MergeState.Preview,
                     localChange: acceptResult ? acceptResult.localChange : mergeResult ? mergeResult.localChange : resourcePreviewResult.localChange,
                     remoteChange: acceptResult ? acceptResult.remoteChange : mergeResult ? mergeResult.remoteChange : resourcePreviewResult.remoteChange
                 });
@@ -459,7 +460,7 @@ let AbstractSynchroniser = class AbstractSynchroniser extends Disposable {
                 break;
             }
             catch (error) {
-                if (error instanceof FileOperationError && error.fileOperationResult === 1 ) {
+                if (error instanceof FileOperationError && error.fileOperationResult === FileOperationResult.FILE_NOT_FOUND) {
                     this.logService.info(`${this.syncResourceLogLabel}: Last sync resource does not exist locally.`);
                     break;
                 }
@@ -478,7 +479,7 @@ let AbstractSynchroniser = class AbstractSynchroniser extends Disposable {
                 await this.writeLastSyncStoredRemoteUserData({ ref: lastSyncUserDataState.ref, syncData });
             }
             catch (error) {
-                if (error instanceof UserDataSyncError && error.code === "NotFound" ) {
+                if (error instanceof UserDataSyncError && error.code === UserDataSyncErrorCode.NotFound) {
                     this.logService.info(`${this.syncResourceLogLabel}: Last sync resource does not exist remotely.`);
                 }
                 else {
@@ -504,11 +505,11 @@ let AbstractSynchroniser = class AbstractSynchroniser extends Disposable {
             version,
             ...additionalProps
         };
-        this.storageService.store(this.lastSyncUserDataStateKey, JSON.stringify(lastSyncUserDataState), -1 , 1 );
+        this.storageService.store(this.lastSyncUserDataStateKey, JSON.stringify(lastSyncUserDataState), StorageScope.APPLICATION, StorageTarget.MACHINE);
         await this.writeLastSyncStoredRemoteUserData(lastSyncRemoteUserData);
     }
     getStoredLastSyncUserDataStateContent() {
-        return this.storageService.get(this.lastSyncUserDataStateKey, -1 );
+        return this.storageService.get(this.lastSyncUserDataStateKey, StorageScope.APPLICATION);
     }
     async readLastSyncStoredRemoteUserData() {
         const content = ( (await this.fileService.readFile(this.lastSyncResource)).value.toString());
@@ -535,7 +536,7 @@ let AbstractSynchroniser = class AbstractSynchroniser extends Disposable {
                 this.storageService.store(this.lastSyncUserDataStateKey, JSON.stringify({
                     ...userData,
                     content: undefined,
-                }), -1 , 1 );
+                }), StorageScope.APPLICATION, StorageTarget.MACHINE);
                 await this.writeLastSyncStoredRemoteUserData({ ref: userData.ref, syncData: userData.content === null ? null : JSON.parse(userData.content) });
             }
             else {
@@ -543,14 +544,14 @@ let AbstractSynchroniser = class AbstractSynchroniser extends Disposable {
             }
         }
         catch (error) {
-            if (error instanceof FileOperationError && error.fileOperationResult === 1 ) {
+            if (error instanceof FileOperationError && error.fileOperationResult === FileOperationResult.FILE_NOT_FOUND) {
                 this.logService.info(`${this.syncResourceLogLabel}: Migrating last sync user data. Resource does not exist.`);
             }
             else {
                 this.logService.error(error);
             }
         }
-        return this.storageService.get(this.lastSyncUserDataStateKey, -1 );
+        return this.storageService.get(this.lastSyncUserDataStateKey, StorageScope.APPLICATION);
     }
     async getRemoteUserData(lastSyncData) {
         const { ref, content } = await this.getUserData(lastSyncData);
@@ -574,7 +575,7 @@ let AbstractSynchroniser = class AbstractSynchroniser extends Disposable {
             _moduleId,
             1,
             "Cannot parse sync data as it is not compatible with the current version."
-        ), "IncompatibleRemoteContent" , this.resource));
+        ), UserDataSyncErrorCode.IncompatibleRemoteContent, this.resource));
     }
     async getUserData(lastSyncData) {
         const lastSyncUserData = lastSyncData ? { ref: lastSyncData.ref, content: lastSyncData.syncData ? JSON.stringify(lastSyncData.syncData) : null } : null;
@@ -588,7 +589,7 @@ let AbstractSynchroniser = class AbstractSynchroniser extends Disposable {
             return { ref, syncData };
         }
         catch (error) {
-            if (error instanceof UserDataSyncError && error.code === "TooLarge" ) {
+            if (error instanceof UserDataSyncError && error.code === UserDataSyncErrorCode.TooLarge) {
                 error = ( new UserDataSyncError(error.message, error.code, this.resource));
             }
             throw error;
@@ -599,7 +600,7 @@ let AbstractSynchroniser = class AbstractSynchroniser extends Disposable {
         return this.userDataSyncLocalStoreService.writeResource(this.resource, JSON.stringify(syncData), ( new Date()), this.syncResource.profile.isDefault ? undefined : this.syncResource.profile.id);
     }
     async stop() {
-        if (this.status === "idle" ) {
+        if (this.status === SyncStatus.Idle) {
             return;
         }
         this.logService.trace(`${this.syncResourceLogLabel}: Stopping synchronizing ${this.resource.toLowerCase()}.`);
@@ -609,7 +610,7 @@ let AbstractSynchroniser = class AbstractSynchroniser extends Disposable {
         }
         this.updateConflicts([]);
         await this.clearPreviewFolder();
-        this.setStatus("idle" );
+        this.setStatus(SyncStatus.Idle);
         this.logService.info(`${this.syncResourceLogLabel}: Stopped synchronizing ${this.resource.toLowerCase()}.`);
     }
     getUserDataSyncConfiguration() {
@@ -653,12 +654,9 @@ let AbstractFileSynchroniser = class AbstractFileSynchroniser extends AbstractSy
             }
         }
         catch (e) {
-            if (((e instanceof FileOperationError && e.fileOperationResult === 1) ) ||
-                ((e instanceof FileOperationError && e.fileOperationResult === 3) )) {
-                throw ( new UserDataSyncError(
-                    e.message,
-                    "LocalPreconditionFailed"
-                ));
+            if ((e instanceof FileOperationError && e.fileOperationResult === FileOperationResult.FILE_NOT_FOUND) ||
+                (e instanceof FileOperationError && e.fileOperationResult === FileOperationResult.FILE_MODIFIED_SINCE)) {
+                throw ( new UserDataSyncError(e.message, UserDataSyncErrorCode.LocalPreconditionFailed));
             }
             else {
                 throw e;
@@ -670,7 +668,7 @@ let AbstractFileSynchroniser = class AbstractFileSynchroniser extends AbstractSy
             await this.fileService.del(this.file);
         }
         catch (e) {
-            if (!((e instanceof FileOperationError && e.fileOperationResult === 1) )) {
+            if (!(e instanceof FileOperationError && e.fileOperationResult === FileOperationResult.FILE_NOT_FOUND)) {
                 throw e;
             }
         }
@@ -774,7 +772,7 @@ let AbstractInitializer = class AbstractInitializer {
             version: undefined,
             ...additionalProps
         };
-        this.storageService.store(`${this.resource}.lastSyncUserData`, JSON.stringify(lastSyncUserDataState), -1 , 1 );
+        this.storageService.store(`${this.resource}.lastSyncUserData`, JSON.stringify(lastSyncUserDataState), StorageScope.APPLICATION, StorageTarget.MACHINE);
         await this.fileService.writeFile(this.lastSyncResource, VSBuffer.fromString(JSON.stringify(lastSyncRemoteUserData)));
     }
 };

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

@@ -1,7 +1,7 @@
 import { distinct } from '../../../base/common/arrays.js';
 import { isObject, isString } from '../../../base/common/types.js';
 import { localizeWithPath } from '../../../nls.js';
-import { Extensions, allSettings } from '../../configuration/common/configurationRegistry.js';
+import { Extensions, ConfigurationScope, allSettings } from '../../configuration/common/configurationRegistry.js';
 import { EXTENSION_IDENTIFIER_PATTERN } from '../../extensionManagement/common/extensionManagement.js';
 import { Extensions as Extensions$1 } from '../../jsonschemas/common/jsonContributionRegistry.js';
 import { Registry } from '../../registry/common/platform.js';
@@ -13,7 +13,7 @@ function getDisallowedIgnoredSettings() {
 function getDefaultIgnoredSettings() {
     const allSettings = ( (Registry.as(Extensions.Configuration))).getConfigurationProperties();
     const ignoreSyncSettings = ( (Object.keys(allSettings))).filter(setting => !!allSettings[setting].ignoreSync);
-    const machineSettings = ( (Object.keys(allSettings))).filter(setting => allSettings[setting].scope === 2  || allSettings[setting].scope === 6 );
+    const machineSettings = ( (Object.keys(allSettings))).filter(setting => allSettings[setting].scope === ConfigurationScope.MACHINE || allSettings[setting].scope === ConfigurationScope.MACHINE_OVERRIDABLE);
     const disallowedSettings = getDisallowedIgnoredSettings();
     return distinct([...ignoreSyncSettings, ...machineSettings, ...disallowedSettings]);
 }
@@ -32,7 +32,7 @@ function registerConfiguration() {
                 type: 'boolean',
                 description: ( localizeWithPath(_moduleId, 1, "Synchronize keybindings for each platform.")),
                 default: true,
-                scope: 1 ,
+                scope: ConfigurationScope.APPLICATION,
                 tags: ['sync', 'usesOnlineServices']
             },
             'settingsSync.ignoredExtensions': {
@@ -52,7 +52,7 @@ function registerConfiguration() {
                         ))
                     }],
                 'default': [],
-                'scope': 1 ,
+                'scope': ConfigurationScope.APPLICATION,
                 uniqueItems: true,
                 disallowSyncIgnore: true,
                 tags: ['sync', 'usesOnlineServices']
@@ -61,7 +61,7 @@ function registerConfiguration() {
                 'type': 'array',
                 description: ( localizeWithPath(_moduleId, 4, "Configure settings to be ignored while synchronizing.")),
                 'default': [],
-                'scope': 1 ,
+                'scope': ConfigurationScope.APPLICATION,
                 $ref: ignoredSettingsSchemaId,
                 additionalProperties: true,
                 uniqueItems: true,
@@ -92,7 +92,18 @@ function isAuthenticationProvider(thing) {
         && isString(thing.id)
         && Array.isArray(thing.scopes);
 }
-const ALL_SYNC_RESOURCES = ["settings" , "keybindings" , "snippets" , "tasks" , "extensions" , "globalState" , "profiles" ];
+var SyncResource;
+( ((function(SyncResource) {
+    SyncResource["Settings"] = "settings";
+    SyncResource["Keybindings"] = "keybindings";
+    SyncResource["Snippets"] = "snippets";
+    SyncResource["Tasks"] = "tasks";
+    SyncResource["Extensions"] = "extensions";
+    SyncResource["GlobalState"] = "globalState";
+    SyncResource["Profiles"] = "profiles";
+    SyncResource["WorkspaceState"] = "workspaceState";
+})(SyncResource || (SyncResource = {}))));
+const ALL_SYNC_RESOURCES = [SyncResource.Settings, SyncResource.Keybindings, SyncResource.Snippets, SyncResource.Tasks, SyncResource.Extensions, SyncResource.GlobalState, SyncResource.Profiles];
 function getPathSegments(collection, ...paths) {
     return collection ? [collection, ...paths] : paths;
 }
@@ -106,6 +117,42 @@ function createSyncHeaders(executionId) {
     headers[HEADER_EXECUTION_ID] = executionId;
     return headers;
 }
+var UserDataSyncErrorCode;
+( ((function(UserDataSyncErrorCode) {
+    UserDataSyncErrorCode["Unauthorized"] = "Unauthorized";
+    UserDataSyncErrorCode["Forbidden"] = "Forbidden";
+    UserDataSyncErrorCode["NotFound"] = "NotFound";
+    UserDataSyncErrorCode["MethodNotFound"] = "MethodNotFound";
+    UserDataSyncErrorCode["Conflict"] = "Conflict";
+    UserDataSyncErrorCode["Gone"] = "Gone";
+    UserDataSyncErrorCode["PreconditionFailed"] = "PreconditionFailed";
+    UserDataSyncErrorCode["TooLarge"] = "TooLarge";
+    UserDataSyncErrorCode["UpgradeRequired"] = "UpgradeRequired";
+    UserDataSyncErrorCode["PreconditionRequired"] = "PreconditionRequired";
+    UserDataSyncErrorCode["TooManyRequests"] = "RemoteTooManyRequests";
+    UserDataSyncErrorCode["TooManyRequestsAndRetryAfter"] = "TooManyRequestsAndRetryAfter";
+    UserDataSyncErrorCode["RequestFailed"] = "RequestFailed";
+    UserDataSyncErrorCode["RequestCanceled"] = "RequestCanceled";
+    UserDataSyncErrorCode["RequestTimeout"] = "RequestTimeout";
+    UserDataSyncErrorCode["RequestProtocolNotSupported"] = "RequestProtocolNotSupported";
+    UserDataSyncErrorCode["RequestPathNotEscaped"] = "RequestPathNotEscaped";
+    UserDataSyncErrorCode["RequestHeadersNotObject"] = "RequestHeadersNotObject";
+    UserDataSyncErrorCode["NoCollection"] = "NoCollection";
+    UserDataSyncErrorCode["NoRef"] = "NoRef";
+    UserDataSyncErrorCode["EmptyResponse"] = "EmptyResponse";
+    UserDataSyncErrorCode["TurnedOff"] = "TurnedOff";
+    UserDataSyncErrorCode["SessionExpired"] = "SessionExpired";
+    UserDataSyncErrorCode["ServiceChanged"] = "ServiceChanged";
+    UserDataSyncErrorCode["DefaultServiceChanged"] = "DefaultServiceChanged";
+    UserDataSyncErrorCode["LocalTooManyProfiles"] = "LocalTooManyProfiles";
+    UserDataSyncErrorCode["LocalTooManyRequests"] = "LocalTooManyRequests";
+    UserDataSyncErrorCode["LocalPreconditionFailed"] = "LocalPreconditionFailed";
+    UserDataSyncErrorCode["LocalInvalidContent"] = "LocalInvalidContent";
+    UserDataSyncErrorCode["LocalError"] = "LocalError";
+    UserDataSyncErrorCode["IncompatibleLocalContent"] = "IncompatibleLocalContent";
+    UserDataSyncErrorCode["IncompatibleRemoteContent"] = "IncompatibleRemoteContent";
+    UserDataSyncErrorCode["Unknown"] = "Unknown";
+})(UserDataSyncErrorCode || (UserDataSyncErrorCode = {}))));
 class UserDataSyncError extends Error {
     constructor(message, code, resource, operationId) {
         super(message);
@@ -141,14 +188,34 @@ class UserDataAutoSyncError extends UserDataSyncError {
             );
         }
         return (
-             (new UserDataSyncError(error.message, "Unknown" ))
+             (new UserDataSyncError(error.message, UserDataSyncErrorCode.Unknown))
         );
     }
     UserDataSyncError.toUserDataSyncError = toUserDataSyncError;
 })(UserDataSyncError || (UserDataSyncError = {}))));
+var SyncStatus;
+( ((function(SyncStatus) {
+    SyncStatus["Uninitialized"] = "uninitialized";
+    SyncStatus["Idle"] = "idle";
+    SyncStatus["Syncing"] = "syncing";
+    SyncStatus["HasConflicts"] = "hasConflicts";
+})(SyncStatus || (SyncStatus = {}))));
+var Change;
+( ((function(Change) {
+    Change[Change["None"] = 0] = "None";
+    Change[Change["Added"] = 1] = "Added";
+    Change[Change["Modified"] = 2] = "Modified";
+    Change[Change["Deleted"] = 3] = "Deleted";
+})(Change || (Change = {}))));
+var MergeState;
+( ((function(MergeState) {
+    MergeState["Preview"] = "preview";
+    MergeState["Conflict"] = "conflict";
+    MergeState["Accepted"] = "accepted";
+})(MergeState || (MergeState = {}))));
 const SYNC_SERVICE_URL_TYPE = 'sync.store.url.type';
 function getEnablementKey(resource) { return `sync.enable.${resource}`; }
 const USER_DATA_SYNC_LOG_ID = 'userDataSync';
 const USER_DATA_SYNC_SCHEME = 'vscode-userdata-sync';
 const PREVIEW_DIR_NAME = 'preview';
-export { ALL_SYNC_RESOURCES, CONFIG_SYNC_KEYBINDINGS_PER_PLATFORM, HEADER_EXECUTION_ID, HEADER_OPERATION_ID, PREVIEW_DIR_NAME, SYNC_SERVICE_URL_TYPE, USER_DATA_SYNC_CONFIGURATION_SCOPE, USER_DATA_SYNC_LOG_ID, USER_DATA_SYNC_SCHEME, UserDataAutoSyncError, UserDataSyncError, UserDataSyncStoreError, createSyncHeaders, getDefaultIgnoredSettings, getDisallowedIgnoredSettings, getEnablementKey, getLastSyncResourceUri, getPathSegments, isAuthenticationProvider, registerConfiguration };
+export { ALL_SYNC_RESOURCES, CONFIG_SYNC_KEYBINDINGS_PER_PLATFORM, Change, HEADER_EXECUTION_ID, HEADER_OPERATION_ID, MergeState, PREVIEW_DIR_NAME, SYNC_SERVICE_URL_TYPE, SyncResource, SyncStatus, USER_DATA_SYNC_CONFIGURATION_SCOPE, USER_DATA_SYNC_LOG_ID, USER_DATA_SYNC_SCHEME, UserDataAutoSyncError, UserDataSyncError, UserDataSyncErrorCode, UserDataSyncStoreError, createSyncHeaders, getDefaultIgnoredSettings, getDisallowedIgnoredSettings, getEnablementKey, getLastSyncResourceUri, getPathSegments, isAuthenticationProvider, registerConfiguration };

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

@@ -1,13 +1,14 @@
 import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.js';
 import { Emitter } from '../../../base/common/event.js';
 import { Disposable } from '../../../base/common/lifecycle.js';
-import { isSafari, isChrome, isEdge, isFirefox, isAndroid, PlatformToString, isWeb, platform } from '../../../base/common/platform.js';
+import { isSafari, isChrome, isEdge, isFirefox, isAndroid, PlatformToString, isWeb, Platform, platform } from '../../../base/common/platform.js';
 import { escapeRegExpCharacters } from '../../../base/common/strings.js';
 import { localizeWithPath } from '../../../nls.js';
 import { IEnvironmentService } from '../../environment/common/environment.service.js';
 import { IFileService } from '../../files/common/files.service.js';
 import { IProductService } from '../../product/common/productService.service.js';
 import { getServiceMachineId } from '../../externalServices/common/serviceMachineId.js';
+import { StorageScope, StorageTarget } from '../../storage/common/storage.js';
 import { IStorageService } from '../../storage/common/storage.service.js';
 import { IUserDataSyncStoreService, IUserDataSyncLogService } from './userDataSync.service.js';
 var UserDataSyncMachinesService_1;
@@ -25,7 +26,7 @@ function isWebPlatform(platform) {
         case Edge:
         case Firefox:
         case Android:
-        case PlatformToString(0 ):
+        case PlatformToString(Platform.Web):
             return true;
     }
     return false;
@@ -46,7 +47,7 @@ function getPlatformName() {
     if (isAndroid) {
         return Android;
     }
-    return PlatformToString(isWeb ? 0  : platform);
+    return PlatformToString(isWeb ? Platform.Web : platform);
 }
 let UserDataSyncMachinesService = class UserDataSyncMachinesService extends Disposable {
     static { UserDataSyncMachinesService_1 = this; }
@@ -95,7 +96,7 @@ let UserDataSyncMachinesService = class UserDataSyncMachinesService extends Disp
             await this.writeMachinesData(machineData);
             const currentMachineId = await this.currentMachineIdPromise;
             if (machineId === currentMachineId) {
-                this.storageService.store(currentMachineNameKey, name, -1 , 1 );
+                this.storageService.store(currentMachineNameKey, name, StorageScope.APPLICATION, StorageTarget.MACHINE);
             }
         }
     }
@@ -110,7 +111,7 @@ let UserDataSyncMachinesService = class UserDataSyncMachinesService extends Disp
         await this.writeMachinesData(machineData);
     }
     computeCurrentMachineName(machines) {
-        const previousName = this.storageService.get(currentMachineNameKey, -1 );
+        const previousName = this.storageService.get(currentMachineNameKey, StorageScope.APPLICATION);
         if (previousName) {
             return previousName;
         }