@codingame/monaco-vscode-user-data-profile-service-override 7.1.0 → 8.0.0

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

@@ -3,7 +3,7 @@ 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';
 import { equals } from 'vscode/vscode/vs/base/common/objects';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize } from 'vscode/vscode/vs/nls';
 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';
@@ -19,7 +19,6 @@ import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extension
 import { IHostService } from 'vscode/vscode/vs/workbench/services/host/browser/host.service';
 import { IUserDataProfileService } from 'vscode/vscode/vs/workbench/services/userDataProfile/common/userDataProfile.service';
 
-const _moduleId = "vs/workbench/services/userDataProfile/browser/userDataProfileManagement";
 let UserDataProfileManagementService = class UserDataProfileManagementService extends Disposable {
     constructor(userDataProfilesService, userDataProfileService, hostService, dialogService, workspaceContextService, extensionService, environmentService, telemetryService, productService, requestService, logService) {
         super();
@@ -40,9 +39,8 @@ let UserDataProfileManagementService = class UserDataProfileManagementService ex
         this._register(userDataProfilesService.onDidChangeProfiles(e => {
             const updatedCurrentProfile = e.updated.find(p => this.userDataProfileService.currentProfile.id === p.id);
             if (updatedCurrentProfile) {
-                this.changeCurrentProfile(updatedCurrentProfile, ( localizeWithPath(
-                    _moduleId,
-                    0,
+                this.changeCurrentProfile(updatedCurrentProfile, ( localize(
+                    3252,
                     "The current profile has been updated. Please reload to switch back to the updated profile"
                 )));
             }
@@ -50,9 +48,8 @@ let UserDataProfileManagementService = class UserDataProfileManagementService ex
     }
     onDidChangeProfiles(e) {
         if (( (e.removed.some(profile => profile.id === this.userDataProfileService.currentProfile.id)))) {
-            this.changeCurrentProfile(this.userDataProfilesService.defaultProfile, ( localizeWithPath(
-                _moduleId,
-                1,
+            this.changeCurrentProfile(this.userDataProfilesService.defaultProfile, ( localize(
+                3253,
                 "The current profile has been removed. Please reload to switch back to default profile"
             )));
             return;
@@ -60,9 +57,8 @@ let UserDataProfileManagementService = class UserDataProfileManagementService ex
     }
     onDidResetWorkspaces() {
         if (!this.userDataProfileService.currentProfile.isDefault) {
-            this.changeCurrentProfile(this.userDataProfilesService.defaultProfile, ( localizeWithPath(
-                _moduleId,
-                1,
+            this.changeCurrentProfile(this.userDataProfilesService.defaultProfile, ( localize(
+                3253,
                 "The current profile has been removed. Please reload to switch back to default profile"
             )));
             return;
@@ -93,7 +89,7 @@ let UserDataProfileManagementService = class UserDataProfileManagementService ex
             throw ( (new Error(`Profile ${profile.name} does not exist`)));
         }
         if (profile.isDefault) {
-            throw ( (new Error(localizeWithPath(_moduleId, 2, "Cannot rename the default profile"))));
+            throw ( (new Error(localize(3254, "Cannot rename the default profile"))));
         }
         const updatedProfile = await this.userDataProfilesService.updateProfile(profile, updateOptions);
         this.telemetryService.publicLog2('profileManagementActionExecuted', { id: 'updateProfile' });
@@ -104,7 +100,7 @@ let UserDataProfileManagementService = class UserDataProfileManagementService ex
             throw ( (new Error(`Profile ${profile.name} does not exist`)));
         }
         if (profile.isDefault) {
-            throw ( (new Error(localizeWithPath(_moduleId, 3, "Cannot delete the default profile"))));
+            throw ( (new Error(localize(3255, "Cannot delete the default profile"))));
         }
         await this.userDataProfilesService.removeProfile(profile);
         this.telemetryService.publicLog2('profileManagementActionExecuted', { id: 'removeProfile' });
@@ -143,7 +139,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(( localizeWithPath(_moduleId, 4, "Switching to a profile."))))) {
+                if (!(await this.extensionService.stopExtensionHosts(( localize(3256, "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);
                     }
@@ -155,8 +151,8 @@ let UserDataProfileManagementService = class UserDataProfileManagementService ex
         if (shouldRestartExtensionHosts) {
             if (isRemoteWindow) {
                 const { confirmed } = await this.dialogService.confirm({
-                    message: reloadMessage ?? ( localizeWithPath(_moduleId, 5, "Switching a profile requires reloading VS Code.")),
-                    primaryButton: ( localizeWithPath(_moduleId, 6, "&&Reload")),
+                    message: reloadMessage ?? ( localize(3257, "Switching a profile requires reloading VS Code.")),
+                    primaryButton: ( localize(3258, "&&Reload")),
                 });
                 if (confirmed) {
                     await this.hostService.reload();

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

@@ -13,8 +13,8 @@ let UserDataSyncUtilService = class UserDataSyncUtilService {
         this.textResourcePropertiesService = textResourcePropertiesService;
         this.textResourceConfigurationService = textResourceConfigurationService;
     }
-    async resolveDefaultIgnoredSettings() {
-        return getDefaultIgnoredSettings();
+    async resolveDefaultCoreIgnoredSettings() {
+        return getDefaultIgnoredSettings(true);
     }
     async resolveUserBindings(userBindings) {
         const keys = {};