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

package/vscode/src/vs/workbench/services/userDataProfile/browser/userDataProfileStorageService.js

@@ -1,9 +1,10 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { Emitter, Event } from 'vscode/vscode/vs/base/common/event';
+import 'vscode/vscode/vs/platform/instantiation/common/extensions';
 import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
 import { AbstractUserDataProfileStorageService } from '../../../../platform/userDataProfile/common/userDataProfileStorageService.js';
 import 'vscode/vscode/vs/platform/instantiation/common/instantiation';
-import { isProfileUsingDefaultStorage } from 'vscode/vscode/vs/platform/storage/common/storage';
+import { StorageScope, isProfileUsingDefaultStorage } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
 import { IndexedDBStorageDatabase } from 'vscode/vscode/vs/workbench/services/storage/browser/storageService';
 import { IUserDataProfileService } from 'vscode/vscode/vs/workbench/services/userDataProfile/common/userDataProfile.service';
@@ -17,8 +18,8 @@ let UserDataProfileStorageService = class UserDataProfileStorageService extends
         this._onDidChange = this._register(( new Emitter()));
         this.onDidChange = this._onDidChange.event;
         const disposables = this._register(( new DisposableStore()));
-        this._register(Event.filter(storageService.onDidChangeTarget, e => e.scope === 0 , disposables)(() => this.onDidChangeStorageTargetInCurrentProfile()));
-        this._register(storageService.onDidChangeValue(0 , undefined, disposables)(e => this.onDidChangeStorageValueInCurrentProfile(e)));
+        this._register(Event.filter(storageService.onDidChangeTarget, e => e.scope === StorageScope.PROFILE, disposables)(() => this.onDidChangeStorageTargetInCurrentProfile()));
+        this._register(storageService.onDidChangeValue(StorageScope.PROFILE, undefined, disposables)(e => this.onDidChangeStorageValueInCurrentProfile(e)));
     }
     onDidChangeStorageTargetInCurrentProfile() {
         this._onDidChange.fire({ targetChanges: [this.userDataProfileService.currentProfile], valueChanges: [] });

package/vscode/src/vs/workbench/services/userDataSync/browser/userDataSyncInit.js

@@ -1,4 +1,5 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+import { StorageScope } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
 import { AbstractExtensionsInitializer } from '../../../../platform/userDataSync/common/extensionsSync.js';
 import { UserDataSyncStoreTypeSynchronizer, GlobalStateInitializer } from '../../../../platform/userDataSync/common/globalStateSync.js';
@@ -10,6 +11,7 @@ import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
 import { UserDataSyncStoreClient } from 'vscode/vscode/vs/platform/userDataSync/common/userDataSyncStoreService';
 import { IProductService } from 'vscode/vscode/vs/platform/product/common/productService.service';
 import { IRequestService } from 'vscode/vscode/vs/platform/request/common/request.service';
+import { SyncResource } from 'vscode/vscode/vs/platform/userDataSync/common/userDataSync';
 import { IUserDataSyncStoreManagementService, IUserDataSyncLogService } from 'vscode/vscode/vs/platform/userDataSync/common/userDataSync.service';
 import { getCurrentAuthenticationSessionInfo } from 'vscode/vscode/vs/workbench/services/authentication/browser/authenticationService';
 import { getSyncAreaLabel } from 'vscode/vscode/vs/workbench/services/userDataSync/common/userDataSync';
@@ -60,11 +62,11 @@ let UserDataSyncInitializer = class UserDataSyncInitializer {
                         this.logService.trace(`Skipping initializing user data in desktop`);
                         return;
                     }
-                    if (!this.storageService.isNew(-1 )) {
+                    if (!this.storageService.isNew(StorageScope.APPLICATION)) {
                         this.logService.trace(`Skipping initializing user data as application was opened before`);
                         return;
                     }
-                    if (!this.storageService.isNew(1 )) {
+                    if (!this.storageService.isNew(StorageScope.WORKSPACE)) {
                         this.logService.trace(`Skipping initializing user data as workspace was opened before`);
                         return;
                     }
@@ -133,7 +135,7 @@ let UserDataSyncInitializer = class UserDataSyncInitializer {
                 this.storageService
             )));
             userDataSyncStoreClient.setAuthToken(authenticationSession.accessToken, authenticationSession.providerId);
-            this.globalStateUserData = await userDataSyncStoreClient.readResource("globalState" , null);
+            this.globalStateUserData = await userDataSyncStoreClient.readResource(SyncResource.GlobalState, null);
             if (this.globalStateUserData) {
                 const userDataSyncStoreType = ( new UserDataSyncStoreTypeSynchronizer(
                     userDataSyncStoreClient,
@@ -165,12 +167,12 @@ let UserDataSyncInitializer = class UserDataSyncInitializer {
     }
     async initializeRequiredResources() {
         this.logService.trace(`UserDataInitializationService#initializeRequiredResources`);
-        return this.initialize(["settings" , "globalState" ]);
+        return this.initialize([SyncResource.Settings, SyncResource.GlobalState]);
     }
     async initializeOtherResources(instantiationService) {
         try {
             this.logService.trace(`UserDataInitializationService#initializeOtherResources`);
-            await Promise.allSettled([this.initialize(["keybindings" , "snippets" , "tasks" ]), this.initializeExtensions(instantiationService)]);
+            await Promise.allSettled([this.initialize([SyncResource.Keybindings, SyncResource.Snippets, SyncResource.Tasks]), this.initializeExtensions(instantiationService)]);
         }
         finally {
             this.initializationFinished.open();
@@ -181,7 +183,7 @@ let UserDataSyncInitializer = class UserDataSyncInitializer {
             await Promise.all([this.initializeInstalledExtensions(instantiationService), this.initializeNewExtensions(instantiationService)]);
         }
         finally {
-            this.initialized.push("extensions" );
+            this.initialized.push(SyncResource.Extensions);
         }
     }
     async initializeInstalledExtensions(instantiationService) {
@@ -215,7 +217,7 @@ let UserDataSyncInitializer = class UserDataSyncInitializer {
                 if (!userDataSyncStoreClient) {
                     return null;
                 }
-                const userData = await userDataSyncStoreClient.readResource("extensions" , null);
+                const userData = await userDataSyncStoreClient.readResource(SyncResource.Extensions, null);
                 return instantiationService.createInstance(ExtensionsPreviewInitializer, userData);
             })();
         }
@@ -235,7 +237,7 @@ let UserDataSyncInitializer = class UserDataSyncInitializer {
                 this.initialized.push(syncResource);
                 this.logService.trace(`Initializing ${getSyncAreaLabel(syncResource)}`);
                 const initializer = this.createSyncResourceInitializer(syncResource);
-                const userData = await userDataSyncStoreClient.readResource(syncResource, syncResource === "globalState"  ? this.globalStateUserData : null);
+                const userData = await userDataSyncStoreClient.readResource(syncResource, syncResource === SyncResource.GlobalState ? this.globalStateUserData : null);
                 await initializer.initialize(userData);
                 this.logService.info(`Initialized ${getSyncAreaLabel(syncResource)}`);
             }
@@ -247,7 +249,7 @@ let UserDataSyncInitializer = class UserDataSyncInitializer {
     }
     createSyncResourceInitializer(syncResource) {
         switch (syncResource) {
-            case "settings" : return ( new SettingsInitializer(
+            case SyncResource.Settings: return ( new SettingsInitializer(
                 this.fileService,
                 this.userDataProfilesService,
                 this.environmentService,
@@ -255,7 +257,7 @@ let UserDataSyncInitializer = class UserDataSyncInitializer {
                 this.storageService,
                 this.uriIdentityService
             ));
-            case "keybindings" : return ( new KeybindingsInitializer(
+            case SyncResource.Keybindings: return ( new KeybindingsInitializer(
                 this.fileService,
                 this.userDataProfilesService,
                 this.environmentService,
@@ -263,7 +265,7 @@ let UserDataSyncInitializer = class UserDataSyncInitializer {
                 this.storageService,
                 this.uriIdentityService
             ));
-            case "tasks" : return ( new TasksInitializer(
+            case SyncResource.Tasks: return ( new TasksInitializer(
                 this.fileService,
                 this.userDataProfilesService,
                 this.environmentService,
@@ -271,7 +273,7 @@ let UserDataSyncInitializer = class UserDataSyncInitializer {
                 this.storageService,
                 this.uriIdentityService
             ));
-            case "snippets" : return ( new SnippetsInitializer(
+            case SyncResource.Snippets: return ( new SnippetsInitializer(
                 this.fileService,
                 this.userDataProfilesService,
                 this.environmentService,
@@ -279,7 +281,7 @@ let UserDataSyncInitializer = class UserDataSyncInitializer {
                 this.storageService,
                 this.uriIdentityService
             ));
-            case "globalState" : return ( new GlobalStateInitializer(
+            case SyncResource.GlobalState: return ( new GlobalStateInitializer(
                 this.storageService,
                 this.fileService,
                 this.userDataProfilesService,