@codingame/monaco-vscode-user-data-profile-service-override 11.1.2 → 12.0.0

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

@@ -1,4 +1,6 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
+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';
@@ -17,6 +19,7 @@ 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) {
@@ -37,7 +40,7 @@ let UserDataProfileInitializer = class UserDataProfileInitializer {
         if (!this.environmentService.options?.profile?.contents) {
             return false;
         }
-        if (!this.storageService.isNew(0 )) {
+        if (!this.storageService.isNew(StorageScope.PROFILE)) {
             return false;
         }
         return true;
@@ -47,10 +50,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, "settings" ));
+            promises.push(this.initialize(( new SettingsResourceInitializer(this.userDataProfileService, this.fileService, this.logService)), profileTemplate.settings, ProfileResourceType.Settings));
         }
         if (profileTemplate?.globalState) {
-            promises.push(this.initialize(( new GlobalStateResourceInitializer(this.storageService)), profileTemplate.globalState, "globalState" ));
+            promises.push(this.initialize(( new GlobalStateResourceInitializer(this.storageService)), profileTemplate.globalState, ProfileResourceType.GlobalState));
         }
         await Promise.all(promises);
     }
@@ -60,13 +63,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, "keybindings" ));
+                promises.push(this.initialize(( new KeybindingsResourceInitializer(this.userDataProfileService, this.fileService, this.logService)), profileTemplate.keybindings, ProfileResourceType.Keybindings));
             }
             if (profileTemplate?.tasks) {
-                promises.push(this.initialize(( new TasksResourceInitializer(this.userDataProfileService, this.fileService, this.logService)), profileTemplate.tasks, "tasks" ));
+                promises.push(this.initialize(( new TasksResourceInitializer(this.userDataProfileService, this.fileService, this.logService)), profileTemplate.tasks, ProfileResourceType.Tasks));
             }
             if (profileTemplate?.snippets) {
-                promises.push(this.initialize(( new SnippetsResourceInitializer(this.userDataProfileService, this.fileService, this.uriIdentityService)), profileTemplate.snippets, "snippets" ));
+                promises.push(this.initialize(( new SnippetsResourceInitializer(this.userDataProfileService, this.fileService, this.uriIdentityService)), profileTemplate.snippets, ProfileResourceType.Snippets));
             }
             promises.push(this.initializeInstalledExtensions(instantiationService));
             await Promises.settled(promises);
@@ -79,7 +82,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, "extensions" );
+                this.initializeInstalledExtensionsPromise = this.initialize(instantiationService.createInstance(ExtensionsResourceInitializer), profileTemplate.extensions, ProfileResourceType.Extensions);
             }
             else {
                 this.initializeInstalledExtensionsPromise = Promise.resolve();

package/vscode/src/vs/workbench/services/userDataProfile/browser/userDataProfileManagement.d.ts

@@ -0,0 +1,58 @@
+import { Disposable } from "vscode/vscode/vs/base/common/lifecycle";
+import { IConfigurationService } from "vscode/vscode/vs/platform/configuration/common/configuration.service";
+import { IDialogService } from "vscode/vscode/vs/platform/dialogs/common/dialogs.service";
+import { ILogService } from "vscode/vscode/vs/platform/log/common/log.service";
+import { IProductService } from "vscode/vscode/vs/platform/product/common/productService.service";
+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 { IUserDataProfile, IUserDataProfileOptions, IUserDataProfileUpdateOptions } from "vscode/vscode/vs/platform/userDataProfile/common/userDataProfile";
+import { IUserDataProfilesService } from "vscode/vscode/vs/platform/userDataProfile/common/userDataProfile.service";
+import { IWorkspaceContextService } from "vscode/vscode/vs/platform/workspace/common/workspace.service";
+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 { IProfileTemplateInfo } from "@codingame/monaco-vscode-e72c94ca-257a-5b75-8b68-5a5fa3c18255-common/vscode/vs/workbench/services/userDataProfile/common/userDataProfile";
+import { IUserDataProfileManagementService } from "vscode/vscode/vs/workbench/services/userDataProfile/common/userDataProfile.service";
+import { IUserDataProfileService } from "vscode/vscode/vs/workbench/services/userDataProfile/common/userDataProfile.service";
+export type ProfileManagementActionExecutedClassification = {
+    owner: "sandy081";
+    comment: "Logged when profile management action is excuted";
+    id: {
+        classification: "SystemMetaData";
+        purpose: "FeatureInsight";
+        comment: "The identifier of the action that was run.";
+    };
+};
+export type ProfileManagementActionExecutedEvent = {
+    id: string;
+};
+export declare class UserDataProfileManagementService extends Disposable implements IUserDataProfileManagementService {
+    private readonly userDataProfilesService;
+    private readonly userDataProfileService;
+    private readonly hostService;
+    private readonly dialogService;
+    private readonly workspaceContextService;
+    private readonly extensionService;
+    private readonly environmentService;
+    private readonly telemetryService;
+    private readonly productService;
+    private readonly requestService;
+    private readonly configurationService;
+    private readonly uriIdentityService;
+    private readonly logService;
+    readonly _serviceBrand: undefined;
+    constructor(userDataProfilesService: IUserDataProfilesService, userDataProfileService: IUserDataProfileService, hostService: IHostService, dialogService: IDialogService, workspaceContextService: IWorkspaceContextService, extensionService: IExtensionService, environmentService: IWorkbenchEnvironmentService, telemetryService: ITelemetryService, productService: IProductService, requestService: IRequestService, configurationService: IConfigurationService, uriIdentityService: IUriIdentityService, logService: ILogService);
+    private onDidChangeCurrentProfile;
+    private getWorkspaceUri;
+    private getProfileToUseForCurrentWorkspace;
+    getDefaultProfileToUse(): IUserDataProfile;
+    createProfile(name: string, options?: IUserDataProfileOptions): Promise<IUserDataProfile>;
+    createAndEnterProfile(name: string, options?: IUserDataProfileOptions): Promise<IUserDataProfile>;
+    createAndEnterTransientProfile(): Promise<IUserDataProfile>;
+    updateProfile(profile: IUserDataProfile, updateOptions: IUserDataProfileUpdateOptions): Promise<IUserDataProfile>;
+    removeProfile(profile: IUserDataProfile): Promise<void>;
+    switchProfile(profile: IUserDataProfile): Promise<void>;
+    getBuiltinProfileTemplates(): Promise<IProfileTemplateInfo[]>;
+    private changeCurrentProfile;
+}

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

@@ -1,4 +1,5 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 import { CancellationToken } from 'vscode/vscode/vs/base/common/cancellation';
 import { CancellationError } from 'vscode/vscode/vs/base/common/errors';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
@@ -6,6 +7,7 @@ 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';
@@ -39,11 +41,11 @@ let UserDataProfileManagementService = class UserDataProfileManagementService ex
         this.logService = logService;
         this._register(userDataProfileService.onDidChangeCurrentProfile(e => this.onDidChangeCurrentProfile(e)));
         this._register(userDataProfilesService.onDidChangeProfiles(e => {
-            if (( (e.removed.some(profile => profile.id === this.userDataProfileService.currentProfile.id)))) {
+            if (( e.removed.some(profile => profile.id === this.userDataProfileService.currentProfile.id))) {
                 const profileToUse = this.getProfileToUseForCurrentWorkspace();
                 this.switchProfile(profileToUse);
                 this.changeCurrentProfile(profileToUse, ( localize(
-                    3720,
+                    12018,
                     "The current profile has been removed. Please reload to switch back to default profile"
                 )));
                 return;
@@ -54,13 +56,13 @@ let UserDataProfileManagementService = class UserDataProfileManagementService ex
                 if (profileToUse?.id !== updatedCurrentProfile.id) {
                     this.switchProfile(profileToUse);
                     this.changeCurrentProfile(profileToUse, ( localize(
-                        3721,
+                        12019,
                         "The current workspace has been removed from the current profile. Please reload to switch back to the updated profile"
                     )));
                 }
                 else {
                     this.changeCurrentProfile(updatedCurrentProfile, ( localize(
-                        3722,
+                        12020,
                         "The current profile has been updated. Please reload to switch back to the updated profile"
                     )));
                 }
@@ -118,29 +120,29 @@ let UserDataProfileManagementService = class UserDataProfileManagementService ex
         return profile;
     }
     async updateProfile(profile, updateOptions) {
-        if (!( (this.userDataProfilesService.profiles.some(p => p.id === profile.id)))) {
-            throw ( (new Error(`Profile ${profile.name} does not exist`)));
+        if (!( this.userDataProfilesService.profiles.some(p => p.id === profile.id))) {
+            throw ( new Error(`Profile ${profile.name} does not exist`));
         }
         if (profile.isDefault) {
-            throw ( (new Error(localize(3723, "Cannot rename the default profile"))));
+            throw ( new Error(( localize(12021, "Cannot rename the default profile"))));
         }
         const updatedProfile = await this.userDataProfilesService.updateProfile(profile, updateOptions);
         this.telemetryService.publicLog2('profileManagementActionExecuted', { id: 'updateProfile' });
         return updatedProfile;
     }
     async removeProfile(profile) {
-        if (!( (this.userDataProfilesService.profiles.some(p => p.id === profile.id)))) {
-            throw ( (new Error(`Profile ${profile.name} does not exist`)));
+        if (!( this.userDataProfilesService.profiles.some(p => p.id === profile.id))) {
+            throw ( new Error(`Profile ${profile.name} does not exist`));
         }
         if (profile.isDefault) {
-            throw ( (new Error(localize(3724, "Cannot delete the default profile"))));
+            throw ( new Error(( localize(12022, "Cannot delete the default profile"))));
         }
         await this.userDataProfilesService.removeProfile(profile);
         this.telemetryService.publicLog2('profileManagementActionExecuted', { id: 'removeProfile' });
     }
     async switchProfile(profile) {
-        if (!( (this.userDataProfilesService.profiles.some(p => p.id === profile.id)))) {
-            throw ( (new Error(`Profile ${profile.name} does not exist`)));
+        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;
@@ -178,11 +180,11 @@ 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(3725, "Switching to a profile."))))) {
-                    if (( (this.userDataProfilesService.profiles.some(p => p.id === this.userDataProfileService.currentProfile.id)))) {
+                if (!(await this.extensionService.stopExtensionHosts(( localize(12023, "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);
                     }
-                    throw ( (new CancellationError()));
+                    throw ( new CancellationError());
                 }
             }
         }
@@ -190,8 +192,8 @@ let UserDataProfileManagementService = class UserDataProfileManagementService ex
         if (shouldRestartExtensionHosts) {
             if (isRemoteWindow) {
                 const { confirmed } = await this.dialogService.confirm({
-                    message: reloadMessage ?? ( localize(3726, "Switching a profile requires reloading VS Code.")),
-                    primaryButton: ( localize(3727, "&&Reload")),
+                    message: reloadMessage ?? ( localize(12024, "Switching a profile requires reloading VS Code.")),
+                    primaryButton: ( localize(12025, "&&Reload")),
                 });
                 if (confirmed) {
                     await this.hostService.reload();
@@ -203,20 +205,20 @@ let UserDataProfileManagementService = class UserDataProfileManagementService ex
         }
     }
 };
-UserDataProfileManagementService = ( (__decorate([
-    ( (__param(0, IUserDataProfilesService))),
-    ( (__param(1, IUserDataProfileService))),
-    ( (__param(2, IHostService))),
-    ( (__param(3, IDialogService))),
-    ( (__param(4, IWorkspaceContextService))),
-    ( (__param(5, IExtensionService))),
-    ( (__param(6, IWorkbenchEnvironmentService))),
-    ( (__param(7, ITelemetryService))),
-    ( (__param(8, IProductService))),
-    ( (__param(9, IRequestService))),
-    ( (__param(10, IConfigurationService))),
-    ( (__param(11, IUriIdentityService))),
-    ( (__param(12, ILogService)))
-], UserDataProfileManagementService)));
+UserDataProfileManagementService = ( __decorate([
+    ( __param(0, IUserDataProfilesService)),
+    ( __param(1, IUserDataProfileService)),
+    ( __param(2, IHostService)),
+    ( __param(3, IDialogService)),
+    ( __param(4, IWorkspaceContextService)),
+    ( __param(5, IExtensionService)),
+    ( __param(6, IWorkbenchEnvironmentService)),
+    ( __param(7, ITelemetryService)),
+    ( __param(8, IProductService)),
+    ( __param(9, IRequestService)),
+    ( __param(10, IConfigurationService)),
+    ( __param(11, IUriIdentityService)),
+    ( __param(12, ILogService))
+], UserDataProfileManagementService));
 
 export { UserDataProfileManagementService };

package/vscode/src/vs/workbench/services/userDataProfile/browser/userDataProfileStorageService.d.ts

@@ -0,0 +1,18 @@
+import { Event } from "vscode/vscode/vs/base/common/event";
+import { IStorageDatabase } from "vscode/vscode/vs/base/parts/storage/common/storage";
+import { ILogService } from "vscode/vscode/vs/platform/log/common/log.service";
+import { AbstractUserDataProfileStorageService, IProfileStorageChanges } from "../../../../platform/userDataProfile/common/userDataProfileStorageService.js";
+import { IUserDataProfileStorageService } from "vscode/vscode/vs/platform/userDataProfile/common/userDataProfileStorageService.service";
+import { IStorageService } from "vscode/vscode/vs/platform/storage/common/storage.service";
+import { IUserDataProfile } from "vscode/vscode/vs/platform/userDataProfile/common/userDataProfile";
+import { IUserDataProfileService } from "vscode/vscode/vs/workbench/services/userDataProfile/common/userDataProfile.service";
+export declare class UserDataProfileStorageService extends AbstractUserDataProfileStorageService implements IUserDataProfileStorageService {
+    private readonly userDataProfileService;
+    private readonly logService;
+    private readonly _onDidChange;
+    readonly onDidChange: Event<IProfileStorageChanges>;
+    constructor(storageService: IStorageService, userDataProfileService: IUserDataProfileService, logService: ILogService);
+    private onDidChangeStorageTargetInCurrentProfile;
+    private onDidChangeStorageValueInCurrentProfile;
+    protected createStorageDatabase(profile: IUserDataProfile): Promise<IStorageDatabase>;
+}

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

@@ -1,11 +1,13 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 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 { IndexedDBStorageDatabase } from '@codingame/monaco-vscode-2f06fe84-148e-5e6b-a7ca-c7989c5f128a-common/vscode/vs/workbench/services/storage/browser/storageService';
 import { IUserDataProfileService } from 'vscode/vscode/vs/workbench/services/userDataProfile/common/userDataProfile.service';
 import { DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
 
@@ -17,8 +19,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.d.ts

@@ -0,0 +1,45 @@
+import { IStorageService } from "vscode/vscode/vs/platform/storage/common/storage.service";
+import { IFileService } from "vscode/vscode/vs/platform/files/common/files.service";
+import { IInstantiationService } from "vscode/vscode/vs/platform/instantiation/common/instantiation";
+import { ILogService } from "vscode/vscode/vs/platform/log/common/log.service";
+import { IProductService } from "vscode/vscode/vs/platform/product/common/productService.service";
+import { IRequestService } from "vscode/vscode/vs/platform/request/common/request.service";
+import { IUserDataSyncStoreManagementService } from "vscode/vscode/vs/platform/userDataSync/common/userDataSync.service";
+import { IUriIdentityService } from "vscode/vscode/vs/platform/uriIdentity/common/uriIdentity.service";
+import { IUserDataProfilesService } from "vscode/vscode/vs/platform/userDataProfile/common/userDataProfile.service";
+import { IBrowserWorkbenchEnvironmentService } from "vscode/vscode/vs/workbench/services/environment/browser/environmentService.service";
+import { IUserDataInitializer } from "../../userData/browser/userDataInit.js";
+import { ISecretStorageService } from "vscode/vscode/vs/platform/secrets/common/secrets.service";
+export declare class UserDataSyncInitializer implements IUserDataInitializer {
+    private readonly environmentService;
+    private readonly secretStorageService;
+    private readonly userDataSyncStoreManagementService;
+    private readonly fileService;
+    private readonly userDataProfilesService;
+    private readonly storageService;
+    private readonly productService;
+    private readonly requestService;
+    private readonly logService;
+    private readonly uriIdentityService;
+    _serviceBrand: any;
+    private readonly initialized;
+    private readonly initializationFinished;
+    private globalStateUserData;
+    constructor(environmentService: IBrowserWorkbenchEnvironmentService, secretStorageService: ISecretStorageService, userDataSyncStoreManagementService: IUserDataSyncStoreManagementService, fileService: IFileService, userDataProfilesService: IUserDataProfilesService, storageService: IStorageService, productService: IProductService, requestService: IRequestService, logService: ILogService, uriIdentityService: IUriIdentityService);
+    private _userDataSyncStoreClientPromise;
+    private createUserDataSyncStoreClient;
+    private initializeUserDataSyncStore;
+    whenInitializationFinished(): Promise<void>;
+    requiresInitialization(): Promise<boolean>;
+    initializeRequiredResources(): Promise<void>;
+    initializeOtherResources(instantiationService: IInstantiationService): Promise<void>;
+    private initializeExtensions;
+    private initializeInstalledExtensionsPromise;
+    initializeInstalledExtensions(instantiationService: IInstantiationService): Promise<void>;
+    private initializeNewExtensionsPromise;
+    private initializeNewExtensions;
+    private extensionsPreviewInitializerPromise;
+    private getExtensionsPreviewInitializer;
+    private initialize;
+    private createSyncResourceInitializer;
+}

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

@@ -1,17 +1,20 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
+import { StorageScope } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
-import { AbstractExtensionsInitializer } from '@codingame/monaco-vscode-user-data-profile-user-data-sync-common/vscode/vs/platform/userDataSync/common/extensionsSync';
-import { UserDataSyncStoreTypeSynchronizer, GlobalStateInitializer } from '@codingame/monaco-vscode-user-data-profile-user-data-sync-common/vscode/vs/platform/userDataSync/common/globalStateSync';
-import { KeybindingsInitializer } from '@codingame/monaco-vscode-user-data-profile-user-data-sync-common/vscode/vs/platform/userDataSync/common/keybindingsSync';
-import { SettingsInitializer } from '@codingame/monaco-vscode-user-data-profile-user-data-sync-common/vscode/vs/platform/userDataSync/common/settingsSync';
-import { SnippetsInitializer } from '@codingame/monaco-vscode-user-data-profile-user-data-sync-common/vscode/vs/platform/userDataSync/common/snippetsSync';
+import { AbstractExtensionsInitializer } from '@codingame/monaco-vscode-a022e9a8-b522-5ea2-97c7-f3dda2b0b597-common/vscode/vs/platform/userDataSync/common/extensionsSync';
+import { UserDataSyncStoreTypeSynchronizer, GlobalStateInitializer } from '@codingame/monaco-vscode-a022e9a8-b522-5ea2-97c7-f3dda2b0b597-common/vscode/vs/platform/userDataSync/common/globalStateSync';
+import { KeybindingsInitializer } from '@codingame/monaco-vscode-a022e9a8-b522-5ea2-97c7-f3dda2b0b597-common/vscode/vs/platform/userDataSync/common/keybindingsSync';
+import { SettingsInitializer } from '@codingame/monaco-vscode-a022e9a8-b522-5ea2-97c7-f3dda2b0b597-common/vscode/vs/platform/userDataSync/common/settingsSync';
+import { SnippetsInitializer } from '@codingame/monaco-vscode-a022e9a8-b522-5ea2-97c7-f3dda2b0b597-common/vscode/vs/platform/userDataSync/common/snippetsSync';
 import { IFileService } from 'vscode/vscode/vs/platform/files/common/files.service';
 import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
-import { UserDataSyncStoreClient } from 'vscode/vscode/vs/platform/userDataSync/common/userDataSyncStoreService';
+import { UserDataSyncStoreClient } from '@codingame/monaco-vscode-a2719803-af40-5ae9-a29f-8a2231c33056-common/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 { getCurrentAuthenticationSessionInfo } from '@codingame/monaco-vscode-3607c442-ae7a-594b-b840-038378c24fef-common/vscode/vs/workbench/services/authentication/browser/authenticationService';
 import { getSyncAreaLabel } from 'vscode/vscode/vs/workbench/services/userDataSync/common/userDataSync';
 import { isWeb } from 'vscode/vscode/vs/base/common/platform';
 import { Barrier, Promises } from 'vscode/vscode/vs/base/common/async';
@@ -26,7 +29,7 @@ import { isEqual } from 'vscode/vscode/vs/base/common/resources';
 import { CancellationToken } from 'vscode/vscode/vs/base/common/cancellation';
 import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
 import { IExtensionStorageService } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionStorage.service';
-import { TasksInitializer } from '@codingame/monaco-vscode-user-data-profile-user-data-sync-common/vscode/vs/platform/userDataSync/common/tasksSync';
+import { TasksInitializer } from '@codingame/monaco-vscode-a022e9a8-b522-5ea2-97c7-f3dda2b0b597-common/vscode/vs/platform/userDataSync/common/tasksSync';
 import { IUserDataProfilesService } from 'vscode/vscode/vs/platform/userDataProfile/common/userDataProfile.service';
 import { IBrowserWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/browser/environmentService.service';
 import { ISecretStorageService } from 'vscode/vscode/vs/platform/secrets/common/secrets.service';
@@ -60,11 +63,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 +136,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 +168,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 +184,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 +218,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 +238,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 +250,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 +258,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 +266,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 +274,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 +282,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,

package/vscode/src/vs/workbench/services/userDataSync/common/userDataSyncUtil.d.ts

@@ -0,0 +1,18 @@
+import { IKeybindingService } from "vscode/vscode/vs/platform/keybinding/common/keybinding.service";
+import { IUserDataSyncUtilService } from "vscode/vscode/vs/platform/userDataSync/common/userDataSync.service";
+import { IStringDictionary } from "vscode/vscode/vs/base/common/collections";
+import { FormattingOptions } from "@codingame/monaco-vscode-56402b83-4a60-5b15-86f9-71fe99c32744-common/vscode/vs/base/common/jsonFormatter";
+import { URI } from "vscode/vscode/vs/base/common/uri";
+import { ITextModelService } from "vscode/vscode/vs/editor/common/services/resolverService";
+import { ITextResourcePropertiesService, ITextResourceConfigurationService } from "vscode/vscode/vs/editor/common/services/textResourceConfiguration";
+export declare class UserDataSyncUtilService implements IUserDataSyncUtilService {
+    private readonly keybindingsService;
+    private readonly textModelService;
+    private readonly textResourcePropertiesService;
+    private readonly textResourceConfigurationService;
+    readonly _serviceBrand: undefined;
+    constructor(keybindingsService: IKeybindingService, textModelService: ITextModelService, textResourcePropertiesService: ITextResourcePropertiesService, textResourceConfigurationService: ITextResourceConfigurationService);
+    resolveDefaultCoreIgnoredSettings(): Promise<string[]>;
+    resolveUserBindings(userBindings: string[]): Promise<IStringDictionary<string>>;
+    resolveFormattingOptions(resource: URI): Promise<FormattingOptions>;
+}

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

@@ -1,7 +1,9 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 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';