@codingame/monaco-vscode-user-data-profile-service-override 13.1.7 → 14.0.1

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

@@ -4,7 +4,6 @@ import { IDialogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/
 import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
 import { IProductService } from "@codingame/monaco-vscode-api/vscode/vs/platform/product/common/productService.service";
 import { IRequestService } from "@codingame/monaco-vscode-api/vscode/vs/platform/request/common/request.service";
-import { ITelemetryService } from "@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service";
 import { IUriIdentityService } from "@codingame/monaco-vscode-api/vscode/vs/platform/uriIdentity/common/uriIdentity.service";
 import { IUserDataProfile, IUserDataProfileOptions, IUserDataProfileUpdateOptions } from "@codingame/monaco-vscode-api/vscode/vs/platform/userDataProfile/common/userDataProfile";
 import { IUserDataProfilesService } from "@codingame/monaco-vscode-api/vscode/vs/platform/userDataProfile/common/userDataProfile.service";
@@ -15,18 +14,6 @@ import { IHostService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/s
 import { IProfileTemplateInfo } from "@codingame/monaco-vscode-e72c94ca-257a-5b75-8b68-5a5fa3c18255-common/vscode/vs/workbench/services/userDataProfile/common/userDataProfile";
 import { IUserDataProfileManagementService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/userDataProfile/common/userDataProfile.service";
 import { IUserDataProfileService } from "@codingame/monaco-vscode-api/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;
@@ -35,14 +22,13 @@ export declare class UserDataProfileManagementService extends Disposable impleme
     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);
+    constructor(userDataProfilesService: IUserDataProfilesService, userDataProfileService: IUserDataProfileService, hostService: IHostService, dialogService: IDialogService, workspaceContextService: IWorkspaceContextService, extensionService: IExtensionService, environmentService: IWorkbenchEnvironmentService, productService: IProductService, requestService: IRequestService, configurationService: IConfigurationService, uriIdentityService: IUriIdentityService, logService: ILogService);
     private onDidChangeCurrentProfile;
     private getWorkspaceUri;
     private getProfileToUseForCurrentWorkspace;

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

@@ -12,7 +12,6 @@ import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log
 import { IProductService } from '@codingame/monaco-vscode-api/vscode/vs/platform/product/common/productService.service';
 import { asJson } from '@codingame/monaco-vscode-api/vscode/vs/platform/request/common/request';
 import { IRequestService } from '@codingame/monaco-vscode-api/vscode/vs/platform/request/common/request.service';
-import { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service';
 import { IUriIdentityService } from '@codingame/monaco-vscode-api/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
 import { IUserDataProfilesService } from '@codingame/monaco-vscode-api/vscode/vs/platform/userDataProfile/common/userDataProfile.service';
 import { toWorkspaceIdentifier, isEmptyWorkspaceIdentifier } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace';
@@ -24,7 +23,7 @@ import { IHostService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/s
 import { IUserDataProfileService } from '@codingame/monaco-vscode-api/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, configurationService, uriIdentityService, logService) {
+    constructor(userDataProfilesService, userDataProfileService, hostService, dialogService, workspaceContextService, extensionService, environmentService, productService, requestService, configurationService, uriIdentityService, logService) {
         super();
         this.userDataProfilesService = userDataProfilesService;
         this.userDataProfileService = userDataProfileService;
@@ -33,7 +32,6 @@ let UserDataProfileManagementService = class UserDataProfileManagementService ex
         this.workspaceContextService = workspaceContextService;
         this.extensionService = extensionService;
         this.environmentService = environmentService;
-        this.telemetryService = telemetryService;
         this.productService = productService;
         this.requestService = requestService;
         this.configurationService = configurationService;
@@ -45,7 +43,7 @@ let UserDataProfileManagementService = class UserDataProfileManagementService ex
                 const profileToUse = this.getProfileToUseForCurrentWorkspace();
                 this.switchProfile(profileToUse);
                 this.changeCurrentProfile(profileToUse, ( localize(
-                    12034,
+                    12254,
                     "The current profile has been removed. Please reload to switch back to default profile"
                 )));
                 return;
@@ -56,13 +54,13 @@ let UserDataProfileManagementService = class UserDataProfileManagementService ex
                 if (profileToUse?.id !== updatedCurrentProfile.id) {
                     this.switchProfile(profileToUse);
                     this.changeCurrentProfile(profileToUse, ( localize(
-                        12035,
+                        12255,
                         "The current workspace has been removed from the current profile. Please reload to switch back to the updated profile"
                     )));
                 }
                 else {
                     this.changeCurrentProfile(updatedCurrentProfile, ( localize(
-                        12036,
+                        12256,
                         "The current profile has been updated. Please reload to switch back to the updated profile"
                     )));
                 }
@@ -110,13 +108,11 @@ let UserDataProfileManagementService = class UserDataProfileManagementService ex
     async createAndEnterProfile(name, options) {
         const profile = await this.userDataProfilesService.createNamedProfile(name, options, toWorkspaceIdentifier(this.workspaceContextService.getWorkspace()));
         await this.changeCurrentProfile(profile);
-        this.telemetryService.publicLog2('profileManagementActionExecuted', { id: 'createAndEnterProfile' });
         return profile;
     }
     async createAndEnterTransientProfile() {
         const profile = await this.userDataProfilesService.createTransientProfile(toWorkspaceIdentifier(this.workspaceContextService.getWorkspace()));
         await this.changeCurrentProfile(profile);
-        this.telemetryService.publicLog2('profileManagementActionExecuted', { id: 'createAndEnterTransientProfile' });
         return profile;
     }
     async updateProfile(profile, updateOptions) {
@@ -124,10 +120,9 @@ let UserDataProfileManagementService = class UserDataProfileManagementService ex
             throw ( new Error(`Profile ${profile.name} does not exist`));
         }
         if (profile.isDefault) {
-            throw ( new Error(( localize(12037, "Cannot rename the default profile"))));
+            throw ( new Error(( localize(12257, "Cannot rename the default profile"))));
         }
         const updatedProfile = await this.userDataProfilesService.updateProfile(profile, updateOptions);
-        this.telemetryService.publicLog2('profileManagementActionExecuted', { id: 'updateProfile' });
         return updatedProfile;
     }
     async removeProfile(profile) {
@@ -135,10 +130,9 @@ let UserDataProfileManagementService = class UserDataProfileManagementService ex
             throw ( new Error(`Profile ${profile.name} does not exist`));
         }
         if (profile.isDefault) {
-            throw ( new Error(( localize(12038, "Cannot delete the default profile"))));
+            throw ( new Error(( localize(12258, "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))) {
@@ -153,7 +147,6 @@ let UserDataProfileManagementService = class UserDataProfileManagementService ex
         }
         const workspaceIdentifier = toWorkspaceIdentifier(this.workspaceContextService.getWorkspace());
         await this.userDataProfilesService.setProfileForWorkspace(workspaceIdentifier, profile);
-        this.telemetryService.publicLog2('profileManagementActionExecuted', { id: 'switchProfile' });
         if (isEmptyWorkspaceIdentifier(workspaceIdentifier)) {
             await this.changeCurrentProfile(profile);
         }
@@ -180,7 +173,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(12039, "Switching to a profile."))))) {
+                if (!(await this.extensionService.stopExtensionHosts(( localize(12259, "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);
                     }
@@ -192,8 +185,8 @@ let UserDataProfileManagementService = class UserDataProfileManagementService ex
         if (shouldRestartExtensionHosts) {
             if (isRemoteWindow) {
                 const { confirmed } = await this.dialogService.confirm({
-                    message: reloadMessage ?? ( localize(12040, "Switching a profile requires reloading VS Code.")),
-                    primaryButton: ( localize(12041, "&&Reload")),
+                    message: reloadMessage ?? ( localize(12260, "Switching a profile requires reloading VS Code.")),
+                    primaryButton: ( localize(12261, "&&Reload")),
                 });
                 if (confirmed) {
                     await this.hostService.reload();
@@ -213,12 +206,11 @@ UserDataProfileManagementService = ( __decorate([
     ( __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))
+    ( __param(7, IProductService)),
+    ( __param(8, IRequestService)),
+    ( __param(9, IConfigurationService)),
+    ( __param(10, IUriIdentityService)),
+    ( __param(11, ILogService))
 ], UserDataProfileManagementService));
 
 export { UserDataProfileManagementService };

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

@@ -1,7 +1,7 @@
 import { IKeybindingService } from "@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybinding.service";
 import { IUserDataSyncUtilService } from "@codingame/monaco-vscode-api/vscode/vs/platform/userDataSync/common/userDataSync.service";
 import { IStringDictionary } from "@codingame/monaco-vscode-api/vscode/vs/base/common/collections";
-import { FormattingOptions } from "@codingame/monaco-vscode-56402b83-4a60-5b15-86f9-71fe99c32744-common/vscode/vs/base/common/jsonFormatter";
+import { FormattingOptions } from "@codingame/monaco-vscode-407531d3-fdae-5387-8c41-49ba0e9574b5-common/vscode/vs/base/common/jsonFormatter";
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { ITextModelService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/resolverService";
 import { ITextResourcePropertiesService, ITextResourceConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/textResourceConfiguration";