@codingame/monaco-vscode-user-data-profile-service-override 9.0.3 → 10.0.0

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

@@ -1,5 +1,4 @@
 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 { IFileService } from 'vscode/vscode/vs/platform/files/common/files.service';
 import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
@@ -18,7 +17,6 @@ import { asJson } from 'vscode/vscode/vs/platform/request/common/request';
 import { IRequestService } from 'vscode/vscode/vs/platform/request/common/request.service';
 import { CancellationToken } from 'vscode/vscode/vs/base/common/cancellation';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
-import { ProfileResourceType } from 'vscode/vscode/vs/platform/userDataProfile/common/userDataProfile';
 
 let UserDataProfileInitializer = class UserDataProfileInitializer {
     constructor(environmentService, fileService, userDataProfileService, storageService, logService, uriIdentityService, requestService) {
@@ -39,7 +37,7 @@ let UserDataProfileInitializer = class UserDataProfileInitializer {
         if (!this.environmentService.options?.profile?.contents) {
             return false;
         }
-        if (!this.storageService.isNew(StorageScope.PROFILE)) {
+        if (!this.storageService.isNew(0 )) {
             return false;
         }
         return true;
@@ -49,10 +47,10 @@ let UserDataProfileInitializer = class UserDataProfileInitializer {
         const promises = [];
         const profileTemplate = await this.getProfileTemplate();
         if (profileTemplate?.settings) {
-            promises.push(this.initialize(( new SettingsResourceInitializer(this.userDataProfileService, this.fileService, this.logService)), profileTemplate.settings, ProfileResourceType.Settings));
+            promises.push(this.initialize(( new SettingsResourceInitializer(this.userDataProfileService, this.fileService, this.logService)), profileTemplate.settings, "settings" ));
         }
         if (profileTemplate?.globalState) {
-            promises.push(this.initialize(( new GlobalStateResourceInitializer(this.storageService)), profileTemplate.globalState, ProfileResourceType.GlobalState));
+            promises.push(this.initialize(( new GlobalStateResourceInitializer(this.storageService)), profileTemplate.globalState, "globalState" ));
         }
         await Promise.all(promises);
     }
@@ -62,13 +60,13 @@ let UserDataProfileInitializer = class UserDataProfileInitializer {
             const promises = [];
             const profileTemplate = await this.getProfileTemplate();
             if (profileTemplate?.keybindings) {
-                promises.push(this.initialize(( new KeybindingsResourceInitializer(this.userDataProfileService, this.fileService, this.logService)), profileTemplate.keybindings, ProfileResourceType.Keybindings));
+                promises.push(this.initialize(( new KeybindingsResourceInitializer(this.userDataProfileService, this.fileService, this.logService)), profileTemplate.keybindings, "keybindings" ));
             }
             if (profileTemplate?.tasks) {
-                promises.push(this.initialize(( new TasksResourceInitializer(this.userDataProfileService, this.fileService, this.logService)), profileTemplate.tasks, ProfileResourceType.Tasks));
+                promises.push(this.initialize(( new TasksResourceInitializer(this.userDataProfileService, this.fileService, this.logService)), profileTemplate.tasks, "tasks" ));
             }
             if (profileTemplate?.snippets) {
-                promises.push(this.initialize(( new SnippetsResourceInitializer(this.userDataProfileService, this.fileService, this.uriIdentityService)), profileTemplate.snippets, ProfileResourceType.Snippets));
+                promises.push(this.initialize(( new SnippetsResourceInitializer(this.userDataProfileService, this.fileService, this.uriIdentityService)), profileTemplate.snippets, "snippets" ));
             }
             promises.push(this.initializeInstalledExtensions(instantiationService));
             await Promises.settled(promises);
@@ -81,7 +79,7 @@ let UserDataProfileInitializer = class UserDataProfileInitializer {
         if (!this.initializeInstalledExtensionsPromise) {
             const profileTemplate = await this.getProfileTemplate();
             if (profileTemplate?.extensions) {
-                this.initializeInstalledExtensionsPromise = this.initialize(instantiationService.createInstance(ExtensionsResourceInitializer), profileTemplate.extensions, ProfileResourceType.Extensions);
+                this.initializeInstalledExtensionsPromise = this.initialize(instantiationService.createInstance(ExtensionsResourceInitializer), profileTemplate.extensions, "extensions" );
             }
             else {
                 this.initializeInstalledExtensionsPromise = Promise.resolve();

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

@@ -4,23 +4,25 @@ import { CancellationError } from 'vscode/vscode/vs/base/common/errors';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { equals } from 'vscode/vscode/vs/base/common/objects';
 import { localize } from 'vscode/vscode/vs/nls';
+import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { IDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs.service';
-import 'vscode/vscode/vs/platform/instantiation/common/extensions';
 import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
 import { IProductService } from 'vscode/vscode/vs/platform/product/common/productService.service';
 import { asJson } from 'vscode/vscode/vs/platform/request/common/request';
 import { IRequestService } from 'vscode/vscode/vs/platform/request/common/request.service';
 import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry.service';
+import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
 import { IUserDataProfilesService } from 'vscode/vscode/vs/platform/userDataProfile/common/userDataProfile.service';
-import { toWorkspaceIdentifier } from 'vscode/vscode/vs/platform/workspace/common/workspace';
+import { toWorkspaceIdentifier, isEmptyWorkspaceIdentifier } from 'vscode/vscode/vs/platform/workspace/common/workspace';
 import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace.service';
+import { CONFIG_NEW_WINDOW_PROFILE } from 'vscode/vscode/vs/workbench/common/configuration';
 import { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/common/environmentService.service';
 import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions.service';
 import { IHostService } from 'vscode/vscode/vs/workbench/services/host/browser/host.service';
 import { IUserDataProfileService } from 'vscode/vscode/vs/workbench/services/userDataProfile/common/userDataProfile.service';
 
 let UserDataProfileManagementService = class UserDataProfileManagementService extends Disposable {
-    constructor(userDataProfilesService, userDataProfileService, hostService, dialogService, workspaceContextService, extensionService, environmentService, telemetryService, productService, requestService, logService) {
+    constructor(userDataProfilesService, userDataProfileService, hostService, dialogService, workspaceContextService, extensionService, environmentService, telemetryService, productService, requestService, configurationService, uriIdentityService, logService) {
         super();
         this.userDataProfilesService = userDataProfilesService;
         this.userDataProfileService = userDataProfileService;
@@ -32,42 +34,73 @@ let UserDataProfileManagementService = class UserDataProfileManagementService ex
         this.telemetryService = telemetryService;
         this.productService = productService;
         this.requestService = requestService;
+        this.configurationService = configurationService;
+        this.uriIdentityService = uriIdentityService;
         this.logService = logService;
-        this._register(userDataProfilesService.onDidChangeProfiles(e => this.onDidChangeProfiles(e)));
-        this._register(userDataProfilesService.onDidResetWorkspaces(() => this.onDidResetWorkspaces()));
         this._register(userDataProfileService.onDidChangeCurrentProfile(e => this.onDidChangeCurrentProfile(e)));
         this._register(userDataProfilesService.onDidChangeProfiles(e => {
+            if (( (e.removed.some(profile => profile.id === this.userDataProfileService.currentProfile.id)))) {
+                const profileToUse = this.getProfileToUseForCurrentWorkspace();
+                this.switchProfile(profileToUse);
+                this.changeCurrentProfile(profileToUse, ( localize(
+                    3722,
+                    "The current profile has been removed. Please reload to switch back to default profile"
+                )));
+                return;
+            }
             const updatedCurrentProfile = e.updated.find(p => this.userDataProfileService.currentProfile.id === p.id);
             if (updatedCurrentProfile) {
-                this.changeCurrentProfile(updatedCurrentProfile, ( localize(
-                    3694,
-                    "The current profile has been updated. Please reload to switch back to the updated profile"
-                )));
+                const profileToUse = this.getProfileToUseForCurrentWorkspace();
+                if (profileToUse?.id !== updatedCurrentProfile.id) {
+                    this.switchProfile(profileToUse);
+                    this.changeCurrentProfile(profileToUse, ( localize(
+                        3723,
+                        "The current workspace has been removed from the current profile. Please reload to switch back to the updated profile"
+                    )));
+                }
+                else {
+                    this.changeCurrentProfile(updatedCurrentProfile, ( localize(
+                        3724,
+                        "The current profile has been updated. Please reload to switch back to the updated profile"
+                    )));
+                }
             }
         }));
     }
-    onDidChangeProfiles(e) {
-        if (( (e.removed.some(profile => profile.id === this.userDataProfileService.currentProfile.id)))) {
-            this.changeCurrentProfile(this.userDataProfilesService.defaultProfile, ( localize(
-                3695,
-                "The current profile has been removed. Please reload to switch back to default profile"
-            )));
-            return;
+    async onDidChangeCurrentProfile(e) {
+        if (e.previous.isTransient) {
+            await this.userDataProfilesService.cleanUpTransientProfiles();
         }
     }
-    onDidResetWorkspaces() {
-        if (!this.userDataProfileService.currentProfile.isDefault) {
-            this.changeCurrentProfile(this.userDataProfilesService.defaultProfile, ( localize(
-                3695,
-                "The current profile has been removed. Please reload to switch back to default profile"
-            )));
-            return;
+    getWorkspaceUri() {
+        const workspace = this.workspaceContextService.getWorkspace();
+        return workspace.configuration ?? workspace.folders[0]?.uri;
+    }
+    getProfileToUseForCurrentWorkspace() {
+        const workspaceUri = this.getWorkspaceUri();
+        if (workspaceUri) {
+            const profileForWorkspace = this.userDataProfilesService.profiles.find(profile => profile.workspaces?.some(ws => this.uriIdentityService.extUri.isEqual(ws, workspaceUri)));
+            if (profileForWorkspace) {
+                return profileForWorkspace;
+            }
         }
+        else {
+            const currentProfile = this.userDataProfilesService.profiles.find(profile => profile.id === this.userDataProfileService.currentProfile.id);
+            if (currentProfile) {
+                return currentProfile;
+            }
+        }
+        return this.getDefaultProfileToUse();
     }
-    async onDidChangeCurrentProfile(e) {
-        if (e.previous.isTransient) {
-            await this.userDataProfilesService.cleanUpTransientProfiles();
+    getDefaultProfileToUse() {
+        const newWindowProfileConfigValue = this.configurationService.getValue(CONFIG_NEW_WINDOW_PROFILE);
+        if (newWindowProfileConfigValue) {
+            const newWindowProfile = this.userDataProfilesService.profiles.find(profile => profile.name === newWindowProfileConfigValue);
+            if (newWindowProfile) {
+                return newWindowProfile;
+            }
         }
+        return this.userDataProfilesService.defaultProfile;
     }
     async createProfile(name, options) {
         return this.userDataProfilesService.createNamedProfile(name, options);
@@ -89,7 +122,7 @@ let UserDataProfileManagementService = class UserDataProfileManagementService ex
             throw ( (new Error(`Profile ${profile.name} does not exist`)));
         }
         if (profile.isDefault) {
-            throw ( (new Error(localize(3696, "Cannot rename the default profile"))));
+            throw ( (new Error(localize(3725, "Cannot rename the default profile"))));
         }
         const updatedProfile = await this.userDataProfilesService.updateProfile(profile, updateOptions);
         this.telemetryService.publicLog2('profileManagementActionExecuted', { id: 'updateProfile' });
@@ -100,22 +133,28 @@ let UserDataProfileManagementService = class UserDataProfileManagementService ex
             throw ( (new Error(`Profile ${profile.name} does not exist`)));
         }
         if (profile.isDefault) {
-            throw ( (new Error(localize(3697, "Cannot delete the default profile"))));
+            throw ( (new Error(localize(3726, "Cannot delete the default profile"))));
         }
         await this.userDataProfilesService.removeProfile(profile);
         this.telemetryService.publicLog2('profileManagementActionExecuted', { id: 'removeProfile' });
     }
     async switchProfile(profile) {
-        const workspaceIdentifier = toWorkspaceIdentifier(this.workspaceContextService.getWorkspace());
         if (!( (this.userDataProfilesService.profiles.some(p => p.id === profile.id)))) {
             throw ( (new Error(`Profile ${profile.name} does not exist`)));
         }
         if (this.userDataProfileService.currentProfile.id === profile.id) {
             return;
         }
+        const workspaceUri = this.getWorkspaceUri();
+        if (workspaceUri && profile.workspaces?.some(ws => this.uriIdentityService.extUri.isEqual(ws, workspaceUri))) {
+            return;
+        }
+        const workspaceIdentifier = toWorkspaceIdentifier(this.workspaceContextService.getWorkspace());
         await this.userDataProfilesService.setProfileForWorkspace(workspaceIdentifier, profile);
-        await this.changeCurrentProfile(profile);
         this.telemetryService.publicLog2('profileManagementActionExecuted', { id: 'switchProfile' });
+        if (isEmptyWorkspaceIdentifier(workspaceIdentifier)) {
+            await this.changeCurrentProfile(profile);
+        }
     }
     async getBuiltinProfileTemplates() {
         if (this.productService.profileTemplatesUrl) {
@@ -139,7 +178,7 @@ let UserDataProfileManagementService = class UserDataProfileManagementService ex
         const shouldRestartExtensionHosts = this.userDataProfileService.currentProfile.id !== profile.id || !equals(this.userDataProfileService.currentProfile.useDefaultFlags, profile.useDefaultFlags);
         if (shouldRestartExtensionHosts) {
             if (!isRemoteWindow) {
-                if (!(await this.extensionService.stopExtensionHosts(( localize(3698, "Switching to a profile."))))) {
+                if (!(await this.extensionService.stopExtensionHosts(( localize(3727, "Switching to a profile."))))) {
                     if (( (this.userDataProfilesService.profiles.some(p => p.id === this.userDataProfileService.currentProfile.id)))) {
                         await this.userDataProfilesService.setProfileForWorkspace(toWorkspaceIdentifier(this.workspaceContextService.getWorkspace()), this.userDataProfileService.currentProfile);
                     }
@@ -151,8 +190,8 @@ let UserDataProfileManagementService = class UserDataProfileManagementService ex
         if (shouldRestartExtensionHosts) {
             if (isRemoteWindow) {
                 const { confirmed } = await this.dialogService.confirm({
-                    message: reloadMessage ?? ( localize(3699, "Switching a profile requires reloading VS Code.")),
-                    primaryButton: ( localize(3700, "&&Reload")),
+                    message: reloadMessage ?? ( localize(3728, "Switching a profile requires reloading VS Code.")),
+                    primaryButton: ( localize(3729, "&&Reload")),
                 });
                 if (confirmed) {
                     await this.hostService.reload();
@@ -175,7 +214,9 @@ UserDataProfileManagementService = ( (__decorate([
     ( (__param(7, ITelemetryService))),
     ( (__param(8, IProductService))),
     ( (__param(9, IRequestService))),
-    ( (__param(10, ILogService)))
+    ( (__param(10, IConfigurationService))),
+    ( (__param(11, IUriIdentityService))),
+    ( (__param(12, ILogService)))
 ], UserDataProfileManagementService)));
 
 export { UserDataProfileManagementService };

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

@@ -1,10 +1,9 @@
 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 { StorageScope, isProfileUsingDefaultStorage } from 'vscode/vscode/vs/platform/storage/common/storage';
+import { 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';
@@ -18,8 +17,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 === StorageScope.PROFILE, disposables)(() => this.onDidChangeStorageTargetInCurrentProfile()));
-        this._register(storageService.onDidChangeValue(StorageScope.PROFILE, undefined, disposables)(e => this.onDidChangeStorageValueInCurrentProfile(e)));
+        this._register(Event.filter(storageService.onDidChangeTarget, e => e.scope === 0 , disposables)(() => this.onDidChangeStorageTargetInCurrentProfile()));
+        this._register(storageService.onDidChangeValue(0 , 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,5 +1,4 @@
 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';
@@ -11,7 +10,6 @@ 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';
@@ -62,11 +60,11 @@ let UserDataSyncInitializer = class UserDataSyncInitializer {
                         this.logService.trace(`Skipping initializing user data in desktop`);
                         return;
                     }
-                    if (!this.storageService.isNew(StorageScope.APPLICATION)) {
+                    if (!this.storageService.isNew(-1 )) {
                         this.logService.trace(`Skipping initializing user data as application was opened before`);
                         return;
                     }
-                    if (!this.storageService.isNew(StorageScope.WORKSPACE)) {
+                    if (!this.storageService.isNew(1 )) {
                         this.logService.trace(`Skipping initializing user data as workspace was opened before`);
                         return;
                     }
@@ -135,7 +133,7 @@ let UserDataSyncInitializer = class UserDataSyncInitializer {
                 this.storageService
             )));
             userDataSyncStoreClient.setAuthToken(authenticationSession.accessToken, authenticationSession.providerId);
-            this.globalStateUserData = await userDataSyncStoreClient.readResource(SyncResource.GlobalState, null);
+            this.globalStateUserData = await userDataSyncStoreClient.readResource("globalState" , null);
             if (this.globalStateUserData) {
                 const userDataSyncStoreType = ( new UserDataSyncStoreTypeSynchronizer(
                     userDataSyncStoreClient,
@@ -167,12 +165,12 @@ let UserDataSyncInitializer = class UserDataSyncInitializer {
     }
     async initializeRequiredResources() {
         this.logService.trace(`UserDataInitializationService#initializeRequiredResources`);
-        return this.initialize([SyncResource.Settings, SyncResource.GlobalState]);
+        return this.initialize(["settings" , "globalState" ]);
     }
     async initializeOtherResources(instantiationService) {
         try {
             this.logService.trace(`UserDataInitializationService#initializeOtherResources`);
-            await Promise.allSettled([this.initialize([SyncResource.Keybindings, SyncResource.Snippets, SyncResource.Tasks]), this.initializeExtensions(instantiationService)]);
+            await Promise.allSettled([this.initialize(["keybindings" , "snippets" , "tasks" ]), this.initializeExtensions(instantiationService)]);
         }
         finally {
             this.initializationFinished.open();
@@ -183,7 +181,7 @@ let UserDataSyncInitializer = class UserDataSyncInitializer {
             await Promise.all([this.initializeInstalledExtensions(instantiationService), this.initializeNewExtensions(instantiationService)]);
         }
         finally {
-            this.initialized.push(SyncResource.Extensions);
+            this.initialized.push("extensions" );
         }
     }
     async initializeInstalledExtensions(instantiationService) {
@@ -217,7 +215,7 @@ let UserDataSyncInitializer = class UserDataSyncInitializer {
                 if (!userDataSyncStoreClient) {
                     return null;
                 }
-                const userData = await userDataSyncStoreClient.readResource(SyncResource.Extensions, null);
+                const userData = await userDataSyncStoreClient.readResource("extensions" , null);
                 return instantiationService.createInstance(ExtensionsPreviewInitializer, userData);
             })();
         }
@@ -237,7 +235,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 === SyncResource.GlobalState ? this.globalStateUserData : null);
+                const userData = await userDataSyncStoreClient.readResource(syncResource, syncResource === "globalState"  ? this.globalStateUserData : null);
                 await initializer.initialize(userData);
                 this.logService.info(`Initialized ${getSyncAreaLabel(syncResource)}`);
             }
@@ -249,7 +247,7 @@ let UserDataSyncInitializer = class UserDataSyncInitializer {
     }
     createSyncResourceInitializer(syncResource) {
         switch (syncResource) {
-            case SyncResource.Settings: return ( new SettingsInitializer(
+            case "settings" : return ( new SettingsInitializer(
                 this.fileService,
                 this.userDataProfilesService,
                 this.environmentService,
@@ -257,7 +255,7 @@ let UserDataSyncInitializer = class UserDataSyncInitializer {
                 this.storageService,
                 this.uriIdentityService
             ));
-            case SyncResource.Keybindings: return ( new KeybindingsInitializer(
+            case "keybindings" : return ( new KeybindingsInitializer(
                 this.fileService,
                 this.userDataProfilesService,
                 this.environmentService,
@@ -265,7 +263,7 @@ let UserDataSyncInitializer = class UserDataSyncInitializer {
                 this.storageService,
                 this.uriIdentityService
             ));
-            case SyncResource.Tasks: return ( new TasksInitializer(
+            case "tasks" : return ( new TasksInitializer(
                 this.fileService,
                 this.userDataProfilesService,
                 this.environmentService,
@@ -273,7 +271,7 @@ let UserDataSyncInitializer = class UserDataSyncInitializer {
                 this.storageService,
                 this.uriIdentityService
             ));
-            case SyncResource.Snippets: return ( new SnippetsInitializer(
+            case "snippets" : return ( new SnippetsInitializer(
                 this.fileService,
                 this.userDataProfilesService,
                 this.environmentService,
@@ -281,7 +279,7 @@ let UserDataSyncInitializer = class UserDataSyncInitializer {
                 this.storageService,
                 this.uriIdentityService
             ));
-            case SyncResource.GlobalState: return ( new GlobalStateInitializer(
+            case "globalState" : return ( new GlobalStateInitializer(
                 this.storageService,
                 this.fileService,
                 this.userDataProfilesService,

package/vscode/src/vs/workbench/services/userDataSync/common/userDataSyncUtil.js

@@ -2,7 +2,6 @@ import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding.service';
 import { getDefaultIgnoredSettings } from 'vscode/vscode/vs/platform/userDataSync/common/userDataSync';
 import 'vscode/vscode/vs/platform/instantiation/common/instantiation';
-import 'vscode/vscode/vs/platform/instantiation/common/extensions';
 import { ITextModelService } from 'vscode/vscode/vs/editor/common/services/resolverService';
 import { ITextResourcePropertiesService, ITextResourceConfigurationService } from 'vscode/vscode/vs/editor/common/services/textResourceConfiguration';